diff --git a/pkgs/compatibility-pkgs/compatibility-lib/info.rkt b/pkgs/compatibility-pkgs/compatibility-lib/info.rkt
index 5b9954ad6d..b422d4fc11 100644
--- a/pkgs/compatibility-pkgs/compatibility-lib/info.rkt
+++ b/pkgs/compatibility-pkgs/compatibility-lib/info.rkt
@@ -1,3 +1,3 @@
 #lang setup/infotab
 (define collection 'multi)
-(define deps '("base"))
+(define deps '("base" "net-lib"))
diff --git a/racket/lib/collects/net/base64-sig.rkt b/pkgs/compatibility-pkgs/compatibility-lib/net/base64-sig.rkt
similarity index 100%
rename from racket/lib/collects/net/base64-sig.rkt
rename to pkgs/compatibility-pkgs/compatibility-lib/net/base64-sig.rkt
diff --git a/racket/lib/collects/net/base64-unit.rkt b/pkgs/compatibility-pkgs/compatibility-lib/net/base64-unit.rkt
similarity index 72%
rename from racket/lib/collects/net/base64-unit.rkt
rename to pkgs/compatibility-pkgs/compatibility-lib/net/base64-unit.rkt
index 6fa00d416d..bac266a25d 100644
--- a/racket/lib/collects/net/base64-unit.rkt
+++ b/pkgs/compatibility-pkgs/compatibility-lib/net/base64-unit.rkt
@@ -1,7 +1,7 @@
 #lang racket/base
 
 (require racket/unit
-         "base64-sig.rkt" "base64.rkt")
+         "base64-sig.rkt" net/base64)
 
 (define-unit-from-context base64@ base64^)
 
diff --git a/racket/lib/collects/net/cgi-sig.rkt b/pkgs/compatibility-pkgs/compatibility-lib/net/cgi-sig.rkt
similarity index 100%
rename from racket/lib/collects/net/cgi-sig.rkt
rename to pkgs/compatibility-pkgs/compatibility-lib/net/cgi-sig.rkt
diff --git a/racket/lib/collects/net/cgi-unit.rkt b/pkgs/compatibility-pkgs/compatibility-lib/net/cgi-unit.rkt
similarity index 73%
rename from racket/lib/collects/net/cgi-unit.rkt
rename to pkgs/compatibility-pkgs/compatibility-lib/net/cgi-unit.rkt
index ac90c64e84..2a663b448f 100644
--- a/racket/lib/collects/net/cgi-unit.rkt
+++ b/pkgs/compatibility-pkgs/compatibility-lib/net/cgi-unit.rkt
@@ -1,7 +1,7 @@
 #lang racket/base
 
 (require racket/unit
-         "cgi-sig.rkt" "cgi.rkt")
+         "cgi-sig.rkt" net/cgi)
 
 (define-unit-from-context cgi@ cgi^)
 
diff --git a/racket/lib/collects/net/cookie-sig.rkt b/pkgs/compatibility-pkgs/compatibility-lib/net/cookie-sig.rkt
similarity index 100%
rename from racket/lib/collects/net/cookie-sig.rkt
rename to pkgs/compatibility-pkgs/compatibility-lib/net/cookie-sig.rkt
diff --git a/racket/lib/collects/net/cookie-unit.rkt b/pkgs/compatibility-pkgs/compatibility-lib/net/cookie-unit.rkt
similarity index 84%
rename from racket/lib/collects/net/cookie-unit.rkt
rename to pkgs/compatibility-pkgs/compatibility-lib/net/cookie-unit.rkt
index c28553c389..1dfc62d1fe 100644
--- a/racket/lib/collects/net/cookie-unit.rkt
+++ b/pkgs/compatibility-pkgs/compatibility-lib/net/cookie-unit.rkt
@@ -1,7 +1,7 @@
 #lang racket/base
 (require racket/unit
          "cookie-sig.rkt"
-         "cookie.rkt")
+         net/cookie)
 
 (define-unit-from-context cookie@ cookie^)
 
