diff --git a/doc/latex/decls.tex b/doc/latex/decls.tex
index f16dacf..3607561 100644
--- a/doc/latex/decls.tex
+++ b/doc/latex/decls.tex
@@ -279,3 +279,5 @@
 
 
 \makeatother
+
+\dontuseimgforhtmlmath
diff --git a/doc/latex/ftp.tex b/doc/latex/ftp.tex
index b44b12c..56d616e 100644
--- a/doc/latex/ftp.tex
+++ b/doc/latex/ftp.tex
@@ -207,11 +207,11 @@ where xyz is a three digit code which indicates whether the operation
 succeeded or not, whether the server is waiting for more data, etc.
 The server may also send multiline messages of the form
 
-\begin{code}
+\begin{alltt}
 xyz- <space> Start of multiline message <CR> <LF>
 [ <space>+ More information ]* <CR> <LF>
 xyz <space> End of multiline message <CR> <LF>%
-\end{code}
+\end{alltt}
 
 For further informations have a look at the source file.
 
@@ -274,3 +274,8 @@ Items of the following list are necessary in order to use this module:
 \item Automatic relogin a la \ex{ang-ftp}.
 \end{itemize}
 
+%%% Local Variables: 
+%%% mode: latex
+%%% TeX-master: man.tex
+%%% End: 
+
diff --git a/doc/latex/ftpd.tex b/doc/latex/ftpd.tex
index 36e7c04..6d8826a 100644
--- a/doc/latex/ftpd.tex
+++ b/doc/latex/ftpd.tex
@@ -58,7 +58,7 @@ and listening on port 8080, use
 This is how the ftp server at the computing faculty of the university
 of Tuebingen\footnote{\texttt{archive.informatik.uni-tuebingen.de}} is
 started:
-\begin{code}
+\begin{alltt}
 #!/bin/sh /scsh-0.6-alpha/bin/scsh <<EOF
 ,batch on
 ,config ,load modules.scm
@@ -74,7 +74,8 @@ started:
      (ftpd "/data/archive/"))))
 (dump-scsh-program archive-ftpd "archive-ftpd.image")
 ;; (dump-scsh "archive-ftpd.image")
-EOF\end{code}
+EOF
+\end{alltt}
 
 Perhaps you have noticed the \ex{with-syslog-destination} command.
 \ex{ftpd} generates syslog-messages that can be controlled via this
@@ -195,5 +196,5 @@ non-anonymous logins) \\
 
 %%% Local Variables: 
 %%% mode: latex
-%%% TeX-master: t
+%%% TeX-master: man.tex
 %%% End: 
diff --git a/doc/latex/httpd.tex b/doc/latex/httpd.tex
index f93c055..1ae5084 100644
--- a/doc/latex/httpd.tex
+++ b/doc/latex/httpd.tex
@@ -151,11 +151,11 @@ one argument, a \ex{httpd\=options}-record:
 %  to \sharpf.
 
   For example
-  \begin{code}
+\begin{alltt}
 (httpd (with-path-handler 
         (rooted-file-handler "/usr/local/etc/httpd")
         (with-root-directory "/usr/local/etc/httpd")))
-  \end{code}
+\end{alltt}
   
   starts the server on port 80 with
   ``\ex{/usr/\ob{}local/\ob{}etc/\ob{}httpd}'' as root directory and
@@ -192,14 +192,15 @@ one argument, a \ex{httpd\=options}-record:
   The \semvar{req} argument is a request record giving all the details
   of the client's request; it has the following structure: \FIXME{Make
     the record's structure a table}
-  \begin{code}
+\begin{alltt}
 (define-record request
  method            ; A string such as "GET", "PUT", etc.
  uri               ; The escaped URI string as read from request line.
  url               ; An http URL record (see url.scm).
  version           ; A (major . minor) integer pair.
  headers           ; An rfc822 header alist (see rfc822.scm).
- socket)           ; The socket connected to the client.\end{code}
+ socket)           ; The socket connected to the client.
+\end{alltt}
 
 The \semvar{path} argument is the URL's path, parsed and split at
 slashes into a string list. For example, if the Web client
@@ -256,13 +257,14 @@ and built upon (exported by the \ex{httpd\=basic\=handlers}-structure):
   of the path space.
           
   Example: A typical top-level path handler is
