diff --git a/web-server-doc/info.rkt b/web-server-doc/info.rkt
index b9de4bcf..9cf6cbdb 100644
--- a/web-server-doc/info.rkt
+++ b/web-server-doc/info.rkt
@@ -3,7 +3,7 @@
 (define collection 'multi)
 
 (define build-deps '("net-doc"
-                     "net-cookies"
+                     "net-cookies-doc"
                      "rackunit-doc"
                      "compatibility-doc"
                      "db-doc"
diff --git a/web-server-lib/info.rkt b/web-server-lib/info.rkt
index 0394876e..18d558db 100644
--- a/web-server-lib/info.rkt
+++ b/web-server-lib/info.rkt
@@ -5,7 +5,7 @@
 (define deps '("srfi-lite-lib"
                ("base" #:version "6.2.900.15")
 	       "net-lib"
-               "net-cookies"
+               "net-cookies-lib"
                "compatibility-lib"
                "scribble-text-lib"
                "parser-tools-lib"))
diff --git a/web-server-lib/web-server/http/xexpr.rkt b/web-server-lib/web-server/http/xexpr.rkt
index 298be367..500bc439 100644
--- a/web-server-lib/web-server/http/xexpr.rkt
+++ b/web-server-lib/web-server/http/xexpr.rkt
@@ -3,7 +3,8 @@
          racket/list
          xml
          web-server/private/xexpr
-         net/cookie
+         (except-in net/cookies/server
+                    make-cookie)
          "request-structs.rkt"
          "cookie.rkt"
          "response-structs.rkt")