diff --git a/Makefile.in b/Makefile.in
index 61e3021..8aae934 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -338,16 +338,16 @@ mxml.xml:	mxmldoc-static mxml.h $(PUBLIBOBJS:.o=.c)
 	$(RM) mxml.xml
 	./mxmldoc-static --header doc/reference.heading mxml.xml mxml.h $(PUBLIBOBJS:.o=.c) >doc/reference.html
 	if test "x`uname`" = xDarwin; then \
-		./mxmldoc-static --docset ~/Library/Developer/Shared/Documentation/DocSets/org.minixml.docset \
+		./mxmldoc-static --docset org.minixml.docset \
 			--docversion @VERSION@ --feedname minixml.org \
 			--feedurl http://www.minixml.org/org.minixml.atom \
 			--header doc/docset.header --intro doc/docset.intro \
 			--css doc/docset.css --title "Mini-XML API Reference" \
-			mxml.xml; \
+			mxml.xml || exit 1; \
 		/Developer/usr/bin/docsetutil package --output org.minixml.xar \
 			--atom org.minixml.atom \
 			--download-url http://www.minixml.org/org.minixml.xar \
-			~/Library/Developer/Shared/Documentation/DocSets/org.minixml.docset; \
+			org.minixml.docset || exit 1; \
 	fi
 
 valgrind:	mxmldoc-static
diff --git a/doc/reference.html b/doc/reference.html
index 86cf902..0d4f2d7 100644
--- a/doc/reference.html
+++ b/doc/reference.html
@@ -142,6 +142,7 @@ hspace="10" width="100" height="100" alt="C"></a>Library
 Reference</h1>
 
 <h2 class="title">Contents</h2>
+<ul class="contents">
 <li><a href="#FUNCTIONS">Functions</a><ul class="code">
 <li><a href="#mxmlAdd" title="Add a node to a tree.">mxmlAdd</a></li>
 <li><a href="#mxmlDelete" title="Delete a node and all of its children.">mxmlDelete</a></li>
diff --git a/mxmldoc.c b/mxmldoc.c
index e004bc5..4960518 100644
--- a/mxmldoc.c
+++ b/mxmldoc.c
@@ -4925,6 +4925,8 @@ write_toc(FILE        *out,		/* I - Output file */
 
     fclose(fp);
   }
+  else if (!xml)
+    fputs("<ul class=\"contents\">\n", out);
 
  /*
   * Next the classes...
@@ -4955,7 +4957,7 @@ write_toc(FILE        *out,		/* I - Output file */
 	             "<Path>Documentation/index.html</Path>\n"
 	             "<Anchor>%s</Anchor>\n"
 		     "<Name>%s</Name>\n"
-		     "</Node>", xmlid ++, name, name);
+		     "</Node>\n", xmlid ++, name, name);
       }
       else
       {
@@ -5002,7 +5004,7 @@ write_toc(FILE        *out,		/* I - Output file */
 	             "<Path>Documentation/index.html</Path>\n"
 	             "<Anchor>%s</Anchor>\n"
 		     "<Name>%s</Name>\n"
-		     "</Node>", xmlid ++, name, name);
+		     "</Node>\n", xmlid ++, name, name);
       }
       else
       {
@@ -5015,9 +5017,7 @@ write_toc(FILE        *out,		/* I - Output file */
       function = find_public(function, doc, "function");
     }
 
-    if (xml)
-      fputs("</Subnodes></Node>\n", out);
-    else
+    if (!xml)
       fputs("</ul></li>\n", out);
   }
 
@@ -5049,7 +5049,7 @@ write_toc(FILE        *out,		/* I - Output file */
 	             "<Path>Documentation/index.html</Path>\n"
 	             "<Anchor>%s</Anchor>\n"
 		     "<Name>%s</Name>\n"
-		     "</Node>", xmlid ++, name, name);
+		     "</Node>\n", xmlid ++, name, name);
       }
       else
       {
@@ -5062,9 +5062,7 @@ write_toc(FILE        *out,		/* I - Output file */
       scut = find_public(scut, doc, "typedef");
     }
 
-    if (xml)
-      fputs("</Subnodes></Node>\n", out);
-    else
+    if (!xml)
       fputs("</ul></li>\n", out);
   }
 
@@ -5096,7 +5094,7 @@ write_toc(FILE        *out,		/* I - Output file */
 	             "<Path>Documentation/index.html</Path>\n"
 	             "<Anchor>%s</Anchor>\n"
 		     "<Name>%s</Name>\n"
-		     "</Node>", xmlid ++, name, name);
+		     "</Node>\n", xmlid ++, name, name);
       }
       else
       {
@@ -5109,9 +5107,7 @@ write_toc(FILE        *out,		/* I - Output file */
       scut = find_public(scut, doc, "struct");
     }
 
-    if (xml)
-      fputs("</Subnodes></Node>\n", out);
-    else
+    if (!xml)
       fputs("</ul></li>\n", out);
   }
 
@@ -5144,7 +5140,7 @@ write_toc(FILE        *out,		/* I - Output file */
 	             "<Path>Documentation/index.html</Path>\n"
 	             "<Anchor>%s</Anchor>\n"
 		     "<Name>%s</Name>\n"
-		     "</Node>", xmlid ++, name, name);
+		     "</Node>\n", xmlid ++, name, name);
       }
       else
       {
@@ -5157,9 +5153,7 @@ write_toc(FILE        *out,		/* I - Output file */
       scut = find_public(scut, doc, "union");
     }
 
-    if (xml)
-      fputs("</Subnodes></Node>\n", out);
-    else
+    if (!xml)
       fputs("</ul></li>\n", out);
   }
 
@@ -5191,7 +5185,7 @@ write_toc(FILE        *out,		/* I - Output file */
 	             "<Path>Documentation/index.html</Path>\n"
 	             "<Anchor>%s</Anchor>\n"
 		     "<Name>%s</Name>\n"
-		     "</Node>", xmlid ++, name, name);
+		     "</Node>\n", xmlid ++, name, name);
       }
       else
       {
@@ -5204,9 +5198,7 @@ write_toc(FILE        *out,		/* I - Output file */
       arg = find_public(arg, doc, "variable");
     }
 
-    if (xml)
-      fputs("</Subnodes></Node>\n", out);
-    else
+    if (!xml)
       fputs("</ul></li>\n", out);
   }
 
@@ -5238,7 +5230,7 @@ write_toc(FILE        *out,		/* I - Output file */
 	             "<Path>Documentation/index.html</Path>\n"
 	             "<Anchor>%s</Anchor>\n"
 		     "<Name>%s</Name>\n"
-		     "</Node>", xmlid ++, name, name);
+		     "</Node>\n", xmlid ++, name, name);
       }
       else
       {
@@ -5261,9 +5253,7 @@ write_toc(FILE        *out,		/* I - Output file */
   * That's it!
   */
 
-  if (xml)
-    fputs("</Subnodes>\n", out);
-  else
+  if (!xml)
     fputs("</ul>\n", out);
 }