-\begin{code}          
+\begin{alltt}          
 (define ph
   (alist-path-dispatcher
-      `(("h"       . ,(home-dir-handler "public_html"))
+      `(("h"       . ,(home-dir-handler "public\_html"))
         ("cgi-bin" . ,(cgi-handler "/usr/local/etc/httpd/cgi-bin"))
         ("seval"   . ,seval-handler))
-      (rooted-file-handler "/usr/local/etc/httpd/htdocs")))\end{code}
+      (rooted-file-handler "/usr/local/etc/httpd/htdocs")))
+\end{alltt}
     
     This means:
 \begin{itemize}          
@@ -428,5 +430,5 @@ utility to anyone writing a custom path-handler. Read the files first.
    
 %%% Local Variables: 
 %%% mode: latex
-%%% TeX-master: t
+%%% TeX-master: man.tex
 %%% End: 
diff --git a/doc/latex/intro.tex b/doc/latex/intro.tex
index ab1ad8a..0d50ce0 100644
--- a/doc/latex/intro.tex
+++ b/doc/latex/intro.tex
@@ -112,7 +112,7 @@ For the time being, it may help to look at the following. Scsh is started
 in the sunet directory. Then, the description file of the modules is
 loaded and the ftp-module is opened (to use a ftp client). After the
 things are done, scsh is finished via the \verb|,exit| command.
-\begin{code}
+\begin{alltt}
 atari-2600[72] scsh-0.6
 Welcome to scsh 0.6.0 (Chinese Democracy)
 Type ,? for help.
@@ -125,9 +125,10 @@ Load structure ftp (y/n)? y
 [ftp ftp.scm]
 > ; do something nasty
 > ,exit
-atari-2600[73]\end{code}
+atari-2600[73]
+\end{alltt}
 
 %%% Local Variables: 
 %%% mode: latex
-%%% TeX-master: t
+%%% TeX-master: man
 %%% End: 
diff --git a/doc/latex/man.tex b/doc/latex/man.tex
index 4cc6292..abc2602 100644
--- a/doc/latex/man.tex
+++ b/doc/latex/man.tex
@@ -1,10 +1,11 @@
-\documentclass[11pt]{article}
+\documentclass{article}
+
 \usepackage[latin1]{inputenc}
-\usepackage{code}
-%\usepackage{a4wide}
-\date{28. Januar 2002}
-\author{composed by Andreas Bernauer\footnote{\texttt{bernauer@informatik.uni-tuebingen.de}}}
-\title{Documentation of the sunet-package}
+\usepackage{alltt}
+\usepackage{tex2page}
+
+\author{Andreas \and Bernauer, Olin Shivers \and Mike Sperber}
+\title{The Scheme Untergrund Networking Package}
 
 \input{decls}
 
@@ -12,7 +13,7 @@
 \maketitle
 \begin{abstract}
 This document contains informations for users and programmers using
-the sunet package.
+the SUnet package.
 \end{abstract}
 \tableofcontents
 
@@ -30,5 +31,4 @@ the sunet package.
 \include{nettime}
 \include{smtp}
 \include{pop3}
-%\FIXME{Is there a possibility to get rid of the overfull \\hboxes?}
 \end{document}
