diff --git a/pom.xml b/pom.xml
index 16b3664..e5b314f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,6 +33,7 @@
 	    <module>spring-cloud-starter-security</module>
 	    <module>spring-cloud-starter-turbine</module>
         <module>spring-cloud-starter-zuul</module>
+        <module>spring-cloud-starter-zuul-server</module>
         <module>docs</module>
 	</modules>
 
@@ -127,6 +128,11 @@
                 <artifactId>spring-cloud-starter-zuul</artifactId>
                 <version>1.0.0.BUILD-SNAPSHOT</version>
             </dependency>
+            <dependency>
+                <groupId>org.springframework.cloud</groupId>
+                <artifactId>spring-cloud-starter-zuul-server</artifactId>
+                <version>1.0.0.BUILD-SNAPSHOT</version>
+            </dependency>
             <dependency>
                 <groupId>org.springframework.cloud</groupId>
                 <artifactId>spring-cloud-bus</artifactId>
diff --git a/spring-cloud-starter-zuul-server/pom.xml b/spring-cloud-starter-zuul-server/pom.xml
new file mode 100644
index 0000000..cb949e3
--- /dev/null
+++ b/spring-cloud-starter-zuul-server/pom.xml
@@ -0,0 +1,34 @@
+<?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-zuul-server</artifactId>
+	<name>spring-cloud-starter-zuul-server</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-starter-zuul</artifactId>
+        </dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-netflix-zuul-server</artifactId>
+		</dependency>
+	</dependencies>
+</project>
diff --git a/spring-cloud-starter-zuul-server/src/main/resources/META-INF/spring.provides b/spring-cloud-starter-zuul-server/src/main/resources/META-INF/spring.provides
new file mode 100644
index 0000000..d02ca5d
--- /dev/null
+++ b/spring-cloud-starter-zuul-server/src/main/resources/META-INF/spring.provides
@@ -0,0 +1 @@
+provides: spring-platform-netflix-core, zule-core
\ No newline at end of file
diff --git a/spring-cloud-starter-zuul/pom.xml b/spring-cloud-starter-zuul/pom.xml
index 64efbdf..f859e45 100644
--- a/spring-cloud-starter-zuul/pom.xml
+++ b/spring-cloud-starter-zuul/pom.xml
@@ -45,8 +45,6 @@
         <dependency>
             <groupId>com.netflix.rxjava</groupId>
             <artifactId>rxjava-core</artifactId>
-            <!-- TODO: where to put this? netflix-core? -->
-            <version>0.18.2</version>
         </dependency>
         <dependency>
             <groupId>com.netflix.zuul</groupId>