diff --git a/racket/lib/collects/net/dns-sig.rkt b/pkgs/compatibility-pkgs/compatibility-lib/net/dns-sig.rkt
similarity index 100%
rename from racket/lib/collects/net/dns-sig.rkt
rename to pkgs/compatibility-pkgs/compatibility-lib/net/dns-sig.rkt
diff --git a/racket/lib/collects/net/dns-unit.rkt b/pkgs/compatibility-pkgs/compatibility-lib/net/dns-unit.rkt
similarity index 73%
rename from racket/lib/collects/net/dns-unit.rkt
rename to pkgs/compatibility-pkgs/compatibility-lib/net/dns-unit.rkt
index f5f99fb94b..cce9e8218e 100644
--- a/racket/lib/collects/net/dns-unit.rkt
+++ b/pkgs/compatibility-pkgs/compatibility-lib/net/dns-unit.rkt
@@ -1,7 +1,7 @@
 #lang racket/base
 
 (require racket/unit
-         "dns-sig.rkt" "dns.rkt")
+         "dns-sig.rkt" net/dns)
 
 (define-unit-from-context dns@ dns^)
 
diff --git a/racket/lib/collects/net/ftp-sig.rkt b/pkgs/compatibility-pkgs/compatibility-lib/net/ftp-sig.rkt
similarity index 100%
rename from racket/lib/collects/net/ftp-sig.rkt
rename to pkgs/compatibility-pkgs/compatibility-lib/net/ftp-sig.rkt
diff --git a/racket/lib/collects/net/ftp-unit.rkt b/pkgs/compatibility-pkgs/compatibility-lib/net/ftp-unit.rkt
similarity index 82%
rename from racket/lib/collects/net/ftp-unit.rkt
rename to pkgs/compatibility-pkgs/compatibility-lib/net/ftp-unit.rkt
index 42432a561f..5609f1d580 100644
--- a/racket/lib/collects/net/ftp-unit.rkt
+++ b/pkgs/compatibility-pkgs/compatibility-lib/net/ftp-unit.rkt
@@ -5,7 +5,7 @@
 ;;   Micah Flatt
 ;;   06-06-2002
 (require racket/unit
-         "ftp-sig.rkt" "ftp.rkt")
+         "ftp-sig.rkt" net/ftp)
 
 (define-unit-from-context ftp@ ftp^)
 
diff --git a/racket/lib/collects/net/head-sig.rkt b/pkgs/compatibility-pkgs/compatibility-lib/net/head-sig.rkt
similarity index 100%
rename from racket/lib/collects/net/head-sig.rkt
rename to pkgs/compatibility-pkgs/compatibility-lib/net/head-sig.rkt
diff --git a/racket/lib/collects/net/head-unit.rkt b/pkgs/compatibility-pkgs/compatibility-lib/net/head-unit.rkt
similarity index 72%
rename from racket/lib/collects/net/head-unit.rkt
rename to pkgs/compatibility-pkgs/compatibility-lib/net/head-unit.rkt
index 1a1606b729..ea5b6ae5ef 100644
--- a/racket/lib/collects/net/head-unit.rkt
+++ b/pkgs/compatibility-pkgs/compatibility-lib/net/head-unit.rkt
@@ -1,7 +1,7 @@
 #lang racket/base
 
 (require racket/unit
-         "head-sig.rkt" "head.rkt")
+         "head-sig.rkt" net/head)
 
 (define-unit-from-context head@ head^)
 
