diff --git a/collects/help/help.ss b/collects/help/help.ss
index 356dd5c0..08ee5e2d 100644
--- a/collects/help/help.ss
+++ b/collects/help/help.ss
@@ -3,8 +3,8 @@
 	   (lib "util.ss" "web-server")
 	   (lib "configuration.ss" "web-server")
 	   (lib "configuration-structures.ss" "web-server")
-	   (lib "server.ss" "help")
-	   (lib "browser.ss" "help"))	
+	   "private/server.ss"
+	   "private/browser.ss")
 
   (require (lib "exit.ss" "help" "servlets" "private"))
 
diff --git a/collects/help/private/search.ss b/collects/help/private/search.ss
index 3de1128e..c8809984 100644
--- a/collects/help/private/search.ss
+++ b/collects/help/private/search.ss
@@ -2,16 +2,28 @@
   (require (lib "string-constant.ss" "string-constants")
            "docpos.ss"
            "colldocs.ss"
+	   "server.ss"
+	   "browser.ss"
            (lib "list.ss")
 	   (lib "util.ss" "help" "servlets" "private")
-           (lib "server.ss" "help")
-           (lib "browser.ss" "help"))
+	   (lib "specs.ss" "framework"))
   
   (provide do-search
-           doc-collections-changed
-	   search-for-docs)
-  
-  ; hd-cookie string sym sym any -> void
+           doc-collections-changed)
+
+  (provide/contract 
+   (search-for-docs
+    (hd-cookie? string? 
+		(lambda (s) 
+		  (member s
+		   '("keyword" "keyword-index" "keyword-index-text")))
+		(lambda (s) 
+		  (member s
+		   '("exact-match" "containing-match" "regexp-match")))
+		any?
+		. -> . any?)))
+
+  ; hd-cookie string string string any -> void
   ; shows search result in default browser
   (define (search-for-docs cookie search-string search-type match-type lucky?)
     (let* ([port (hd-cookie->port cookie)]