diff --git a/docs/src/main/asciidoc/intro.adoc b/docs/src/main/asciidoc/intro.adoc
index 56cd7c7..caf9d1d 100644
--- a/docs/src/main/asciidoc/intro.adoc
+++ b/docs/src/main/asciidoc/intro.adoc
@@ -5,7 +5,12 @@ Spring Cloud Starters are curated sets of dependencies focused on a particular t
 * spring-cloud-starter-cloudfoundry
 * spring-cloud-starter-eureka
 * spring-cloud-starter-eureka-server
+* spring-cloud-starter-feign
 * spring-cloud-starter-hystrix
 * spring-cloud-starter-hystrix-dashboard
+* spring-cloud-starter-oauth2
+* spring-cloud-starter-ribbon
+* spring-cloud-starter-security
 * spring-cloud-starter-turbine
+* spring-cloud-starter-turbine-amqp
 * spring-cloud-starter-zuul
diff --git a/pom.xml b/pom.xml
index 1d76835..c5b04d0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,9 +1,7 @@
 <?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>
-	<groupId>org.springframework.cloud</groupId>
 	<artifactId>spring-cloud-starter-parent</artifactId>
-	<version>1.0.0.BUILD-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>Spring Cloud Starter Parent</name>
 	<description>Spring Cloud Starter Parent</description>
@@ -30,6 +28,7 @@
 		<module>spring-cloud-starter-feign</module>
 		<module>spring-cloud-starter-hystrix</module>
 		<module>spring-cloud-starter-hystrix-dashboard</module>
+	    <module>spring-cloud-starter-oauth2</module>
 	    <module>spring-cloud-starter-ribbon</module>
 	    <module>spring-cloud-starter-security</module>
 	    <module>spring-cloud-starter-turbine</module>
@@ -260,6 +259,11 @@
 			  <artifactId>spring-cloud-starter-hystrix-dashboard</artifactId>
 				<version>1.0.0.BUILD-SNAPSHOT</version>
 		    </dependency>
+		    <dependency>
+		      <groupId>org.springframework.cloud</groupId>
+			  <artifactId>spring-cloud-starter-oauth2</artifactId>
+			  <version>1.0.0.BUILD-SNAPSHOT</version>
+		    </dependency>
 		    <dependency>
 		      <groupId>org.springframework.cloud</groupId>
 			  <artifactId>spring-cloud-starter-ribbon</artifactId>
@@ -285,16 +289,6 @@
                 <artifactId>spring-cloud-starter-zuul-server</artifactId>
                 <version>1.0.0.BUILD-SNAPSHOT</version>
             </dependency>
-		    <dependency>
-			  <groupId>org.springframework.security</groupId>
-			  <artifactId>spring-security-jwt</artifactId>
-              <version>1.0.2.RELEASE</version>
-		    </dependency>
-		    <dependency>
-			  <groupId>org.springframework.security.oauth</groupId>
-			  <artifactId>spring-security-oauth2</artifactId>
-              <version>2.0.5.RELEASE</version>
-		    </dependency>
 		</dependencies>
 	</dependencyManagement>
 
diff --git a/spring-cloud-starter-oauth2/pom.xml b/spring-cloud-starter-oauth2/pom.xml
new file mode 100644
index 0000000..b09f22e
--- /dev/null
+++ b/spring-cloud-starter-oauth2/pom.xml
@@ -0,0 +1,37 @@
+<?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.cloud</groupId>
+		<artifactId>spring-cloud-starter-parent</artifactId>
+		<version>1.0.0.BUILD-SNAPSHOT</version>
+	</parent>
+	<artifactId>spring-cloud-starter-oauth2</artifactId>
+	<name>spring-cloud-starter-oauth2</name>
+	<description>Spring Cloud 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.cloud</groupId>
+			<artifactId>spring-cloud-starter</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-security</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.projectlombok</groupId>
+			<artifactId>lombok</artifactId>
+			<!-- Only needed at compile time -->
+			<scope>compile</scope>
+			<optional>true</optional>
+		</dependency>
+	</dependencies>
+</project>
diff --git a/spring-cloud-starter-oauth2/src/main/resources/META-INF/spring.provides b/spring-cloud-starter-oauth2/src/main/resources/META-INF/spring.provides
new file mode 100644
index 0000000..2b4efab
--- /dev/null
+++ b/spring-cloud-starter-oauth2/src/main/resources/META-INF/spring.provides
@@ -0,0 +1 @@
+provides: spring-security-oauth2, spring-security-jwt
\ No newline at end of file
diff --git a/spring-cloud-starter-security/src/main/resources/META-INF/spring.provides b/spring-cloud-starter-security/src/main/resources/META-INF/spring.provides
index 41822a2..15c5022 100644
--- a/spring-cloud-starter-security/src/main/resources/META-INF/spring.provides
+++ b/spring-cloud-starter-security/src/main/resources/META-INF/spring.provides
@@ -1 +1 @@
-provides: spring-platform-security
\ No newline at end of file
+provides: spring-cloud-security
\ No newline at end of file