diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cloud/CloudServiceConnectorsAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cloud/CloudServiceConnectorsAutoConfiguration.java
index 0a9e7b9f1c8..e5f76ba1841 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cloud/CloudServiceConnectorsAutoConfiguration.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cloud/CloudServiceConnectorsAutoConfiguration.java
@@ -16,6 +16,9 @@
 
 package org.springframework.boot.autoconfigure.cloud;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
 import org.springframework.boot.autoconfigure.AutoConfigureOrder;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
@@ -54,4 +57,10 @@ public class CloudServiceConnectorsAutoConfiguration {
 	// Cloud configuration needs to happen early (before data, mongo etc.)
 	public static final int ORDER = Ordered.HIGHEST_PRECEDENCE + 20;
 
+	private static final Log logger = LogFactory.getLog(CloudServiceConnectorsAutoConfiguration.class);
+
+	public CloudServiceConnectorsAutoConfiguration() {
+		logger.warn("Support for Spring Cloud Connectors has been deprecated in favor of Java CFEnv");
+	}
+
 }
diff --git a/spring-boot-project/spring-boot-docs/src/main/asciidoc/deployment.adoc b/spring-boot-project/spring-boot-docs/src/main/asciidoc/deployment.adoc
index 4152101a374..6bb51989ed8 100644
--- a/spring-boot-project/spring-boot-docs/src/main/asciidoc/deployment.adoc
+++ b/spring-boot-project/spring-boot-docs/src/main/asciidoc/deployment.adoc
@@ -125,8 +125,7 @@ All Cloud Foundry properties are prefixed with `vcap`.
 You can use `vcap` properties to access application information (such as the public URL of the application) and service information (such as database credentials).
 See the {spring-boot-module-api}/cloud/CloudFoundryVcapEnvironmentPostProcessor.html['`CloudFoundryVcapEnvironmentPostProcessor`'] Javadoc for complete details.
 
-TIP: The https://cloud.spring.io/spring-cloud-connectors/[Spring Cloud Connectors] project is a better fit for tasks such as configuring a DataSource.
-Spring Boot includes auto-configuration support and a `spring-boot-starter-cloud-connectors` starter.
+TIP: The https://github.com/pivotal-cf/java-cfenv/[Java CFEnv] project is a better fit for tasks such as configuring a DataSource.
 
 
 
diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-cloud-connectors/pom.xml b/spring-boot-project/spring-boot-starters/spring-boot-starter-cloud-connectors/pom.xml
index d05578b4050..dc7597dd1ac 100644
--- a/spring-boot-project/spring-boot-starters/spring-boot-starter-cloud-connectors/pom.xml
+++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-cloud-connectors/pom.xml
@@ -10,7 +10,8 @@
 	<artifactId>spring-boot-starter-cloud-connectors</artifactId>
 	<name>Spring Boot Spring Cloud Connectors Starter</name>
 	<description>Starter for using Spring Cloud Connectors which simplifies connecting
-		to services in cloud platforms like Cloud Foundry and Heroku</description>
+		to services in cloud platforms like Cloud Foundry and Heroku. Deprecated in
+		favor of Java CFEnv</description>
 	<properties>
 		<main.basedir>${basedir}/../../..</main.basedir>
 	</properties>