diff -ur man2html.orig/scripts/cgi-bin/man/man2html man2html/scripts/cgi-bin/man/man2html
--- man2html.orig/scripts/cgi-bin/man/man2html	2007-08-05 20:19:12.000000000 +0100
+++ man2html/scripts/cgi-bin/man/man2html	2008-05-17 18:44:00.000000000 +0100
@@ -4,7 +4,7 @@
 # aeb@cwi.nl - 980109
 
 MAN2HTML="/usr/bin/man2html"
-MANX="/home/httpd/cgi-aux/man/man.aux"
+MANX="/usr/share/man-cgi-aux/man.aux"
 
 # Do we need lynxcgi URLs? For the moment our criterion is
 # 1) HTTP_USER_AGENT=Lynx*  and 2) HTTP_HOST is unset.
diff -ur man2html.orig/scripts/cgi-bin/man/mansearch man2html/scripts/cgi-bin/man/mansearch
--- man2html.orig/scripts/cgi-bin/man/mansearch	2005-08-21 00:26:06.000000000 +0100
+++ man2html/scripts/cgi-bin/man/mansearch	2008-05-17 18:44:23.000000000 +0100
@@ -56,7 +56,7 @@
 
 BEGIN {
 
-  searchdocument = "/home/httpd/cgi-aux/man/mansearch.aux";
+  searchdocument = "/usr/share/man-cgi-aux/mansearch.aux";
   quote = ENVIRON["QUOTE"];
   cgipath = ENVIRON["CG"];
   sedcmd = ENVIRON["SED"];
@@ -69,11 +69,11 @@
   }
 				# Have to be careful to single quote this
 				# string later.
-  gsub(/[^a-zA-Z0-9-_+ \t\/@%:;,$*|]/, " ", string);
+  gsub(/[^a-zA-Z0-9\-_+ \t\/@%:;,$*|]/, " ", string);
 
   string = removeopts(string);
 
-  gsub(/[^a-zA-Z0-9-_+ \t\/@%:,]/, " ", options);
+  gsub(/[^a-zA-Z0-9\-_+ \t\/@%:,]/, " ", options);
 
   if (!string) {
     if (system("test -r " searchdocument ) != 0) {
diff -ur man2html.orig/scripts/cgi-bin/man/mansearchhelp man2html/scripts/cgi-bin/man/mansearchhelp
--- man2html.orig/scripts/cgi-bin/man/mansearchhelp	2005-08-21 00:26:06.000000000 +0100
+++ man2html/scripts/cgi-bin/man/mansearchhelp	2008-05-19 18:53:10.000000000 +0100
@@ -1,6 +1,6 @@
 #!/bin/sh
 MAN2HTML=/usr/bin/man2html
-MANSH=/home/httpd/cgi-aux/man/mansearchhelp.aux
+MANSH=/usr/share/man-cgi-aux/mansearchhelp.aux
 
 # Do we need lynxcgi URLs? For the moment our criterion is
 # 1) HTTP_USER_AGENT=Lynx*  and 2) HTTP_HOST is unset.