diff --git a/Doc/lib/lib.tex b/Doc/lib/lib.tex
index b9e8908..758cb23 100644
--- a/Doc/lib/lib.tex
+++ b/Doc/lib/lib.tex
@@ -75,6 +75,7 @@
 \input{libuserdict}
 \input{liboperator}
 \input{libtraceback}
+\input{liblinecache}
 \input{libpickle}
 \input{libcopyreg}		% really copy_reg
 \input{libshelve}
@@ -184,6 +185,8 @@
 \input{liburlparse}
 \input{libsocksvr}
 \input{libbasehttp}
+\input{libsimplehttp}
+\input{libcgihttp}
 
 \input{netdata}
 \input{libsgmllib}
diff --git a/Doc/lib/libbasehttp.tex b/Doc/lib/libbasehttp.tex
index 0a8a0fc..82714b1 100644
--- a/Doc/lib/libbasehttp.tex
+++ b/Doc/lib/libbasehttp.tex
@@ -15,9 +15,8 @@
 This module defines two classes for implementing HTTP servers
 (web servers). Usually, this module isn't used directly, but is used
 as a basis for building functioning web servers. See the
-\module{SimpleHTTPServer} and \module{CGIHTTPServer} modules.
-\refstmodindex{SimpleHTTPServer}
-\refstmodindex{CGIHTTPServer}
+\module{SimpleHTTPServer}\refstmodindex{SimpleHTTPServer} and
+\refmodule{CGIHTTPServer}\refstmodindex{CGIHTTPServer} modules.
 
 The first class, \class{HTTPServer}, is a
 \class{SocketServer.TCPServer} subclass. It creates and listens at the
@@ -221,3 +220,12 @@
 Returns the client address, formatted for logging. A name lookup
 is performed on the client's IP address.
 \end{methoddesc}
+
+
+\begin{seealso}
+  \seemodule{CGIHTTPServer}{Extended request handler that supports CGI
+                            scripts.}
+
+  \seemodule{SimpleHTTPServer}{Basic request handler that limits response
+                               to files actually under the document root.}
+\end{seealso}
diff --git a/Doc/lib/libundoc.tex b/Doc/lib/libundoc.tex
index 0c4fdf8..69bfb76 100644
--- a/Doc/lib/libundoc.tex
+++ b/Doc/lib/libundoc.tex
@@ -23,12 +23,6 @@
 \item[Tkdnd.py]
 --- Drag-and-drop support for \module{Tkinter}.
 
-\item[CGIHTTPServer.py]
---- CGI-savvy HTTP Server
-
-\item[SimpleHTTPServer.py]
---- Simple HTTP Server
-
 \item[test]
 --- Regression testing framework.  This is used for the Python
 regression test, but is useful for other Python libraries as well.
@@ -53,9 +47,6 @@
 \item[dircmp.py]
 --- class to build directory diff tools on
 
-\item[linecache.py]
---- Cache lines from files (used by pdb)
-
 \item[pipes.py]
 --- Conversion pipeline templates (hmm)