diff --git a/doc/latex/netrc.tex b/doc/latex/netrc.tex
index 13b968b..ac01016 100644
--- a/doc/latex/netrc.tex
+++ b/doc/latex/netrc.tex
@@ -13,10 +13,10 @@ On Unix systems the \ex{~/.netrc} file (in the user's home directory)
 may contain information allowing automatic login to remote hosts.  The
 format of the file is defined in the \ex{ftp}(1) manual page.  Example
 lines are
-\begin{code}
+\begin{alltt}
 machine ondine.cict.fr login marsden password secret
 default login anonymous password user@site%
-\end{code}
+\end{alltt}
 
 The \ex{~/.netrc} file should be protected by appropriate permissions, and
 (like \ex{/usr/bin/ftp}) this library will refuse to read the file if it is
@@ -39,10 +39,10 @@ Note following restrictions and differences:
 
 What you probably want, is to read out the default netrc-file. Do the
 following:
-\begin{code}
+\begin{alltt}
  (let ((netrc-record (netrc:parse)))
     (netrc:lookup netrc-record "name of the machine")) 
-\end{code}
+\end{alltt}
  
 and you will receive three values: \semvar{login-name},
 \semvar{password} and \semvar{account-name}. If you only want the
@@ -138,5 +138,5 @@ a default login / password if the machine is unknown.
 
 %%% Local Variables: 
 %%% mode: latex
-%%% TeX-master: t
+%%% TeX-master: man.tex
 %%% End: 
diff --git a/doc/latex/rfc822.tex b/doc/latex/rfc822.tex
index 8a8f57f..00a8154 100644
--- a/doc/latex/rfc822.tex
+++ b/doc/latex/rfc822.tex
@@ -114,11 +114,12 @@ the empty string or the two-char string \ex{cr}/\ex{lf} (or the EOF object).
 
 For the following definitions' examples, let's use this set of of
 RFC~822 headers:
-\begin{code}
+\begin{alltt}
      From: shivers
      To: ziggy,
        newts
-     To: gjs, tk\end{code}
+     To: gjs, tk
+\end{alltt}
 %
 
 \begin{defundesc}{get-header-all} {headers name} {string list list}
@@ -140,9 +141,10 @@ RFC~822 headers:
   (newline by default), e.g.\
   \codex{(get-header hdrs 'to)}
   results to
-  \begin{code}
+\begin{alltt}
 " ziggy,
-  newts"\end{code}
+  newts"
+\end{alltt}
 %
   Note, that \ex{newts} is led by two spaces.
 \end{defundesc}
@@ -166,5 +168,5 @@ RFC~822 headers:
 
 %%% Local Variables: 
 %%% mode: latex
-%%% TeX-master: t
+%%% TeX-master: man.tex
 %%% End: 
diff --git a/doc/latex/uri.tex b/doc/latex/uri.tex
index fab555a..5f8e306 100644
--- a/doc/latex/uri.tex
+++ b/doc/latex/uri.tex
@@ -145,39 +145,45 @@ Perhaps I find it out later.}
   somewhere in the path referring to root but not being backed up.
   Examples: 
 %FIXME: Can't we have a better environment for examples like these?
-  \begin{code}
+\begin{alltt}
 (simplify-uri-path
- (split-uri-path  "/foo/bar/baz/.."  0 15))\end{code} 
+ (split-uri-path  "/foo/bar/baz/.."  0 15))
+\end{alltt} 
   results to 
   \codex{'("" "foo" "bar")}
 
-  \begin{code}
+\begin{alltt}
 (simplify-uri-path 
- (split-uri-path "foo/bar/baz/../../.." 0 20))\end{code}
+ (split-uri-path "foo/bar/baz/../../.." 0 20))
+\end{alltt}
   results to
   \codex{'()}
 
-  \begin{code}
+\begin{alltt}
 (simplify-uri-path 
- (split-uri-path "/foo/../.." 0 10))\end{code}
+ (split-uri-path "/foo/../.." 0 10))
+\end{alltt}
   results to
   \codex{\sharpf          ; tried to back up root}
 
-  \begin{code}
+\begin{alltt}
 (simplify-uri-path 
- (split-uri-path "foo/bar//" 0 9))\end{code}
+ (split-uri-path "foo/bar//" 0 9))
+\end{alltt}
   results to
   \codex{'("")       ; "//" refers to root}
 
-\begin{code}
+\begin{alltt}
 (simplify-uri-path 
- (split-uri-path "foo/bar/" 0 8))\end{code}
+ (split-uri-path "foo/bar/" 0 8))
+\end{alltt}
   results to 
   \codex{'("")       ; last "/" also refers to root}
 
-  \begin{code}
+\begin{alltt}
 (simplify-uri-path 
- (split-uri-path "/foo/bar//baz/../.." 0 19))\end{code}
+ (split-uri-path "/foo/bar//baz/../.." 0 19))
+\end{alltt}
   results to
   \codex{\sharpf          ; tries to back up root}
 \end{defundesc}
@@ -215,8 +221,7 @@ Perhaps I find it out later.}
 
 %EOF
 
-
 %%% Local Variables: 
 %%% mode: latex
-%%% TeX-master: t
+%%% TeX-master: man.tex
 %%% End: 
diff --git a/doc/latex/url.tex b/doc/latex/url.tex
index 15bed1e..1d7eb43 100644
--- a/doc/latex/url.tex
+++ b/doc/latex/url.tex
@@ -54,7 +54,7 @@ only the parsing of http URLs is implemented.
   are escaped before the are put together.  
 
   Example:
-  \begin{code}
+\begin{alltt}
 > (define default 
     (make-userhost 
      "andreas"  "se ret" "www.sf.net" "80"))
@@ -66,7 +66,7 @@ only the parsing of http URLs is implemented.
 '#{userhost}
 > (userhost->string ##)
 "foo\%20bar:se\%20ret@www.scsh.net:80"
-\end{code}
+\end{alltt}
 
   For details about escaping and unescaping see section ``Handle
   URIs'' at page \pageref{sec:uri}.
@@ -128,5 +128,5 @@ only the parsing of http URLs is implemented.
 
 %%% Local Variables: 
 %%% mode: latex
-%%% TeX-master: t
+%%% TeX-master: man.tex
 %%% End: