diff --git a/Doc/mac/mac.tex b/Doc/mac/mac.tex
index 096ba117e97..c6c8a2d6b75 100644
--- a/Doc/mac/mac.tex
+++ b/Doc/mac/mac.tex
@@ -1,13 +1,11 @@
-\documentclass{howto}
+\documentclass{manual}
 
 \title{Macintosh Library Modules}
 
 \input{boilerplate}
 
-\makeindex			% tell \index to actually write the
-				% .idx file
-\makemodindex			% ... and the module index as well.
-%\ignorePlatformAnnotation{Mac}
+\makeindex              % tell \index to actually write the .idx file
+\makemodindex           % ... and the module index as well.
 
 
 \begin{document}
@@ -41,9 +39,20 @@ and how to embed it in other applications.
 
 \tableofcontents
 
-\input{libmac}			% MACINTOSH ONLY
+
+\input{using.tex}                       % Using Python on the Macintosh
+
+
+\chapter{MacPython Modules \label{macpython-modules}}
+
+The following modules are only available on the Macintosh, and are
+documented here:
+
+\localmoduletable
+
+\input{libmac}
 \input{libctb}
-\input{libmacconsole}
+%\input{libmacconsole}
 \input{libmacdnr}
 \input{libmacfs}
 \input{libmacic}
@@ -54,6 +63,12 @@ and how to embed it in other applications.
 \input{libmacui}
 \input{libframework}
 \input{libminiae}
+\input{libaepack}
+\input{libaetypes}
+
+\input{toolbox}                         % MacOS Toolbox Modules
+
+\input{undoc}                           % Undocumented Modules
 
 %
 %  The ugly "%begin{latexonly}" pseudo-environments are really just to
@@ -64,11 +79,11 @@ and how to embed it in other applications.
 %begin{latexonly}
 \renewcommand{\indexname}{Module Index}
 %end{latexonly}
-\input{modmac.ind}		% Module Index
+\input{modmac.ind}      % Module Index
 
 %begin{latexonly}
 \renewcommand{\indexname}{Index}
 %end{latexonly}
-\input{mac.ind}			% Index
+\input{mac.ind}         % Index
 
 \end{document}