diff --git a/spring-platform-cli/src/main/java/org/springframework/platform/cli/compiler/CloudfoundrySsoCompilerAutoConfiguration.java b/spring-platform-cli/src/main/java/org/springframework/platform/cli/compiler/CloudfoundrySsoCompilerAutoConfiguration.java
new file mode 100644
index 0000000..ef5f82a
--- /dev/null
+++ b/spring-platform-cli/src/main/java/org/springframework/platform/cli/compiler/CloudfoundrySsoCompilerAutoConfiguration.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2013-2014 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.platform.cli.compiler;
+
+import org.codehaus.groovy.ast.ClassNode;
+import org.codehaus.groovy.control.CompilationFailedException;
+import org.codehaus.groovy.control.customizers.ImportCustomizer;
+import org.springframework.boot.cli.compiler.AstUtils;
+import org.springframework.boot.cli.compiler.CompilerAutoConfiguration;
+import org.springframework.boot.cli.compiler.DependencyCustomizer;
+
+/**
+ * @author Dave Syer
+ *
+ */
+public class CloudfoundrySsoCompilerAutoConfiguration extends CompilerAutoConfiguration {
+
+	@Override
+	public boolean matches(ClassNode classNode) {
+		return AstUtils.hasAtLeastOneAnnotation(classNode, "EnableCloudfoundrySso");
+	}
+
+	@Override
+	public void applyDependencies(DependencyCustomizer dependencies) {
+		dependencies
+				.ifAnyMissingClasses(
+						"org.springframework.platform.cloudfoundry.sso.EnableCloudfoundrySso")
+				.add("spring-platform-starter-cloudfoundry")
+				.add("org.springframework.security.oauth:spring-security-oauth2:2.0.3.BUILD-SNAPSHOT");
+	}
+
+	@Override
+	public void applyImports(ImportCustomizer imports) throws CompilationFailedException {
+		imports.addImports(
+				"org.springframework.platform.cloudfoundry.sso.EnableCloudfoundrySso",
+				"org.springframework.platform.cloudfoundry.sso.CloudfoundrySsoConfigurerAdapter");
+	}
+
+}
diff --git a/spring-platform-cli/src/main/resources/META-INF/services/org.springframework.boot.cli.compiler.CompilerAutoConfiguration b/spring-platform-cli/src/main/resources/META-INF/services/org.springframework.boot.cli.compiler.CompilerAutoConfiguration
index 604048a..46d9ba7 100644
--- a/spring-platform-cli/src/main/resources/META-INF/services/org.springframework.boot.cli.compiler.CompilerAutoConfiguration
+++ b/spring-platform-cli/src/main/resources/META-INF/services/org.springframework.boot.cli.compiler.CompilerAutoConfiguration
@@ -1,5 +1,6 @@
 org.springframework.platform.cli.compiler.SpringPlatformCompilerAutoConfiguration
 org.springframework.platform.cli.compiler.ConfigServerCompilerAutoConfiguration
+org.springframework.platform.cli.compiler.CloudfoundrySsoCompilerAutoConfiguration
 org.springframework.platform.cli.compiler.EurekaClientCompilerAutoConfiguration
 org.springframework.platform.cli.compiler.HystrixCompilerAutoConfiguration
 org.springframework.platform.cli.compiler.ZuulCompilerAutoConfiguration
diff --git a/spring-platform-versions/pom.xml b/spring-platform-versions/pom.xml
index 5599609..9d68cc5 100644
--- a/spring-platform-versions/pom.xml
+++ b/spring-platform-versions/pom.xml
@@ -23,6 +23,11 @@
 		<dependency>
 			<groupId>org.springframework.platform</groupId>
 			<artifactId>spring-platform-starter</artifactId>
+            <version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.platform</groupId>
+			<artifactId>spring-platform-starter-cloudfoundry</artifactId>
             <version>${project.version}</version>
 		</dependency>
 		<dependency>