diff --git a/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc b/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc
index 051ef8e1139..016604ebc06 100644
--- a/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc
+++ b/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc
@@ -1118,8 +1118,6 @@ content into your application; rather pick only the properties that you need.
 	endpoints.info.enabled= # Enable the endpoint.
 	endpoints.info.id= # Endpoint identifier.
 	endpoints.info.path= # Endpoint path.
-	endpoints.jolokia.enabled=true # Enable Jolokia endpoint.
-	endpoints.jolokia.path=/jolokia # Endpoint URL path.
 	endpoints.liquibase.enabled= # Enable the endpoint.
 	endpoints.liquibase.id= # Endpoint identifier.
 	endpoints.logfile.enabled=true # Enable the endpoint.
@@ -1159,8 +1157,10 @@ content into your application; rather pick only the properties that you need.
 	endpoints.jmx.static-names= # Additional static properties to append to all ObjectNames of MBeans representing Endpoints.
 	endpoints.jmx.unique-names=false # Ensure that ObjectNames are modified in case of conflict.
 
-	# JOLOKIA ({sc-spring-boot-actuator}/autoconfigure/JolokiaProperties.{sc-ext}[JolokiaProperties])
-	jolokia.config.*= # See Jolokia manual
+	# JOLOKIA ({sc-spring-boot-actuator}/autoconfigure/jolokia/JolokiaProperties.{sc-ext}[JolokiaProperties])
+	management.jolokia.config.*= # Jolokia settings. See the Jolokia manual for details.
+	management.jolokia.enabled=true # Enable Jolokia.
+	management.jolokia.path=/jolokia # Path at which Jolokia will be available.
 
 	# MANAGEMENT HTTP SERVER ({sc-spring-boot-actuator}/autoconfigure/ManagementServerProperties.{sc-ext}[ManagementServerProperties])
 	management.add-application-context-header=false # Add the "X-Application-Context" HTTP header in each response.
diff --git a/spring-boot-docs/src/main/asciidoc/production-ready-features.adoc b/spring-boot-docs/src/main/asciidoc/production-ready-features.adoc
index 4ab01daf7d0..15402b9176e 100644
--- a/spring-boot-docs/src/main/asciidoc/production-ready-features.adoc
+++ b/spring-boot-docs/src/main/asciidoc/production-ready-features.adoc
@@ -125,9 +125,6 @@ If you are using Spring MVC, the following additional endpoints can also be used
 |`heapdump`
 |Returns a GZip compressed `hprof` heap dump file.
 
-|`jolokia`
-|Exposes JMX beans over HTTP (when Jolokia is on the classpath).
-
 |`logfile`
 |Returns the contents of the logfile (if `logging.file` or `logging.path` properties have
 been set). Supports the use of the HTTP `Range` header to retrieve part of the log file's
@@ -802,7 +799,7 @@ using Maven you would add the following:
  	</dependency>
 ----
 
-Jolokia can then be accessed using `/jolokia` on your management HTTP server.
+Jolokia can then be accessed using `/application/jolokia` on your management HTTP server.
 
 
 
@@ -810,11 +807,11 @@ Jolokia can then be accessed using `/jolokia` on your management HTTP server.
 ==== Customizing Jolokia
 Jolokia has a number of settings that you would traditionally configure using servlet
 parameters. With Spring Boot you can use your `application.properties`, simply prefix the
-parameter with `jolokia.config.`:
+parameter with `management.jolokia.config.`:
 
 [source,properties,indent=0]
 ----
-	jolokia.config.debug=true
+	management.jolokia.config.debug=true
 ----
 
 
@@ -822,11 +819,11 @@ parameter with `jolokia.config.`:
 [[production-ready-disabling-jolokia]]
 ==== Disabling Jolokia
 If you are using Jolokia but you don't want Spring Boot to configure it, simply set the
-`endpoints.jolokia.enabled` property to `false`:
+`management.jolokia.enabled` property to `false`:
 
 [source,properties,indent=0]
 ----
-	endpoints.jolokia.enabled=false
+	management.jolokia.enabled=false
 ----