diff --git a/contrib/cvs/src/main.c b/contrib/cvs/src/main.c
index daa0230f19b7..e7ffe5654074 100644
--- a/contrib/cvs/src/main.c
+++ b/contrib/cvs/src/main.c
@@ -210,6 +210,7 @@ static const char *const cmd_usage[] =
     "        history      Shows status of files and users\n",
     "        import       Import sources into CVS, using vendor branches\n",
     "        export       Export sources from CVS, similar to checkout\n",
+    "        init         Initialize a new CVS repository\n",
     "        log          Prints out 'rlog' information for files\n",
 #ifdef AUTH_CLIENT_SUPPORT
     "        login        Prompt for password for authenticating server.\n",
diff --git a/contrib/cvs/src/mkmodules.c b/contrib/cvs/src/mkmodules.c
index bdd27eb623d8..890c3a41a4f2 100644
--- a/contrib/cvs/src/mkmodules.c
+++ b/contrib/cvs/src/mkmodules.c
@@ -644,7 +644,7 @@ init (argc, argv)
 
     umask (cvsumask);
 
-    if (argc > 1)
+    if (argc == -1 || argc > 1)
 	usage (init_usage);
 
     if (client_active)