diff --git a/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json
index 52571ef7a2..1b0b8e1630 100644
--- a/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++ b/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -99,7 +99,7 @@
     "defaultValue": true
   },
   {
-    "name": "spring.jmx.mbean-server",
+    "name": "spring.jmx.server",
     "type": "java.lang.String",
     "description": "MBeanServer bean name.",
     "defaultValue": "mBeanServer"
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 c95ecf896d..ec19fae62a 100644
--- a/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc
+++ b/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc
@@ -445,7 +445,7 @@ content into your application; rather pick only the properties that you need.
 	# JMX
 	spring.jmx.default-domain= # JMX domain name
 	spring.jmx.enabled=true # Expose MBeans from Spring
-	spring.jmx.mbean-server=mBeanServer # MBeanServer bean name
+	spring.jmx.server=mBeanServer # MBeanServer bean name
 
 	# RABBIT ({sc-spring-boot-autoconfigure}/amqp/RabbitProperties.{sc-ext}[RabbitProperties])
 	spring.rabbitmq.addresses= # connection addresses (e.g. myhost:9999,otherhost:1111)