diff --git a/networking/httpd.c b/networking/httpd.c
index cafa9eda5..b82e9f995 100644
--- a/networking/httpd.c
+++ b/networking/httpd.c
@@ -1039,9 +1039,13 @@ static int sendCgi(const char *url,
 		setenv1("SCRIPT_FILENAME", realpath_buff);
 		/* set SCRIPT_NAME as full path: /cgi-bin/dirs/script.cgi */
 		setenv1("SCRIPT_NAME", purl);
-		/* TODO: bug 996 says we need to decodeString(config->query)
-		 * before placing it into env. Is this true? Add example
-		 * in the comment please... */
+		/* http://hoohoo.ncsa.uiuc.edu/cgi/env.html:
+		 * QUERY_STRING: The information which follows the ? in the URL
+		 * which referenced this script. This is the query information.
+		 * It should not be decoded in any fashion. This variable
+		 * should always be set when there is query information,
+		 * regardless of command line decoding. */
+		/* (Older versions of bbox seemed to do some decoding) */
 		setenv1("QUERY_STRING", config->query);
 		setenv1("SERVER_SOFTWARE", httpdVersion);
 		putenv("SERVER_PROTOCOL=HTTP/1.0");