diff --git a/doc/MANUAL.html b/doc/MANUAL.html
index b777c64..3dad980 100644
--- a/doc/MANUAL.html
+++ b/doc/MANUAL.html
@@ -15,7 +15,49 @@ Oct 13 2007<br>
 
 </address><a class=ext href="http://non.tuxfamily.org">Home</a><hr></div>
 <div id=body>
-<hr width=50%>
+<div id=toc>
+<h1 id=toc>Table Of Contents</h1>
+<ul>
+<li><a href="#n:1.">1. Description</a>
+<ul><li><a href="#n:1.1.">1.1. Guiding Principles</a>
+
+</ul><li><a href="#n:2.">2. The Interface</a>
+
+<ul><li><a href="#n:2.1.">2.1. The Pattern Editor</a>
+
+<ul><li><a href="#n:2.1.1.">2.1.1. The Notes</a>
+
+<li><a href="#n:2.1.2.">2.1.2. Recording</a>
+
+<li><a href="#n:2.1.3.">2.1.3. The Event Editor</a>
+
+</ul><li><a href="#n:2.2.">2.2. The Phrase Editor</a>
+
+<li><a href="#n:2.3.">2.3. The Sequence Editor</a>
+
+<li><a href="#n:2.4.">2.4. Pattern Triggers</a>
+
+</ul><li><a href="#n:3.">3. MIDI</a>
+
+<ul><li><a href="#n:3.1.">3.1. IO</a>
+
+<ul><li><a href="#n:3.1.1.">3.1.1. About Jack MIDI Connections</a>
+
+</ul><li><a href="#n:3.2.">3.2. Non Files</a>
+
+<li><a href="#n:3.3.">3.3. Exports</a>
+
+<li><a href="#n:3.4.">3.4. Imports</a>
+
+</ul><li><a href="#n:4.">4. Synchronization</a>
+
+<li><a href="#n:5.">5. Control</a>
+
+<li><a href="#n:6.">6. Playback</a>
+
+<li><a href="#n:7.">7. Sister Projects</a>
+
+</ul></ul><hr></div>
 <h1 id="n:1.">1. Description</h1>
 <center><div class="fig image"><table border=1>
 <tr><td><img src="non-new-about.png" alt="fig. "></td></tr>
diff --git a/doc/MANUAL.mu b/doc/MANUAL.mu
index 77367f5..9319c4e 100644
--- a/doc/MANUAL.mu
+++ b/doc/MANUAL.mu
@@ -5,7 +5,7 @@
 ! keywords	Non Jack ALSA FLTK
 ! extra		#(url,http://non.tuxfamily.org,Home)
 
---
+-- Table Of Contents
 
 : Description
 
diff --git a/doc/Makefile b/doc/Makefile
index fc3dbfe..d0cfe4d 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -1,10 +1,9 @@
 
-
-SRCS=OVERVIEW.mu KEYS.mu MANUAL.mu
+SRCS=$(wildcard *.mu)
 OBJS=$(SRCS:.mu=.html)
 
 %.html: %.mu
-	mup html < $< > $@
+	mup.wrapper html $<
 
 .PHONY: all clean