diff --git a/src/main/asciidoc/index.adoc b/src/main/asciidoc/index.adoc
index 1c2066142..980cd77a5 100644
--- a/src/main/asciidoc/index.adoc
+++ b/src/main/asciidoc/index.adoc
@@ -2,10 +2,11 @@
 Oliver Gierke; Thomas Darimont; Christoph Strobl; Mark Paluch; Jay Bryant
 :revnumber: {version}
 :revdate: {localdate}
+:toc:
+:toc-placement!:
 :linkcss:
 :doctype: book
 :docinfo: shared
-:toc: left
 :toclevels: 4
 :source-highlighter: prettify
 :icons: font
@@ -14,10 +15,12 @@ ifdef::backend-epub3[:front-cover-image: image:epub-cover.png[Front Cover,1050,1
 :spring-data-commons-docs: ../../../../spring-data-commons/src/main/asciidoc
 :spring-framework-docs: http://docs.spring.io/spring-framework/docs/{springVersion}/spring-framework-reference/
 
-(C) 2008-2016 The original authors.
+(C) 2008-2018 The original authors.
 
 NOTE: Copies of this document may be made for your own use and for distribution to others, provided that you do not charge any fee for such copies and further provided that each copy contains this Copyright Notice, whether distributed in print or electronically.
 
+toc::[]
+
 include::preface.adoc[]
 
 include::new-features.adoc[leveloffset=+1]