diff --git a/spring-boot-docs/src/main/asciidoc/howto.adoc b/spring-boot-docs/src/main/asciidoc/howto.adoc
index 4793e70399..8dd458f344 100644
--- a/spring-boot-docs/src/main/asciidoc/howto.adoc
+++ b/spring-boot-docs/src/main/asciidoc/howto.adoc
@@ -1465,7 +1465,7 @@ By default, `spring-boot-starter-thymeleaf` uses Thymeleaf 2.1. If you are using
----
3.0.2.RELEASE
- 2.0.4
+ 2.1.1
----
diff --git a/spring-boot-samples/spring-boot-sample-web-thymeleaf3/pom.xml b/spring-boot-samples/spring-boot-sample-web-thymeleaf3/pom.xml
index 370f89ce12..79d99b921d 100755
--- a/spring-boot-samples/spring-boot-sample-web-thymeleaf3/pom.xml
+++ b/spring-boot-samples/spring-boot-sample-web-thymeleaf3/pom.xml
@@ -18,7 +18,7 @@
${basedir}/../..
3.0.2.RELEASE
- 2.0.4
+ 2.1.1
diff --git a/spring-boot-samples/spring-boot-sample-web-thymeleaf3/src/main/resources/templates/layout.html b/spring-boot-samples/spring-boot-sample-web-thymeleaf3/src/main/resources/templates/layout.html
index 83a1cd8312..57277bff30 100644
--- a/spring-boot-samples/spring-boot-sample-web-thymeleaf3/src/main/resources/templates/layout.html
+++ b/spring-boot-samples/spring-boot-sample-web-thymeleaf3/src/main/resources/templates/layout.html
@@ -1,6 +1,6 @@
+ xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout">
Layout
Messages : Create
diff --git a/spring-boot-samples/spring-boot-sample-web-thymeleaf3/src/main/resources/templates/messages/list.html b/spring-boot-samples/spring-boot-sample-web-thymeleaf3/src/main/resources/templates/messages/list.html
index 6eb5e34262..df84c5bb43 100644
--- a/spring-boot-samples/spring-boot-sample-web-thymeleaf3/src/main/resources/templates/messages/list.html
+++ b/spring-boot-samples/spring-boot-sample-web-thymeleaf3/src/main/resources/templates/messages/list.html
@@ -1,6 +1,6 @@
Messages : View all
diff --git a/spring-boot-samples/spring-boot-sample-web-thymeleaf3/src/main/resources/templates/messages/view.html b/spring-boot-samples/spring-boot-sample-web-thymeleaf3/src/main/resources/templates/messages/view.html
index 0b3bf56c8d..d443309ef2 100644
--- a/spring-boot-samples/spring-boot-sample-web-thymeleaf3/src/main/resources/templates/messages/view.html
+++ b/spring-boot-samples/spring-boot-sample-web-thymeleaf3/src/main/resources/templates/messages/view.html
@@ -1,5 +1,5 @@
Messages : View