diff --git a/docs/content/en/getting-started/configuration-markup.md b/docs/content/en/getting-started/configuration-markup.md
index e19bbe47fb6..10f9685b0e4 100644
--- a/docs/content/en/getting-started/configuration-markup.md
+++ b/docs/content/en/getting-started/configuration-markup.md
@@ -116,6 +116,12 @@ endLevel
 ordered
 : Whether or not to generate an ordered list instead of an unordered list.
 
+pre
+: HTML to immediately precede the outer list element. Default value is `<nav id="TableOfContents">`.
+
+post
+: HTML to immediately follow the outer list element. Default value is `</nav>`.
+
 
 ## Markdown Render Hooks
 
diff --git a/hugolib/page__per_output.go b/hugolib/page__per_output.go
index f59b5f9b545..5aa42e5dbd0 100644
--- a/hugolib/page__per_output.go
+++ b/hugolib/page__per_output.go
@@ -137,6 +137,8 @@ func newPageContentOutput(p *pageState, po *pageOutput) (*pageContentOutput, err
 						cfg.TableOfContents.StartLevel,
 						cfg.TableOfContents.EndLevel,
 						cfg.TableOfContents.Ordered,
+						&cfg.TableOfContents.Pre,
+						&cfg.TableOfContents.Post,
 					),
 				)
 			} else {
diff --git a/markup/goldmark/convert_test.go b/markup/goldmark/convert_test.go
index 2b66a191003..f7bb0ad82ca 100644
--- a/markup/goldmark/convert_test.go
+++ b/markup/goldmark/convert_test.go
@@ -162,7 +162,7 @@ description
 
 	toc, ok := b.(converter.TableOfContentsProvider)
 	c.Assert(ok, qt.Equals, true)
-	tocHTML := toc.TableOfContents().ToHTML(1, 2, false)
+	tocHTML := toc.TableOfContents().ToHTML(1, 2, false, nil, nil)
 	c.Assert(tocHTML, qt.Contains, "TableOfContents")
 }
 
diff --git a/markup/goldmark/toc_test.go b/markup/goldmark/toc_test.go
index f8fcf79d4d9..38494232607 100644
--- a/markup/goldmark/toc_test.go
+++ b/markup/goldmark/toc_test.go
@@ -60,7 +60,7 @@ And then some.
 	c.Assert(err, qt.IsNil)
 	b, err := conv.Convert(converter.RenderContext{Src: []byte(content), RenderTOC: true})
 	c.Assert(err, qt.IsNil)
