diff --git a/spring-boot-docs/src/main/docbook/xsl/xslthl-config.xml b/spring-boot-docs/src/main/docbook/xsl/xslthl-config.xml
index d0fd16e684..e4d677fc50 100644
--- a/spring-boot-docs/src/main/docbook/xsl/xslthl-config.xml
+++ b/spring-boot-docs/src/main/docbook/xsl/xslthl-config.xml
@@ -17,5 +17,7 @@
 	<highlighter id="sql" file="./xslthl/sql2003-hl.xml" />
 	<highlighter id="asciidoc" file="./xslthl/asciidoc-hl.xml" />
 	<highlighter id="properties" file="./xslthl/properties-hl.xml" />
+	<highlighter id="json" file="./xslthl/json-hl.xml" />
+	<highlighter id="yaml" file="./xslthl/yaml-hl.xml" />
 	<namespace prefix="xslthl" uri="http://xslthl.sf.net" />
 </xslthl-config>
diff --git a/spring-boot-docs/src/main/docbook/xsl/xslthl/json-hl.xml b/spring-boot-docs/src/main/docbook/xsl/xslthl/json-hl.xml
new file mode 100644
index 0000000000..59b9c48116
--- /dev/null
+++ b/spring-boot-docs/src/main/docbook/xsl/xslthl/json-hl.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<highlighters>
+	<highlighter type="oneline-comment">#</highlighter>
+	<highlighter type="string">
+		<string>"</string>
+		<escape>\</escape>
+	</highlighter>
+	<highlighter type="string">
+		<string>'</string>
+		<escape>\</escape>
+	</highlighter>
+	<highlighter type="annotation">
+		<start>@</start>
+		<valueStart>(</valueStart>
+		<valueEnd>)</valueEnd>
+	</highlighter>
+	<highlighter type="number">
+		<point>.</point>
+		<exponent>e</exponent>
+		<suffix>f</suffix>
+		<suffix>d</suffix>
+		<suffix>l</suffix>
+		<ignoreCase />
+	</highlighter>
+	<highlighter type="keywords">
+		<keyword>true</keyword>
+		<keyword>false</keyword>
+	</highlighter>
+	<highlighter type="word">
+		<word>{</word>
+		<word>}</word>
+		<word>,</word>
+		<word>[</word>
+		<word>]</word>
+		<style>keyword</style>
+	</highlighter>
+</highlighters>
diff --git a/spring-boot-docs/src/main/docbook/xsl/xslthl/properties-hl.xml b/spring-boot-docs/src/main/docbook/xsl/xslthl/properties-hl.xml
index e53ac478e7..775f2f13e7 100644
--- a/spring-boot-docs/src/main/docbook/xsl/xslthl/properties-hl.xml
+++ b/spring-boot-docs/src/main/docbook/xsl/xslthl/properties-hl.xml
@@ -31,7 +31,7 @@ Michiel Hendriks <elmuerte at users.sourceforge.net>
 <highlighters>
 	<highlighter type="oneline-comment">#</highlighter>
 	<highlighter type="regex">
-		<pattern>^(.+)(?==|:)</pattern>
+		<pattern>^(.+?)(?==|:)</pattern>
 		<style>attribute</style>
 		<flags>MULTILINE</flags>
 	</highlighter>
diff --git a/spring-boot-docs/src/main/docbook/xsl/xslthl/yaml-hl.xml b/spring-boot-docs/src/main/docbook/xsl/xslthl/yaml-hl.xml
new file mode 100644
index 0000000000..a28008ec83
--- /dev/null
+++ b/spring-boot-docs/src/main/docbook/xsl/xslthl/yaml-hl.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<highlighters>
+	<highlighter type="oneline-comment">#</highlighter>
+	<highlighter type="string">
+		<string>"</string>
+		<escape>\</escape>
+	</highlighter>
+	<highlighter type="string">
+		<string>'</string>
+		<escape>\</escape>
+	</highlighter>
+	<highlighter type="annotation">
+		<start>@</start>
+		<valueStart>(</valueStart>
+		<valueEnd>)</valueEnd>
+	</highlighter>
+	<highlighter type="number">
+		<point>.</point>
+		<exponent>e</exponent>
+		<suffix>f</suffix>
+		<suffix>d</suffix>
+		<suffix>l</suffix>
+		<ignoreCase />
+	</highlighter>
+	<highlighter type="keywords">
+		<keyword>true</keyword>
+		<keyword>false</keyword>
+	</highlighter>
+	<highlighter type="word">
+		<word>{</word>
+		<word>}</word>
+		<word>,</word>
+		<word>[</word>
+		<word>]</word>
+		<style>keyword</style>
+	</highlighter>
+	<highlighter type="regex">
+		<pattern>^(---)$</pattern>
+		<style>comment</style>
+		<flags>MULTILINE</flags>
+	</highlighter>
+	<highlighter type="regex">
+		<pattern>^(.+?)(?==|:)</pattern>
+		<style>attribute</style>
+		<flags>MULTILINE</flags>
+	</highlighter>
+</highlighters>