diff --git a/manual/manual.epub b/manual/manual.epub
index f76c841ef..23b343386 100644
Binary files a/manual/manual.epub and b/manual/manual.epub differ
diff --git a/manual/manual.html b/manual/manual.html
index d2610c167..bb3f6b3e9 100644
--- a/manual/manual.html
+++ b/manual/manual.html
@@ -1,3 +1,29 @@
+<h1 id="table-of-contents">Table of Contents</h1>
+<ol type="1">
+<li><a href="#introduction">Introduction</a></li>
+<li><a href="#installation">Installation</a></li>
+<li><a href="#upgrading">Upgrading</a></li>
+<li><a href="#housekeeping">Housekeeping</a></li>
+<li><a href="#registering-accounts">Registering accounts</a></li>
+<li><a href="#the-importance-of-good-defaults">The importance of good
+defaults</a></li>
+<li><a href="#logging-in">Logging in</a></li>
+<li><a href="#account-profiles">Account Profiles</a></li>
+<li><a href="#following">Following</a></li>
+<li><a href="#creating-posts">Creating posts</a></li>
+<li><a href="#the-timeline">The Timeline</a></li>
+<li><a href="#calendar">Calendar</a></li>
+<li><a href="#side-columns">Side columns</a></li>
+<li><a href="#media-timeline">Media timeline</a></li>
+<li><a href="#moderation">Moderation</a></li>
+<li><a href="#themes">Themes</a></li>
+<li><a href="#sharing-economy">Sharing economy</a></li>
+<li><a href="#search">Search</a></li>
+<li><a href="#browsing-in-a-command-shell">Browsing in a command
+shell</a></li>
+<li><a href="#building-fediverse-communities">Building fediverse
+communities</a></li>
+</ol>
 <h1 id="introduction">Introduction</h1>
 <p><em>The fediverse</em> is a set of federated servers, typically using
 a communication protocol called <a
diff --git a/manual/manual.md b/manual/manual.md
index 5bbd61757..95041edc9 100644
--- a/manual/manual.md
+++ b/manual/manual.md
@@ -1,3 +1,25 @@
+# Table of Contents
+1. [Introduction](#introduction)
+2. [Installation](#installation)
+3. [Upgrading](#upgrading)
+4. [Housekeeping](#housekeeping)
+5. [Registering accounts](#registering-accounts)
+6. [The importance of good defaults](#the-importance-of-good-defaults)
+7. [Logging in](#logging-in)
+8. [Account Profiles](#account-profiles)
+9. [Following](#following)
+10. [Creating posts](#creating-posts)
+11. [The Timeline](#the-timeline)
+12. [Calendar](#calendar)
+13. [Side columns](#side-columns)
+14. [Media timeline](#media-timeline)
+15. [Moderation](#moderation)
+16. [Themes](#themes)
+17. [Sharing economy](#sharing-economy)
+18. [Search](#search)
+19. [Browsing in a command shell](#browsing-in-a-command-shell)
+20. [Building fediverse communities](#building-fediverse-communities)
+
 # Introduction
 *The fediverse* is a set of federated servers, typically using a communication protocol called [ActivityPub](https://www.w3.org/TR/activitypub) which was devised by the [social working group](https://www.w3.org/wiki/Socialwg) within the World Wide Web Consortium (W3C). At present it is mostly used for [microblogging](https://en.wikipedia.org/wiki/Microblogging), although ActivityPub is sufficiently general that it can also be used for a variety of other purposes.