-	got := b.(converter.TableOfContentsProvider).TableOfContents().ToHTML(2, 3, false)
+	got := b.(converter.TableOfContentsProvider).TableOfContents().ToHTML(2, 3, false, nil, nil)
 	c.Assert(got, qt.Equals, `<nav id="TableOfContents">
   <ul>
     <li><a href="#first-h2---now-with-typography">First h2&mdash;now with typography!</a>
@@ -110,7 +110,7 @@ func TestEscapeToc(t *testing.T) {
 	// content := ""
 	b, err := safeConv.Convert(converter.RenderContext{Src: []byte(content), RenderTOC: true})
 	c.Assert(err, qt.IsNil)
-	got := b.(converter.TableOfContentsProvider).TableOfContents().ToHTML(1, 2, false)
+	got := b.(converter.TableOfContentsProvider).TableOfContents().ToHTML(1, 2, false, nil, nil)
 	c.Assert(got, qt.Equals, `<nav id="TableOfContents">
   <ul>
     <li><a href="#a--b--c--d">A &lt; B &amp; C &gt; D</a></li>
@@ -122,7 +122,7 @@ func TestEscapeToc(t *testing.T) {
 
 	b, err = unsafeConv.Convert(converter.RenderContext{Src: []byte(content), RenderTOC: true})
 	c.Assert(err, qt.IsNil)
-	got = b.(converter.TableOfContentsProvider).TableOfContents().ToHTML(1, 2, false)
+	got = b.(converter.TableOfContentsProvider).TableOfContents().ToHTML(1, 2, false, nil, nil)
 	c.Assert(got, qt.Equals, `<nav id="TableOfContents">
   <ul>
     <li><a href="#a--b--c--d">A &lt; B &amp; C &gt; D</a></li>
diff --git a/markup/tableofcontents/tableofcontents.go b/markup/tableofcontents/tableofcontents.go
index 2e7f47d207f..9ea356a78c8 100644
--- a/markup/tableofcontents/tableofcontents.go
+++ b/markup/tableofcontents/tableofcontents.go
@@ -62,13 +62,15 @@ func (toc *Root) AddAt(h Heading, row, level int) {
 }
 
 // ToHTML renders the ToC as HTML.
-func (toc Root) ToHTML(startLevel, stopLevel int, ordered bool) string {
+func (toc Root) ToHTML(startLevel, stopLevel int, ordered bool, pre *string, post *string) string {
 	b := &tocBuilder{
 		s:          strings.Builder{},
 		h:          toc.Headings,
 		startLevel: startLevel,
 		stopLevel:  stopLevel,
 		ordered:    ordered,
+		pre:        pre,
+		post:       post,
 	}
 	b.Build()
 	return b.s.String()
@@ -81,16 +83,26 @@ type tocBuilder struct {
 	startLevel int
 	stopLevel  int
 	ordered    bool
+	pre        *string
+	post       *string
 }
 
 func (b *tocBuilder) Build() {
 	b.writeNav(b.h)
 }
 
-func (b *tocBuilder) writeNav(h Headings) {
-	b.s.WriteString("<nav id=\"TableOfContents\">")
-	b.writeHeadings(1, 0, b.h)
-	b.s.WriteString("</nav>")
+func (b *tocBuilder) writeNav(h Headers) {
+	if b.pre != nil {
+		b.s.WriteString(*b.pre)
+	} else {
+		b.s.WriteString("<nav id=\"TableOfContents\">")
+	}
+	b.writeHeaders(1, 0, b.h)
+	if b.post != nil {
+		b.s.WriteString(*b.post)
+	} else {
+		b.s.WriteString("</nav>")
+	}
 }
 
 func (b *tocBuilder) writeHeadings(level, indent int, h Headings) {
@@ -154,6 +166,8 @@ var DefaultConfig = Config{
 	StartLevel: 2,
 	EndLevel:   3,
 	Ordered:    false,
+	Pre:        "<nav id=\"TableOfContents\">",
+	Post:       "</nav>",
 }
 
 type Config struct {
@@ -167,4 +181,8 @@ type Config struct {
 
 	// Whether to produce a ordered list or not.
 	Ordered bool
+
+	// Override default behavior for ToC navigation heading.
+	Pre  string
+	Post string
 }
diff --git a/markup/tableofcontents/tableofcontents_test.go b/markup/tableofcontents/tableofcontents_test.go
index daeb9f991e9..cca4df67944 100644
--- a/markup/tableofcontents/tableofcontents_test.go
+++ b/markup/tableofcontents/tableofcontents_test.go
@@ -30,7 +30,7 @@ func TestToc(t *testing.T) {
 	toc.AddAt(Heading{Text: "1-H3-1", ID: "1-h2-2"}, 0, 2)
 	toc.AddAt(Heading{Text: "Heading 2", ID: "h1-2"}, 1, 0)
 
-	got := toc.ToHTML(1, -1, false)
+	got := toc.ToHTML(1, -1, false, nil, nil)
 	c.Assert(got, qt.Equals, `<nav id="TableOfContents">
   <ul>
     <li><a href="#h1-1">Heading 1</a>
@@ -47,7 +47,7 @@ func TestToc(t *testing.T) {
   </ul>
 </nav>`, qt.Commentf(got))
 
-	got = toc.ToHTML(1, 1, false)
+	got = toc.ToHTML(1, 1, false, nil, nil)
 	c.Assert(got, qt.Equals, `<nav id="TableOfContents">
   <ul>
     <li><a href="#h1-1">Heading 1</a></li>
@@ -55,7 +55,7 @@ func TestToc(t *testing.T) {
   </ul>
 </nav>`, qt.Commentf(got))
 
-	got = toc.ToHTML(1, 2, false)
+	got = toc.ToHTML(1, 2, false, nil, nil)
 	c.Assert(got, qt.Equals, `<nav id="TableOfContents">
   <ul>
     <li><a href="#h1-1">Heading 1</a>
@@ -68,7 +68,7 @@ func TestToc(t *testing.T) {
   </ul>
 </nav>`, qt.Commentf(got))
 
-	got = toc.ToHTML(2, 2, false)
+	got = toc.ToHTML(2, 2, false, nil, nil)
 	c.Assert(got, qt.Equals, `<nav id="TableOfContents">
   <ul>
     <li><a href="#1-h2-1">1-H2-1</a></li>
@@ -76,7 +76,7 @@ func TestToc(t *testing.T) {
   </ul>
 </nav>`, qt.Commentf(got))
 
-	got = toc.ToHTML(1, -1, true)
+	got = toc.ToHTML(1, -1, true, nil, nil)
 	c.Assert(got, qt.Equals, `<nav id="TableOfContents">
   <ol>
     <li><a href="#h1-1">Heading 1</a>
@@ -94,6 +94,40 @@ func TestToc(t *testing.T) {
 </nav>`, qt.Commentf(got))
 }
 
+func TestPrePostToc(t *testing.T) {
+	c := qt.New(t)
+
+	toc := &Root{}
+
+	pre := "<nav id=\"TableOfContents\"><h1>Woo</h1>"
+	post := "</nav>"
+	empty := ""
+
+	toc.AddAt(Header{Text: "Header 1", ID: "h1-1"}, 0, 0)
+
+	got := toc.ToHTML(1, -1, false, &pre, &post)
+	c.Assert(got, qt.Equals, `<nav id="TableOfContents"><h1>Woo</h1>
+  <ul>
+    <li><a href="#h1-1">Header 1</a></li>
+  </ul>
+</nav>`, qt.Commentf(got))
+
+	got = toc.ToHTML(1, -1, false, &pre, &empty)
+	c.Assert(got, qt.Equals, `<nav id="TableOfContents"><h1>Woo</h1>
+  <ul>
+    <li><a href="#h1-1">Header 1</a></li>
+  </ul>
+`, qt.Commentf(got))
+
+	got = toc.ToHTML(1, -1, false, &empty, &post)
+	c.Assert(got, qt.Equals, `
+  <ul>
+    <li><a href="#h1-1">Header 1</a></li>
+  </ul>
+</nav>`, qt.Commentf(got))
+
+}
+
 func TestTocMissingParent(t *testing.T) {
 	c := qt.New(t)
 
@@ -103,7 +137,7 @@ func TestTocMissingParent(t *testing.T) {
 	toc.AddAt(Heading{Text: "H3", ID: "h3"}, 1, 2)
 	toc.AddAt(Heading{Text: "H3", ID: "h3"}, 1, 2)
 
-	got := toc.ToHTML(1, -1, false)
+	got := toc.ToHTML(1, -1, false, nil, nil)
 	c.Assert(got, qt.Equals, `<nav id="TableOfContents">
   <ul>
     <li>
@@ -124,7 +158,7 @@ func TestTocMissingParent(t *testing.T) {
   </ul>
 </nav>`, qt.Commentf(got))
 
-	got = toc.ToHTML(3, 3, false)
+	got = toc.ToHTML(3, 3, false, nil, nil)
 	c.Assert(got, qt.Equals, `<nav id="TableOfContents">
   <ul>
     <li><a href="#h3">H3</a></li>
@@ -132,7 +166,7 @@ func TestTocMissingParent(t *testing.T) {
   </ul>
 </nav>`, qt.Commentf(got))
 
-	got = toc.ToHTML(1, -1, true)
+	got = toc.ToHTML(1, -1, true, nil, nil)
 	c.Assert(got, qt.Equals, `<nav id="TableOfContents">
   <ol>
     <li>