diff --git a/racket/lib/collects/net/imap-sig.rkt b/pkgs/compatibility-pkgs/compatibility-lib/net/imap-sig.rkt
similarity index 100%
rename from racket/lib/collects/net/imap-sig.rkt
rename to pkgs/compatibility-pkgs/compatibility-lib/net/imap-sig.rkt
diff --git a/racket/lib/collects/net/imap-unit.rkt b/pkgs/compatibility-pkgs/compatibility-lib/net/imap-unit.rkt
similarity index 72%
rename from racket/lib/collects/net/imap-unit.rkt
rename to pkgs/compatibility-pkgs/compatibility-lib/net/imap-unit.rkt
index 4b28b4f2cd..2205f05cb3 100644
--- a/racket/lib/collects/net/imap-unit.rkt
+++ b/pkgs/compatibility-pkgs/compatibility-lib/net/imap-unit.rkt
@@ -1,7 +1,7 @@
 #lang racket/base
 
 (require racket/unit
-         "imap-sig.rkt" "imap.rkt")
+         "imap-sig.rkt" net/imap)
 
 (define-unit-from-context imap@ imap^)
 
diff --git a/racket/lib/collects/net/mime-sig.rkt b/pkgs/compatibility-pkgs/compatibility-lib/net/mime-sig.rkt
similarity index 100%
rename from racket/lib/collects/net/mime-sig.rkt
rename to pkgs/compatibility-pkgs/compatibility-lib/net/mime-sig.rkt
diff --git a/racket/lib/collects/net/mime-unit.rkt b/pkgs/compatibility-pkgs/compatibility-lib/net/mime-unit.rkt
similarity index 72%
rename from racket/lib/collects/net/mime-unit.rkt
rename to pkgs/compatibility-pkgs/compatibility-lib/net/mime-unit.rkt
index 538eab9236..a620637abd 100644
--- a/racket/lib/collects/net/mime-unit.rkt
+++ b/pkgs/compatibility-pkgs/compatibility-lib/net/mime-unit.rkt
@@ -1,7 +1,7 @@
 #lang racket/base
 
 (require racket/unit
-         "mime-sig.rkt" "mime.rkt")
+         "mime-sig.rkt" net/mime)
 
 (define-unit-from-context mime@ mime^)
 
diff --git a/racket/lib/collects/net/nntp-sig.rkt b/pkgs/compatibility-pkgs/compatibility-lib/net/nntp-sig.rkt
similarity index 100%
rename from racket/lib/collects/net/nntp-sig.rkt
rename to pkgs/compatibility-pkgs/compatibility-lib/net/nntp-sig.rkt
diff --git a/racket/lib/collects/net/nntp-unit.rkt b/pkgs/compatibility-pkgs/compatibility-lib/net/nntp-unit.rkt
similarity index 72%
rename from racket/lib/collects/net/nntp-unit.rkt
rename to pkgs/compatibility-pkgs/compatibility-lib/net/nntp-unit.rkt
index 0650418617..6e81bacafe 100644
--- a/racket/lib/collects/net/nntp-unit.rkt
+++ b/pkgs/compatibility-pkgs/compatibility-lib/net/nntp-unit.rkt
@@ -1,7 +1,7 @@
 #lang racket/base
 
 (require racket/unit
-         "nntp-sig.rkt" "nntp.rkt")
+         "nntp-sig.rkt" net/nntp)
 
 (define-unit-from-context nntp@ nntp^)
 
diff --git a/racket/lib/collects/net/pop3-sig.rkt b/pkgs/compatibility-pkgs/compatibility-lib/net/pop3-sig.rkt
similarity index 100%
rename from racket/lib/collects/net/pop3-sig.rkt
rename to pkgs/compatibility-pkgs/compatibility-lib/net/pop3-sig.rkt
diff --git a/racket/lib/collects/net/pop3-unit.rkt b/pkgs/compatibility-pkgs/compatibility-lib/net/pop3-unit.rkt
similarity index 72%
rename from racket/lib/collects/net/pop3-unit.rkt
rename to pkgs/compatibility-pkgs/compatibility-lib/net/pop3-unit.rkt
index 5c5cc7c8f0..3357b8aafd 100644
--- a/racket/lib/collects/net/pop3-unit.rkt
+++ b/pkgs/compatibility-pkgs/compatibility-lib/net/pop3-unit.rkt
@@ -1,7 +1,7 @@
 #lang racket/base
 
 (require racket/unit
-         "pop3-sig.rkt" "pop3.rkt")
+         "pop3-sig.rkt" net/pop3)
 
 (define-unit-from-context pop3@ pop3^)
 
