diff --git a/spring-boot-docs/src/main/asciidoc/howto.adoc b/spring-boot-docs/src/main/asciidoc/howto.adoc
index e4c7028a69d..50774c58e23 100644
--- a/spring-boot-docs/src/main/asciidoc/howto.adoc
+++ b/spring-boot-docs/src/main/asciidoc/howto.adoc
@@ -1435,7 +1435,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 17f3a9f3caa..cab1bc00b97 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 83a1cd8312d..57277bff30c 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 6eb5e342626..df84c5bb436 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 0b3bf56c8dc..d443309ef2f 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