diff --git a/pom.xml b/pom.xml
index 334dc08..a17cef4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,6 +23,7 @@
 	</properties>
 	<modules>
 		<module>spring-platform-starter</module>
+		<module>spring-platform-starter-cloudfoundry</module>
 		<module>spring-platform-starter-eureka</module>
 		<module>spring-platform-starter-hystrix</module>
         <module>spring-platform-starter-zuul</module>
@@ -43,9 +44,19 @@
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
+			<dependency>
+				<groupId>org.springframework.platform</groupId>
+				<artifactId>spring-platform-cloudfoundry</artifactId>
+				<version>1.0.0.BUILD-SNAPSHOT</version>
+			</dependency>
 		    <dependency>
 		      <groupId>org.springframework.platform</groupId>
 			  <artifactId>spring-platform-starter</artifactId>
+			  <version>1.0.0.BUILD-SNAPSHOT</version>
+		    </dependency>
+		    <dependency>
+		      <groupId>org.springframework.platform</groupId>
+			  <artifactId>spring-platform-starter-cloudfoundry</artifactId>
 				<version>1.0.0.BUILD-SNAPSHOT</version>
 		    </dependency>
 		    <dependency>
diff --git a/spring-platform-starter-cloudfoundry/pom.xml b/spring-platform-starter-cloudfoundry/pom.xml
new file mode 100644
index 0000000..9284962
--- /dev/null
+++ b/spring-platform-starter-cloudfoundry/pom.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.springframework.platform</groupId>
+		<artifactId>spring-platform-starters</artifactId>
+		<version>1.0.0.BUILD-SNAPSHOT</version>
+	</parent>
+	<artifactId>spring-platform-starter-cloudfoundry</artifactId>
+	<name>spring-platform-starter-cloudfoundry</name>
+	<description>Spring Platform Starter</description>
+	<url>http://projects.spring.io/spring-boot/</url>
+	<organization>
+		<name>Pivotal Software, Inc.</name>
+		<url>http://www.spring.io</url>
+	</organization>
+	<properties>
+		<main.basedir>${basedir}/../..</main.basedir>
+	</properties>
+	<dependencies>
+		<dependency>
+			<groupId>org.springframework.platform</groupId>
+			<artifactId>spring-platform-starter</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.platform</groupId>
+			<artifactId>spring-platform-cloudfoundry</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.projectlombok</groupId>
+			<artifactId>lombok</artifactId>
+			<!-- Only needed at compile time -->
+			<scope>provided</scope>
+		</dependency>
+	</dependencies>
+</project>
diff --git a/spring-platform-starter-cloudfoundry/src/main/resources/META-INF/spring.provides b/spring-platform-starter-cloudfoundry/src/main/resources/META-INF/spring.provides
new file mode 100644
index 0000000..00f9f21
--- /dev/null
+++ b/spring-platform-starter-cloudfoundry/src/main/resources/META-INF/spring.provides
@@ -0,0 +1 @@
+provides: spring-platform-config-client,spring-platform-config-server
\ No newline at end of file