diff --git a/racket/lib/collects/net/qp-sig.rkt b/pkgs/compatibility-pkgs/compatibility-lib/net/qp-sig.rkt
similarity index 100%
rename from racket/lib/collects/net/qp-sig.rkt
rename to pkgs/compatibility-pkgs/compatibility-lib/net/qp-sig.rkt
diff --git a/racket/lib/collects/net/qp-unit.rkt b/pkgs/compatibility-pkgs/compatibility-lib/net/qp-unit.rkt
similarity index 73%
rename from racket/lib/collects/net/qp-unit.rkt
rename to pkgs/compatibility-pkgs/compatibility-lib/net/qp-unit.rkt
index 1d7f2ebd3e..8704dba6de 100644
--- a/racket/lib/collects/net/qp-unit.rkt
+++ b/pkgs/compatibility-pkgs/compatibility-lib/net/qp-unit.rkt
@@ -1,7 +1,7 @@
 #lang racket/base
 
 (require racket/unit
-         "qp-sig.rkt" "qp.rkt")
+         "qp-sig.rkt" net/qp)
 
 (define-unit-from-context qp@ qp^)
 
diff --git a/racket/lib/collects/net/sendmail-sig.rkt b/pkgs/compatibility-pkgs/compatibility-lib/net/sendmail-sig.rkt
similarity index 100%
rename from racket/lib/collects/net/sendmail-sig.rkt
rename to pkgs/compatibility-pkgs/compatibility-lib/net/sendmail-sig.rkt
diff --git a/racket/lib/collects/net/sendmail-unit.rkt b/pkgs/compatibility-pkgs/compatibility-lib/net/sendmail-unit.rkt
similarity index 71%
rename from racket/lib/collects/net/sendmail-unit.rkt
rename to pkgs/compatibility-pkgs/compatibility-lib/net/sendmail-unit.rkt
index 2fd97068e9..ad0876b7b1 100644
--- a/racket/lib/collects/net/sendmail-unit.rkt
+++ b/pkgs/compatibility-pkgs/compatibility-lib/net/sendmail-unit.rkt
@@ -1,7 +1,7 @@
 #lang racket/base
 
 (require racket/unit
-         "sendmail-sig.rkt" "sendmail.rkt")
+         "sendmail-sig.rkt" net/sendmail)
 
 (define-unit-from-context sendmail@ sendmail^)
 
diff --git a/racket/lib/collects/net/smtp-sig.rkt b/pkgs/compatibility-pkgs/compatibility-lib/net/smtp-sig.rkt
similarity index 100%
rename from racket/lib/collects/net/smtp-sig.rkt
rename to pkgs/compatibility-pkgs/compatibility-lib/net/smtp-sig.rkt
diff --git a/racket/lib/collects/net/smtp-unit.rkt b/pkgs/compatibility-pkgs/compatibility-lib/net/smtp-unit.rkt
similarity index 72%
rename from racket/lib/collects/net/smtp-unit.rkt
rename to pkgs/compatibility-pkgs/compatibility-lib/net/smtp-unit.rkt
index 98adc51b2f..029ccaf732 100644
--- a/racket/lib/collects/net/smtp-unit.rkt
+++ b/pkgs/compatibility-pkgs/compatibility-lib/net/smtp-unit.rkt
@@ -1,7 +1,7 @@
 #lang racket/base
 
 (require racket/unit
-         "smtp-sig.rkt" "smtp.rkt")
+         "smtp-sig.rkt" net/smtp)
 
 (define-unit-from-context smtp@ smtp^)
 
