diff --git a/pkg-def.scm b/pkg-def.scm
index ca22050..4bbd439 100644
--- a/pkg-def.scm
+++ b/pkg-def.scm
@@ -5,10 +5,6 @@
   (let ((surflets? (get-option-value 'with-surflets)))
     (install-directory-contents "scheme" 'scheme)
     (install-directory "web-server" 'misc-shared)
-    (install-file "start-web-server" 'misc-shared "web-server")
-    (install-file "start-extended-web-server" 'misc-shared "web-server")
-    (if surflets?
-        (install-file "start-surflet-server" 'misc-shared "web-server"))
     (install-directory-contents "doc" 'doc)
 
     (let ((doc-dir (get-directory 'doc #t))
diff --git a/start-extended-web-server b/web-server/start-extended-web-server
similarity index 99%
rename from start-extended-web-server
rename to web-server/start-extended-web-server
index 7eceb90..c41a70c 100755
--- a/start-extended-web-server
+++ b/web-server/start-extended-web-server
@@ -153,7 +153,7 @@ exec scsh -lel SSAX-4.9/load.scm -lel sunet-2.1/load.scm -dm -o http-test -e mai
 			 ;; call like http://localhost:8080/man/man?ssh(1)
 			 (cons "man" (rman-handler 'man
 						   'nroff
-						   "/usr/bin/rman"
+						   "/usr/X11R6/bin/rman"
 						   "/usr/bin/zcat"
 						   #f "man?%s(%s)" 
 						   "Generated by rman-gateway"))
diff --git a/start-surflet-server b/web-server/start-surflet-server
similarity index 100%
rename from start-surflet-server
rename to web-server/start-surflet-server
diff --git a/start-web-server b/web-server/start-web-server
similarity index 100%
rename from start-web-server
rename to web-server/start-web-server