diff --git a/spring-boot-actuator/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/spring-boot-actuator/src/main/resources/META-INF/additional-spring-configuration-metadata.json
index 11b53d42ed..cdb5479fc0 100644
--- a/spring-boot-actuator/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++ b/spring-boot-actuator/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -186,18 +186,6 @@
       "replacement": "spring.info.git.location"
     }
   },
-  {
-    "name": "spring.pid.file",
-    "type": "java.lang.String",
-    "description": "Location of the PID file to write (if ApplicationPidFileWriter is used).",
-    "sourceType": "org.springframework.boot.actuate.system.ApplicationPidFileWriter"
-  },
-  {
-    "name": "spring.pid.fail-on-write-error",
-    "type": "java.lang.Boolean",
-    "description": "Fail if ApplicationPidFileWriter is used but it cannot write the PID file.",
-    "sourceType": "org.springframework.boot.actuate.system.ApplicationPidFileWriter"
-  },
   {
     "name": "spring.pidfile",
     "type": "java.lang.String",
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 36c99a88b3..aebca8fea7 100644
--- a/spring-boot-docs/src/main/asciidoc/production-ready-features.adoc
+++ b/spring-boot-docs/src/main/asciidoc/production-ready-features.adoc
@@ -1488,7 +1488,7 @@ writes a PID file. Example:
 [indent=0]
 ----
 	org.springframework.context.ApplicationListener=\
-	org.springframework.boot.actuate.system.ApplicationPidFileWriter,\
+	org.springframework.boot.system.ApplicationPidFileWriter,\
 	org.springframework.boot.actuate.system.EmbeddedServerPortFileWriter
 ----
 
diff --git a/spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json
index d2064f813f..6022630bd8 100644
--- a/spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++ b/spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -178,6 +178,18 @@
     "description": "Configure the ANSI output.",
     "defaultValue": "detect"
   },
+  {
+    "name": "spring.pid.file",
+    "type": "java.lang.String",
+    "description": "Location of the PID file to write (if ApplicationPidFileWriter is used).",
+    "sourceType": "org.springframework.boot.system.ApplicationPidFileWriter"
+  },
+  {
+    "name": "spring.pid.fail-on-write-error",
+    "type": "java.lang.Boolean",
+    "description": "Fail if ApplicationPidFileWriter is used but it cannot write the PID file.",
+    "sourceType": "org.springframework.boot.system.ApplicationPidFileWriter"
+  },
   {
     "name": "spring.profiles.active",
     "type": "java.lang.String",