diff --git a/bugs.html b/bugs.html
index c17020c8b..db6b33b79 100644
--- a/bugs.html
+++ b/bugs.html
@@ -383,6 +383,20 @@
 
 <!-- BEFORE: 1st line of markdown file: bugs.md -->
 <h1 id="bugs-and-misfeatures">Bugs and (mis)features</h1>
+<h2 id="table-of-contents">Table of Contents</h2>
+<p>If you are going to try and fix any bugs please read the next sections first.
+If however you want to jump to a specific year or you have already done so and
+you wish to help with a year, you can use these links:</p>
+<ul>
+<li><a href="#1984">1984 entries</a> | <a href="#1985">1985 entries</a> | <a href="#1986">1986 entries</a> | <a href="#1987">1987 entries</a></li>
+<li><a href="#1988">1988 entries</a> | <a href="#1989">1989 entries</a> | <a href="#1990">1990 entries</a> | <a href="#1991">1991 entries</a></li>
+<li><a href="#1992">1992 entries</a> | <a href="#1993">1993 entries</a> | <a href="#1994">1994 entries</a> | <a href="#1995">1995 entries</a></li>
+<li><a href="#1996">1996 entries</a> | <a href="#1998">1998 entries</a> | <a href="#2000">2000 entries</a> | <a href="#2001">2001 entries</a></li>
+<li><a href="#2004">2004 entries</a> | <a href="#2005">2005 entries</a> | <a href="#2006">2006 entries</a> | <a href="#2011">2011 entries</a></li>
+<li><a href="#2012">2012 entries</a> | <a href="#2013">2013 entries</a> | <a href="#2014">2014 entries</a> | <a href="#2015">2015 entries</a></li>
+<li><a href="#2018">2018 entries</a> | <a href="#2019">2019 entries</a> | <a href="#2020">2020 entries</a></li>
+</ul>
+<h2 id="please-read-the-next-sections-if-you-wish-to-help">PLEASE read the next sections if you wish to help</h2>
 <p>There are a number of known problems with IOCCC entries: many of
 which have to do with differences between today’s compiler environments
 and those of today. In some cases the original code has a bug, some
diff --git a/bugs.md b/bugs.md
index 1c5177900..171cc1d59 100644
--- a/bugs.md
+++ b/bugs.md
@@ -1,5 +1,21 @@
 # Bugs and (mis)features
 
+## Table of Contents
+
+If you are going to try and fix any bugs **PLEASE READ THE NEXT SECTIONS _FIRST_**.
+If however you want to jump to a specific year or you have already read the
+below and you wish to help with a year, you can use these links:
+
+- [1984 entries](#1984)	|	[1985 entries](#1985)	|	[1986 entries](#1986)	|	[1987 entries](#1987)
+- [1988 entries](#1988)	|	[1989 entries](#1989)	|	[1990 entries](#1990)	|	[1991 entries](#1991)
+- [1992 entries](#1992)	|	[1993 entries](#1993)	|	[1994 entries](#1994)	|	[1995 entries](#1995)
+- [1996 entries](#1996)	|	[1998 entries](#1998)	|	[2000 entries](#2000)	|	[2001 entries](#2001)
+- [2004 entries](#2004)	|	[2005 entries](#2005)	|	[2006 entries](#2006)	|	[2011 entries](#2011)
+- [2012 entries](#2012)	|	[2013 entries](#2013)	|	[2014 entries](#2014)	|	[2015 entries](#2015)
+- [2018 entries](#2018)	|	[2019 entries](#2019)	|	[2020 entries](#2020)
+
+## PLEASE read the next sections if you wish to help
+
 There are a number of known problems with IOCCC entries: many of
 which have to do with differences between today's compiler environments
 and those of today. In some cases the original code has a bug, some