diff --git a/includes/header.html b/includes/header.html
index 830950c..3af7406 100644
--- a/includes/header.html
+++ b/includes/header.html
@@ -17,7 +17,7 @@
         <li id="about"><a href="./">About</a></li>
         <li id="news"><a href="news.html">News</a></li>
         <li id="download"><a href="download.html">Download</a></li>
-        <li id="manual"><a href="man.html">Manual</a></li>
+        <li id="manual"><a href="manual.html">Manual</a></li>
         <li id="source"><a href="source.html">Source Code</a></li>
         <li id="bugs">
           <a href="https://savannah.nongnu.org/projects/easejs/">
diff --git a/man.html b/manual.html
similarity index 92%
rename from man.html
rename to manual.html
index 22977ad..559e8aa 100644
--- a/man.html
+++ b/manual.html
@@ -6,7 +6,7 @@
 
 <ul>
   <li><a href="manual/">Multiple Pages (HTML)</a></li>
-  <li><a href="manual.html">Single Page (HTML)</a></li>
+  <li><a href="manual/easejs.html">Single Page (HTML)</a></li>
 </ul>
 
 Additional formats are available, including PDF, Info, plain text and the source
diff --git a/tools/webdoc b/tools/webdoc
index 0f887ae..009315b 100755
--- a/tools/webdoc
+++ b/tools/webdoc
@@ -6,7 +6,7 @@
 # (apart from the website) to have its own style; that makes sense, considering
 # the master branch should have no knowledge of the website.
 #
-#  Copyright (C) 2010 Mike Gerwitz
+#  Copyright (C) 2012, 2013 Mike Gerwitz
 #
 #  This program is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU Affero General Public License as
@@ -20,6 +20,10 @@
 #
 #  You should have received a copy of the GNU Affero General Public License
 #  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# This will produce documentation in the following format:
+#   manual/                      multi-page HTML
+#   manual/easejs.html           single-page HTML
 ##
 
 # ensure that we are within the git repository (otherwise, we cannot generate
@@ -100,11 +104,9 @@ webify()
 git checkout "${WEBDOC_BRANCH:-origin/master}" \
   && make doc-html \
   && git checkout - \
-    && webify "$path_doc_single" \
+    && ln -sf "../manual.html" "$path_doc_multi/easejs.html" \
     && for path in $( find "$path_doc_multi" -name '*.htm?' )
       do
         webify "$path" "../"
       done \
-    && ln -sf \
-      "../$path_doc_single" "../$path_img" "../$path_js" "../$path_doc_multi" \
-      "$path_dest/"
+    && ln -sf "../$path_img" "../$path_js" "../$path_doc_multi" "$path_dest/"