diff --git a/collects/handin-server/web-status-server.ss b/collects/handin-server/web-status-server.ss
index 2cb5078715..199f98dc13 100644
--- a/collects/handin-server/web-status-server.ss
+++ b/collects/handin-server/web-status-server.ss
@@ -6,7 +6,8 @@
            (lib "file.ss")
            (lib "etc.ss")
            (lib "web-server-unit.ss" "web-server")
-           (lib "sig.ss" "web-server")
+           (lib "web-server-sig.ss" "web-server")
+           (lib "web-config-sig.ss" "web-server")
            (lib "configuration.ss" "web-server")
            "private/config.ss")
 
diff --git a/collects/help/private/link.ss b/collects/help/private/link.ss
index a8a6927ee9..9cd7527c7e 100644
--- a/collects/help/private/link.ss
+++ b/collects/help/private/link.ss
@@ -1,6 +1,7 @@
 (module link mzscheme 
   (require (lib "web-server-unit.ss" "web-server")
-           (lib "sig.ss" "web-server")
+           (lib "web-server-sig.ss" "web-server")
+           (lib "web-config-sig.ss" "web-server")
            
            (lib "unit.ss")
            
diff --git a/collects/help/private/main.ss b/collects/help/private/main.ss
index 308ed3d52c..f8bdee5e22 100644
--- a/collects/help/private/main.ss
+++ b/collects/help/private/main.ss
@@ -1,6 +1,5 @@
 (module main (lib "a-unit.ss")
-  (require (lib "sig.ss" "web-server")
-           (lib "framework.ss" "framework")
+  (require (lib "framework.ss" "framework")
            (lib "mred.ss" "mred")
            (lib "class.ss")
            (lib "external.ss" "browser")
diff --git a/collects/help/private/tcp-intercept.ss b/collects/help/private/tcp-intercept.ss
index 28657f4e0a..19cc23b0a8 100644
--- a/collects/help/private/tcp-intercept.ss
+++ b/collects/help/private/tcp-intercept.ss
@@ -3,7 +3,7 @@
   
   (require (lib "unit.ss")
            (lib "etc.ss")
-           (lib "sig.ss" "web-server")
+           (lib "web-server-sig.ss" "web-server")
            (lib "tcp-sig.ss" "net")
            (lib "url-sig.ss" "net")
            "internal-hp.ss")
diff --git a/collects/web-server/configuration.ss b/collects/web-server/configuration.ss
index 62a01e9298..bbcbfe301b 100644
--- a/collects/web-server/configuration.ss
+++ b/collects/web-server/configuration.ss
@@ -7,7 +7,7 @@
            "private/configuration-table-structs.ss"
            "private/util.ss"
            "private/parse-table.ss"
-           "sig.ss")
+           "web-config-sig.ss")
   
   (define default-configuration-table-path
     (build-path (collection-path "web-server") "configuration-table"))
diff --git a/collects/web-server/private/configuration.ss b/collects/web-server/private/configuration.ss
index 0e9890ad32..bbe00b042c 100644
--- a/collects/web-server/private/configuration.ss
+++ b/collects/web-server/private/configuration.ss
@@ -8,7 +8,7 @@
            "configuration-table-structs.ss"
            "util.ss"
            "cache-table.ss"
-           "../sig.ss"
+           "../web-config-sig.ss"
            "../response-structs.ss")
   
   ; : str configuration-table -> configuration
diff --git a/collects/web-server/private/launch.ss b/collects/web-server/private/launch.ss
index e523fad4b9..8334c9b60c 100644
--- a/collects/web-server/private/launch.ss
+++ b/collects/web-server/private/launch.ss
@@ -3,9 +3,10 @@
            (lib "pregexp.ss")
            (lib "unit.ss")
            (lib "tcp-sig.ss" "net"))
-  (require "util.ss"           
+  (require "util.ss"         
+           "../web-config-sig.ss"
            "../web-server-unit.ss"
-           "../sig.ss"
+           "../web-server-sig.ss"
            "../configuration.ss")
 
   (define configuration@
diff --git a/collects/web-server/sig.ss b/collects/web-server/sig.ss
deleted file mode 100644
index 88276348ce..0000000000
--- a/collects/web-server/sig.ss
+++ /dev/null
@@ -1,17 +0,0 @@
-(module sig mzscheme
-  (require (lib "unit.ss"))
-  (require "private/dispatch-server-sig.ss")
-  (provide ; XXX contract signature
-   (rename dispatch-server^ web-server^) 
-   web-config^)  
-
-  (define-signature web-config^
-    (max-waiting 
-     virtual-hosts
-     access
-     scripts
-     initial-connection-timeout
-     port
-     listen-ip
-     instances
-     make-servlet-namespace)))
\ No newline at end of file
diff --git a/collects/web-server/tools/servlet-env.ss b/collects/web-server/tools/servlet-env.ss
index ac02915831..92af5dbfe0 100644
--- a/collects/web-server/tools/servlet-env.ss
+++ b/collects/web-server/tools/servlet-env.ss
@@ -3,7 +3,7 @@
            (lib "unit.ss"))
   (require "../configuration.ss"
            "../web-server.ss"
-           "../sig.ss"
+           "../web-config-sig.ss"
            "../private/util.ss"
            "../response-structs.ss"
            "../managers/timeouts.ss"
diff --git a/collects/web-server/web-config-sig.ss b/collects/web-server/web-config-sig.ss
new file mode 100644
index 0000000000..2d71fc477b
--- /dev/null
+++ b/collects/web-server/web-config-sig.ss
@@ -0,0 +1,10 @@
+(module web-config-sig (lib "a-signature.ss")
+  max-waiting 
+  virtual-hosts
+  access
+  scripts
+  initial-connection-timeout
+  port
+  listen-ip
+  instances
+  make-servlet-namespace)
\ No newline at end of file
diff --git a/collects/web-server/web-server-sig.ss b/collects/web-server/web-server-sig.ss
new file mode 100644
index 0000000000..d82af52a37
--- /dev/null
+++ b/collects/web-server/web-server-sig.ss
@@ -0,0 +1,3 @@
+(module web-server-sig mzscheme
+  (require "private/dispatch-server-sig.ss")
+  (provide (rename dispatch-server^ web-server^)))
\ No newline at end of file
diff --git a/collects/web-server/web-server-unit.ss b/collects/web-server/web-server-unit.ss
index a120cda86e..c341f637cb 100644
--- a/collects/web-server/web-server-unit.ss
+++ b/collects/web-server/web-server-unit.ss
@@ -1,7 +1,8 @@
 (module web-server-unit mzscheme
   (require (lib "tcp-sig.ss" "net")
            (lib "unit.ss"))
-  (require "sig.ss"
+  (require "web-server-sig.ss"
+           "web-config-sig.ss"
            "private/dispatch-server-unit.ss"
            "private/dispatch-server-sig.ss"
            "private/web-server-structs.ss"
diff --git a/collects/web-server/web-server.ss b/collects/web-server/web-server.ss
index e361763fc1..fb70f3fc9a 100644
--- a/collects/web-server/web-server.ss
+++ b/collects/web-server/web-server.ss
@@ -2,7 +2,8 @@
   (require (lib "tcp-sig.ss" "net")
            (lib "unit.ss")
            (lib "contract.ss")
-           "sig.ss"
+           "web-config-sig.ss"
+           "web-server-sig.ss"
            "web-server-unit.ss"
 	   "configuration.ss"
            "private/configuration-structures.ss")