diff --git a/CHANGELOG b/CHANGELOG
index 3cca25410..c933c3da2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,8 @@
 # Nmap Changelog ($Id$); -*-text-*-
 
+o Removed the undocumented -q option, which renamed the nmap process
+  to something like "pine".
+
 o Moved the Japanese man page from man1/jp to man1/ja. jp is a country
   code while ja is a language code. Reported by Christian Neukirchen.
 
diff --git a/NmapOps.cc b/NmapOps.cc
index 691a24063..e04a55924 100644
--- a/NmapOps.cc
+++ b/NmapOps.cc
@@ -343,7 +343,6 @@ void NmapOps::Initialize() {
   sourcesocklen = 0;
   excludefd = NULL;
   exclude_spec = NULL;
-  quashargv = 0;
   inputfd = NULL;
   idleProxy = NULL;
   portlist = NULL;
diff --git a/NmapOps.h b/NmapOps.h
index e563848b9..f8adf0869 100644
--- a/NmapOps.h
+++ b/NmapOps.h
@@ -337,7 +337,6 @@ class NmapOps {
   bool adler32;
   FILE *excludefd;
   char *exclude_spec;
-  int quashargv;
   FILE *inputfd;
   char *portlist; /* Ports list specified by user */
 
diff --git a/nmap.cc b/nmap.cc
index 9acba5c24..b80348125 100644
--- a/nmap.cc
+++ b/nmap.cc
@@ -1178,9 +1178,6 @@ void parse_options(int argc, char **argv) {
         fatal("Only 1 -p option allowed, separate multiple ranges with commas.");
       o.portlist = strdup(optarg);
       break;
-    case 'q':
-      o.quashargv++;
-      break;
     case 'R':
       o.resolve_all++;
       break;
@@ -1660,17 +1657,6 @@ int nmap_main(int argc, char *argv[]) {
     exit(0);
   }
 
-  /* more fakeargv junk, BTW malloc'ing extra space in argv[0] doesn't work */
-  if (o.quashargv) {
-    size_t fakeargvlen = strlen(FAKE_ARGV), argvlen = strlen(argv[0]);
-    if (argvlen < fakeargvlen)
-      fatal("If you want me to fake your argv, you need to call the program with a longer name.  Try the full pathname, or rename it fyodorssuperdedouperportscanner");
-    strncpy(argv[0], FAKE_ARGV, fakeargvlen);
-    memset(&argv[0][fakeargvlen], '\0', strlen(&argv[0][fakeargvlen]));
-    for (i = 1; i < argc; i++)
-      memset(argv[i], '\0', strlen(argv[i]));
-  }
-
   /* If he wants to bounce off of an FTP site, that site better damn well be reachable! */
   if (o.bouncescan) {
     if (!inet_pton(AF_INET, ftp.server_name, &ftp.server)) {
diff --git a/nmap.h b/nmap.h
index 47151ecfb..f74e716d6 100644
--- a/nmap.h
+++ b/nmap.h
@@ -246,7 +246,6 @@ void *realloc();
    sockets.  Can also adjust with the -M command line option.  */
 #define MAX_SOCKETS 36 
 
-#define FAKE_ARGV "pine" /* What ps and w should show if you use -q */
 /* How do we want to log into ftp sites for */ 
 #define FTPUSER "anonymous"
 #define FTPPASS "-wwwuser@"
diff --git a/zenmap/zenmapCore/NmapOptions.py b/zenmap/zenmapCore/NmapOptions.py
index 335be4841..ff2f536a4 100644
--- a/zenmap/zenmapCore/NmapOptions.py
+++ b/zenmap/zenmapCore/NmapOptions.py
@@ -1321,7 +1321,6 @@ class NmapOptionsTest(unittest.TestCase):
         # The following options are present in the Nmap source but are not
         # tested for because they are deprecated or not document or whatever.
         # "-I",
-        # "-q",
         # "--noninteractive",
         # "--thc",
         # "--nogcc",