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 48100b5ee8e..347439120cb 100644
--- a/spring-boot-docs/src/main/asciidoc/production-ready-features.adoc
+++ b/spring-boot-docs/src/main/asciidoc/production-ready-features.adoc
@@ -842,6 +842,8 @@ the following dependency to your project:
  	</dependency>
 ----
 
+NOTE: The remote shell is deprecated and will be removed in Spring Boot 2.0.
+
 TIP: If you want to also enable telnet access you will additionally need a dependency
 on `org.crsh:crsh.shell.telnet`.