diff --git a/man/man1/ngspice.1 b/man/man1/ngspice.1
index 135558631..bdbce9370 100644
--- a/man/man1/ngspice.1
+++ b/man/man1/ngspice.1
@@ -26,7 +26,7 @@ ngspice \- circuit simulator derived from SPICE3f5
 .SH "DESCRIPTION"
 This man page is just a small overview.
 The primary documentation of ngspice is in the ngspice User's Manual,
-which is available as a pdf file.
+which is available as a pdf or html file.
 .SH "OPTIONS"
 .TP
 \fB\-n\fP  or  \fB\*=no\-spiceinit\fP
@@ -34,9 +34,6 @@ Don't try to source the file ".spiceinit" upon startup. Normally ngspice
 tries to find the file in the current directory, and if it is not found then
 in the user's home directory.
 .TP
-\fB\-q\fP  or  \fB\*=completion\fP
-Enable command completion. (defect)
-.TP
 \fB\-t\fP \fIterm\fP  or  \fB\*=term=\fP\fIterm\fP
 The program is being run on a terminal with \fBmfb\fP name \fIterm\fP.
 .TP
@@ -148,4 +145,4 @@ Please report bugs to the ngspice project via
 .br
 \fBnutmeg\fP: User interface: Wayne Christopher (faustus@cad.berkeley.edu)
 .br
-\fBngspice\fP: various authors (see \fBhttp://sourceforge.net/projects/ngspice/\fP)
+\fBngspice\fP: various authors (see \fBhttps://sourceforge.net/projects/ngspice/\fP)
diff --git a/src/main.c b/src/main.c
index e552267e2..6ec6afba1 100644
--- a/src/main.c
+++ b/src/main.c
@@ -758,7 +758,6 @@ show_help(void)
            "  -n, --no-spiceinit        don't load the local or user's config file\n"
            "  -o, --output=FILE         set the outputfile\n"
            "  -p, --pipe                run in I/O pipe mode\n"
-           "  -q, --completion          activate command completion\n"
            "  -r, --rawfile=FILE        set the rawfile output\n"
            "      --soa-log=FILE        set the outputfile for SOA warnings\n"
            "  -s, --server              run spice as a server process\n"
@@ -1067,7 +1066,8 @@ int main(int argc, char **argv)
             break;
 
         case 'q':       /* Command completion */
-            qflag = TRUE;
+            qflag = FALSE;
+            fprintf(stderr, "Warning: Command completion is not supported, 'q' ignored\n");
             break;
 
         case 'r':       /* The raw file */