diff --git a/pep-3108.txt b/pep-3108.txt
index 45d5c35e0..cc9266fc0 100644
--- a/pep-3108.txt
+++ b/pep-3108.txt
@@ -503,8 +503,11 @@ for the suggested package (if not already existent) is being proposed.
 
 * email
 
+  + imaplib
   + mailbox
+  + mailcap
   + mhlib
+  + poplib
 
 * Databases
 
@@ -530,24 +533,38 @@ for the suggested package (if not already existent) is being proposed.
 
   + DocXMLRPCServer
   + SimpleXMLRPCServer
+  + xmlrpclib
 
-* Web
+* Internet
 
-  + urllib
-  + urllib
-  + urlparse
-  + httplib
-  + cgi
-  + cgitb
   + BaseHTTPServer
-  + BaseCGIServer
-  + SimpleHTTPServer
-  + htmllib
-  + htmlentitydefs
-  + HTMLParser
+  + cgi
+  + CGIHTTPServer
+  + cgitb
   + Cookie
   + cookielib
-  + Could also just gather HTTP servers.
+  + ftplib (?)
+  + htmlentitydefs
+  + htmllib
+  + HTMLParser
+  + httplib
+  + netrc (?)
+  + nntplib (?)
+  + sgmllib (?)
+  + SimpleHTTPServer
+  + stringprep
+  + urllib
+  + urllib2
+  + urlparse
+  + webbrowser
+
+* HTTP servers
+
+  + BaseHTTPServer
+  + CGIHTTPServer
+  + DocXMLRPCServer
+  + SimpleHTTPServer
+  + SimpleXMLRPCServer
 
 
 Modules reliant on obsolete/rarely used file formats?