diff --git a/racket/lib/collects/net/uri-codec-sig.rkt b/pkgs/compatibility-pkgs/compatibility-lib/net/uri-codec-sig.rkt
similarity index 100%
rename from racket/lib/collects/net/uri-codec-sig.rkt
rename to pkgs/compatibility-pkgs/compatibility-lib/net/uri-codec-sig.rkt
diff --git a/racket/lib/collects/net/uri-codec-unit.rkt b/pkgs/compatibility-pkgs/compatibility-lib/net/uri-codec-unit.rkt
similarity index 70%
rename from racket/lib/collects/net/uri-codec-unit.rkt
rename to pkgs/compatibility-pkgs/compatibility-lib/net/uri-codec-unit.rkt
index f680d8ac12..477b849a34 100644
--- a/racket/lib/collects/net/uri-codec-unit.rkt
+++ b/pkgs/compatibility-pkgs/compatibility-lib/net/uri-codec-unit.rkt
@@ -1,7 +1,7 @@
 #lang racket/base
 
 (require racket/unit
-         "uri-codec-sig.rkt" "uri-codec.rkt")
+         "uri-codec-sig.rkt" net/uri-codec)
 
 (define-unit-from-context uri-codec@ uri-codec^)
 
diff --git a/racket/lib/collects/net/url-sig.rkt b/pkgs/compatibility-pkgs/compatibility-lib/net/url-sig.rkt
similarity index 100%
rename from racket/lib/collects/net/url-sig.rkt
rename to pkgs/compatibility-pkgs/compatibility-lib/net/url-sig.rkt
diff --git a/racket/lib/collects/net/url-unit.rkt b/pkgs/compatibility-pkgs/compatibility-lib/net/url-unit.rkt
similarity index 66%
rename from racket/lib/collects/net/url-unit.rkt
rename to pkgs/compatibility-pkgs/compatibility-lib/net/url-unit.rkt
index 98fe4d33dc..8623748f38 100644
--- a/racket/lib/collects/net/url-unit.rkt
+++ b/pkgs/compatibility-pkgs/compatibility-lib/net/url-unit.rkt
@@ -1,7 +1,7 @@
 #lang racket/base
 
 (require racket/unit
-         "url-sig.rkt" "url.rkt" "url-connect.rkt")
+         "url-sig.rkt" net/url net/url-connect)
 
 (define-unit-from-context url@ url+scheme^)
 
diff --git a/pkgs/drracket-pkgs/drracket/info.rkt b/pkgs/drracket-pkgs/drracket/info.rkt
index b28edb4c2a..4f81f87262 100644
--- a/pkgs/drracket-pkgs/drracket/info.rkt
+++ b/pkgs/drracket-pkgs/drracket/info.rkt
@@ -29,6 +29,7 @@
                "typed-racket-more"
                "trace"
                "macro-debugger"
