diff --git a/doc/tint2.1 b/doc/tint2.1
index cce2043..138470e 100644
--- a/doc/tint2.1
+++ b/doc/tint2.1
@@ -38,6 +38,35 @@ Make certain workflows, such as multi\-desktop and multi\-monitor, easy to use.
 \fB\fC\-c path_to_config_file\fR
 Specifies which configuration file to use instead of the default.
 .SH CONFIGURATION
+.SS Table of contents
+.RS
+.IP \(bu 2
+Introduction \[la]#introduction\[ra]
+.IP \(bu 2
+Backgrounds and borders \[la]#backgrounds-and-borders\[ra]
+.IP \(bu 2
+Panel \[la]#panel\[ra]
+.IP \(bu 2
+Launcher \[la]#launcher\[ra]
+.IP \(bu 2
+Taskbar/Pager \[la]#taskbar-pager\[ra]
+.IP \(bu 2
+Taskbar buttons \[la]#taskbar-buttons\[ra]
+.IP \(bu 2
+Mouse actions for taskbar buttons \[la]#mouse-actions-for-taskbar-buttons\[ra]
+.IP \(bu 2
+System tray \[la]#system-tray\[ra]
+.IP \(bu 2
+Clock \[la]#clock\[ra]
+.IP \(bu 2
+Tooltip \[la]#tooltip\[ra]
+.IP \(bu 2
+Battery \[la]#battery\[ra]
+.IP \(bu 2
+Executor \[la]#executor\[ra]
+.IP \(bu 2
+Example \[la]#an-example-tint2rc\[ra]
+.RE
 .SS Introduction
 .PP
 The first time you run tint2, it will create the config file in \fB\fC$HOME/.config/tint2/tint2rc\fR (This applies if you have done a clean install. Running tint2 in the source directory without doing 'make install' will not create the config file.)
@@ -46,8 +75,7 @@ You can also specify another file on the command line with the \-c option, e.g.:
 .PP
 If you change the config file while tint2 is running, the command \fB\fCkillall \-SIGUSR1 tint2\fR will force tint2 to reload it.
 .PP
-All the configuration options supported in the config file are listed below. Please note that options marked as \fIunstable\fP are not yet supported in the stable version and might change until the next stable release.
-.PP
+All the configuration options supported in the config file are listed below.
 Try to respect as much as possible the order of the options as given below.
 .SS Backgrounds and borders
 .PP
diff --git a/doc/tint2.md b/doc/tint2.md
index 5f51f79..db5c912 100644
--- a/doc/tint2.md
+++ b/doc/tint2.md
@@ -30,6 +30,34 @@ Goals:
 
 ## CONFIGURATION
 
+### Table of contents
+
+  * [Introduction](#introduction)
+
+  * [Backgrounds and borders](#backgrounds-and-borders)
+
+  * [Panel](#panel)
+
+  * [Launcher](#launcher)
+
+  * [Taskbar/Pager](#taskbar-pager)
+
+  * [Taskbar buttons](#taskbar-buttons)
+
+  * [Mouse actions for taskbar buttons](#mouse-actions-for-taskbar-buttons)
+
+  * [System tray](#system-tray)
+
+  * [Clock](#clock)
+
+  * [Tooltip](#tooltip)
+
+  * [Battery](#battery)
+
+  * [Executor](#executor)
+
+  * [Example](#an-example-tint2rc)
+
 ### Introduction
 
 The first time you run tint2, it will create the config file in `$HOME/.config/tint2/tint2rc` (This applies if you have done a clean install. Running tint2 in the source directory without doing 'make install' will not create the config file.)