+	       "net-lib"
                "srfi-lib"
                "srfi-doc"))
 (define build-deps '("at-exp-lib"
diff --git a/pkgs/games/info.rkt b/pkgs/games/info.rkt
index 9f709061ec..78dfa86a1c 100644
--- a/pkgs/games/info.rkt
+++ b/pkgs/games/info.rkt
@@ -10,6 +10,7 @@
                "draw-lib"
                "drracket"
                "gui-lib"
+	       "net-lib"
                "htdp"
                "math"
                "scribble-lib"
diff --git a/pkgs/net-lib/info.rkt b/pkgs/net-lib/info.rkt
new file mode 100644
index 0000000000..e43df74125
--- /dev/null
+++ b/pkgs/net-lib/info.rkt
@@ -0,0 +1,4 @@
+#lang setup/infotab
+
+(define collection 'multi)
+(define deps '("base"))
diff --git a/racket/lib/collects/net/cgi.rkt b/pkgs/net-lib/net/cgi.rkt
similarity index 99%
rename from racket/lib/collects/net/cgi.rkt
rename to pkgs/net-lib/net/cgi.rkt
index 1348217587..2b38c8839f 100644
--- a/racket/lib/collects/net/cgi.rkt
+++ b/pkgs/net-lib/net/cgi.rkt
@@ -1,6 +1,6 @@
 #lang racket/base
 
-(require "uri-codec.rkt")
+(require net/uri-codec)
 
 (provide
 
diff --git a/racket/lib/collects/net/cookie.rkt b/pkgs/net-lib/net/cookie.rkt
similarity index 99%
rename from racket/lib/collects/net/cookie.rkt
rename to pkgs/net-lib/net/cookie.rkt
index df96af04cc..1050f84777 100644
--- a/racket/lib/collects/net/cookie.rkt
+++ b/pkgs/net-lib/net/cookie.rkt
@@ -351,5 +351,3 @@
 
 (define (valid-path? v)
   (and (string? v) (rfc2109:value? v)))
-
-;;; cookie-unit.rkt ends here
diff --git a/racket/lib/collects/net/dns.rkt b/pkgs/net-lib/net/dns.rkt
similarity index 100%
rename from racket/lib/collects/net/dns.rkt
rename to pkgs/net-lib/net/dns.rkt
diff --git a/racket/lib/collects/net/ftp.rkt b/pkgs/net-lib/net/ftp.rkt
similarity index 100%
rename from racket/lib/collects/net/ftp.rkt
rename to pkgs/net-lib/net/ftp.rkt
diff --git a/racket/lib/collects/net/imap.rkt b/pkgs/net-lib/net/imap.rkt
similarity index 100%
rename from racket/lib/collects/net/imap.rkt
rename to pkgs/net-lib/net/imap.rkt
diff --git a/racket/lib/collects/net/mime-util.rkt b/pkgs/net-lib/net/mime-util.rkt
similarity index 100%
rename from racket/lib/collects/net/mime-util.rkt
rename to pkgs/net-lib/net/mime-util.rkt
diff --git a/racket/lib/collects/net/mime.rkt b/pkgs/net-lib/net/mime.rkt
similarity index 99%
rename from racket/lib/collects/net/mime.rkt
rename to pkgs/net-lib/net/mime.rkt
index 938a067638..cd63732dea 100644
--- a/racket/lib/collects/net/mime.rkt
+++ b/pkgs/net-lib/net/mime.rkt
@@ -28,7 +28,7 @@
 
 #lang racket/base
 
-(require racket/port "mime-util.rkt" "qp.rkt" "base64.rkt" "head.rkt")
+(require racket/port "mime-util.rkt" "qp.rkt" net/base64 net/head)
 
 (provide
  ;; -- exceptions raised --
diff --git a/racket/lib/collects/net/nntp.rkt b/pkgs/net-lib/net/nntp.rkt
similarity index 100%
rename from racket/lib/collects/net/nntp.rkt
rename to pkgs/net-lib/net/nntp.rkt
diff --git a/racket/lib/collects/net/pop3.rkt b/pkgs/net-lib/net/pop3.rkt
similarity index 100%
rename from racket/lib/collects/net/pop3.rkt
rename to pkgs/net-lib/net/pop3.rkt
diff --git a/racket/lib/collects/net/private/ip.rkt b/pkgs/net-lib/net/private/ip.rkt
similarity index 100%
rename from racket/lib/collects/net/private/ip.rkt
rename to pkgs/net-lib/net/private/ip.rkt
diff --git a/racket/lib/collects/net/private/rbtree.rkt b/pkgs/net-lib/net/private/rbtree.rkt
similarity index 100%
rename from racket/lib/collects/net/private/rbtree.rkt
rename to pkgs/net-lib/net/private/rbtree.rkt
diff --git a/racket/lib/collects/net/qp.rkt b/pkgs/net-lib/net/qp.rkt
similarity index 100%
rename from racket/lib/collects/net/qp.rkt
rename to pkgs/net-lib/net/qp.rkt
diff --git a/racket/lib/collects/net/sendmail.rkt b/pkgs/net-lib/net/sendmail.rkt
similarity index 100%
rename from racket/lib/collects/net/sendmail.rkt
rename to pkgs/net-lib/net/sendmail.rkt
diff --git a/racket/lib/collects/net/sendurl.rkt b/pkgs/net-lib/net/sendurl.rkt
similarity index 100%
rename from racket/lib/collects/net/sendurl.rkt
rename to pkgs/net-lib/net/sendurl.rkt
diff --git a/racket/lib/collects/net/smtp.rkt b/pkgs/net-lib/net/smtp.rkt
similarity index 99%
rename from racket/lib/collects/net/smtp.rkt
rename to pkgs/net-lib/net/smtp.rkt
index 7514fa5418..4ac7ea388b 100644
--- a/racket/lib/collects/net/smtp.rkt
+++ b/pkgs/net-lib/net/smtp.rkt
@@ -1,6 +1,6 @@
 #lang racket/base
 
-(require racket/tcp "base64.rkt")
+(require racket/tcp net/base64)
 
 (provide smtp-sending-server
          smtp-send-message
diff --git a/racket/lib/collects/net/ssl-tcp-unit.rkt b/pkgs/net-lib/net/ssl-tcp-unit.rkt
similarity index 97%
rename from racket/lib/collects/net/ssl-tcp-unit.rkt
rename to pkgs/net-lib/net/ssl-tcp-unit.rkt
index df07a8ab3b..0568509095 100644
--- a/racket/lib/collects/net/ssl-tcp-unit.rkt
+++ b/pkgs/net-lib/net/ssl-tcp-unit.rkt
@@ -1,6 +1,6 @@
 #lang racket/base
 (provide make-ssl-tcp@)
-(require racket/unit "tcp-sig.rkt" openssl/mzssl)
+(require racket/unit net/tcp-sig openssl/mzssl)
 
 (define (make-ssl-tcp@
          server-cert-file server-key-file server-root-cert-files
diff --git a/racket/lib/collects/net/tcp-redirect.rkt b/pkgs/net-lib/net/tcp-redirect.rkt
similarity index 100%
rename from racket/lib/collects/net/tcp-redirect.rkt
rename to pkgs/net-lib/net/tcp-redirect.rkt
diff --git a/racket/lib/collects/net/tcp-sig.rkt b/pkgs/net-lib/net/tcp-sig.rkt
similarity index 100%
rename from racket/lib/collects/net/tcp-sig.rkt
rename to pkgs/net-lib/net/tcp-sig.rkt
diff --git a/racket/lib/collects/net/tcp-unit.rkt b/pkgs/net-lib/net/tcp-unit.rkt
similarity index 100%
rename from racket/lib/collects/net/tcp-unit.rkt
rename to pkgs/net-lib/net/tcp-unit.rkt
diff --git a/racket/lib/collects/net/unihead.rkt b/pkgs/net-lib/net/unihead.rkt
similarity index 100%
rename from racket/lib/collects/net/unihead.rkt
rename to pkgs/net-lib/net/unihead.rkt
diff --git a/pkgs/plt-services/info.rkt b/pkgs/plt-services/info.rkt
index d683ad9cc1..b139b1e612 100644
--- a/pkgs/plt-services/info.rkt
+++ b/pkgs/plt-services/info.rkt
@@ -12,8 +12,8 @@
                "syntax-color-lib"
                "base"
                "gui-lib"
+	       "net-lib"
                "sandbox-lib"
                "scribble-lib"
                "compatibility-lib"))
-
 (define implies '("distro-build"))
diff --git a/pkgs/racket-pkgs/racket-doc/info.rkt b/pkgs/racket-pkgs/racket-doc/info.rkt
index 1d8fe2ad29..3569596c93 100644
--- a/pkgs/racket-pkgs/racket-doc/info.rkt
+++ b/pkgs/racket-pkgs/racket-doc/info.rkt
@@ -4,6 +4,7 @@
 
 (define deps '("base"
                "compatibility-lib"
+	       "net-lib"
                "sandbox-lib"
                "scribble-lib"
                "racket-index"))
diff --git a/pkgs/racket-pkgs/racket-doc/net/scribblings/cookie.scrbl b/pkgs/racket-pkgs/racket-doc/net/scribblings/cookie.scrbl
index 5cda30cb48..0916c487cc 100644
--- a/pkgs/racket-pkgs/racket-doc/net/scribblings/cookie.scrbl
+++ b/pkgs/racket-pkgs/racket-doc/net/scribblings/cookie.scrbl
@@ -178,6 +178,10 @@ won't have a cookie set then first arrive at your site.
 
 @section{Cookie Unit}
 
+@margin-note{@racket[cookie@] and @racket[cookie^] are deprecated.
+They exist for backward-compatibility and will likely be removed in
+the future. New code should use the @racketmodname[net/cookie] module.}
+
 @defmodule[net/cookie-unit]
 
 @defthing[cookie@ unit?]{
diff --git a/pkgs/scribble-pkgs/scribble-lib/info.rkt b/pkgs/scribble-pkgs/scribble-lib/info.rkt
index 61e1f87719..69f39b8087 100644
--- a/pkgs/scribble-pkgs/scribble-lib/info.rkt
+++ b/pkgs/scribble-pkgs/scribble-lib/info.rkt
@@ -4,6 +4,7 @@
 
 (define deps '("base"
                "compatibility-lib"
+	       "net-lib"
                "at-exp-lib"
                "draw-lib" 
                "syntax-color-lib"
diff --git a/pkgs/swindle/info.rkt b/pkgs/swindle/info.rkt
index 9a2076e75f..f4fd943803 100644
--- a/pkgs/swindle/info.rkt
+++ b/pkgs/swindle/info.rkt
@@ -36,5 +36,6 @@
                "compatibility-lib"
                "drracket"
                "gui-lib"
+	       "net-lib"
                "string-constants-lib"))
 (define build-deps '("scribble-lib"))
diff --git a/pkgs/typed-racket-more/info.rkt b/pkgs/typed-racket-more/info.rkt
index 1a6ab1ae24..465fc75ea9 100644
--- a/pkgs/typed-racket-more/info.rkt
+++ b/pkgs/typed-racket-more/info.rkt
@@ -3,6 +3,7 @@
 (define collection 'multi)
 
 (define deps '("base"
+	       "net-lib"
                "draw-lib"
                "rackunit-lib"
                "typed-racket-lib"
diff --git a/pkgs/web-server-pkgs/web-server-doc/info.rkt b/pkgs/web-server-pkgs/web-server-doc/info.rkt
index feb1f929d3..5ed6f5aeaa 100644
--- a/pkgs/web-server-pkgs/web-server-doc/info.rkt
+++ b/pkgs/web-server-pkgs/web-server-doc/info.rkt
@@ -3,6 +3,7 @@
 (define collection 'multi)
 
 (define build-deps '("compatibility-lib"
+		     "net-lib"
                      "rackunit-lib"
                      "sandbox-lib"
                      "scribble-lib"
diff --git a/pkgs/web-server-pkgs/web-server-lib/info.rkt b/pkgs/web-server-pkgs/web-server-lib/info.rkt
index 710ec2f1b2..4ee89249b4 100644
--- a/pkgs/web-server-pkgs/web-server-lib/info.rkt
+++ b/pkgs/web-server-pkgs/web-server-lib/info.rkt
@@ -3,6 +3,7 @@
 (define collection 'multi)
 
 (define deps '("base"
+	       "net-lib"
                "compatibility-lib"
                "scribble-lib"
                "unstable-list-lib"