diff --git a/pom.xml b/pom.xml
index 46a14c96..b89266e5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -168,13 +168,10 @@
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-stream</artifactId>
-				<version>${spring-cloud-stream.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-stream-binder-rabbit</artifactId>
+				<artifactId>spring-cloud-stream-parent</artifactId>
 				<version>${spring-cloud-stream.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
 			</dependency>
 			<dependency>
 				<groupId>com.netflix.archaius</groupId>
@@ -390,6 +387,7 @@
 	<modules>
 		<module>spring-cloud-netflix-core</module>
 		<module>spring-cloud-netflix-hystrix-dashboard</module>
+		<module>spring-cloud-netflix-hystrix-amqp</module>
 		<module>spring-cloud-netflix-hystrix-stream</module>
 		<module>spring-cloud-netflix-eureka-server</module>
 		<module>spring-cloud-netflix-turbine</module>
@@ -402,6 +400,7 @@
 		<module>spring-cloud-starter-hystrix-dashboard</module>
 		<module>spring-cloud-starter-ribbon</module>
 		<module>spring-cloud-starter-turbine</module>
+		<module>spring-cloud-starter-turbine-amqp</module>
 		<module>spring-cloud-starter-turbine-stream</module>
 		<module>spring-cloud-starter-zuul</module>
 		<module>docs</module>
diff --git a/spring-cloud-netflix-hystrix-amqp/.jdk8 b/spring-cloud-netflix-hystrix-amqp/.jdk8
new file mode 100644
index 00000000..e69de29b
diff --git a/spring-cloud-netflix-hystrix-amqp/pom.xml b/spring-cloud-netflix-hystrix-amqp/pom.xml
new file mode 100644
index 00000000..1dac93b9
--- /dev/null
+++ b/spring-cloud-netflix-hystrix-amqp/pom.xml
@@ -0,0 +1,32 @@
+<?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-netflix</artifactId>
+		<version>1.1.0.BUILD-SNAPSHOT</version>
+		<relativePath>..</relativePath> <!-- lookup parent from repository -->
+	</parent>
+	<artifactId>spring-cloud-netflix-hystrix-amqp</artifactId>
+	<name>spring-cloud-netflix-hystrix-amqp</name>
+	<description>Spring Cloud Netflix Hystrix AMQP (deprecated, please use spring-cloud-netflix-hystrix-stream)</description>
+	<url>http://projects.spring.io/spring-cloud</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-netflix-hystrix-stream</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-stream-rabbit</artifactId>
+		</dependency>
+	</dependencies>
+</project>
diff --git a/spring-cloud-netflix-hystrix-amqp/src/main/resources/META-INF/spring.provides b/spring-cloud-netflix-hystrix-amqp/src/main/resources/META-INF/spring.provides
new file mode 100644
index 00000000..e1782585
--- /dev/null
+++ b/spring-cloud-netflix-hystrix-amqp/src/main/resources/META-INF/spring.provides
@@ -0,0 +1 @@
+provides: spring-cloud-netflix-turbine-amqp
\ No newline at end of file
diff --git a/spring-cloud-starter-turbine-amqp/.jdk8 b/spring-cloud-starter-turbine-amqp/.jdk8
new file mode 100644
index 00000000..e69de29b
diff --git a/spring-cloud-starter-turbine-amqp/pom.xml b/spring-cloud-starter-turbine-amqp/pom.xml
new file mode 100644
index 00000000..99fbbb19
--- /dev/null
+++ b/spring-cloud-starter-turbine-amqp/pom.xml
@@ -0,0 +1,32 @@
+<?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-netflix</artifactId>
+		<version>1.1.0.BUILD-SNAPSHOT</version>
+		<relativePath>..</relativePath> <!-- lookup parent from repository -->
+	</parent>
+	<artifactId>spring-cloud-starter-turbine-amqp</artifactId>
+	<name>spring-cloud-starter-turbine-amqp</name>
+	<description>Spring Cloud Starter Turbine AMQP (deprecated, please use spring-cloud-starter-turbine-stream)</description>
+	<url>http://projects.spring.io/spring-cloud</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-turbine-stream</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-stream-rabbit</artifactId>
+		</dependency>
+	</dependencies>
+</project>
diff --git a/spring-cloud-starter-turbine-amqp/src/main/resources/META-INF/spring.provides b/spring-cloud-starter-turbine-amqp/src/main/resources/META-INF/spring.provides
new file mode 100644
index 00000000..e1782585
--- /dev/null
+++ b/spring-cloud-starter-turbine-amqp/src/main/resources/META-INF/spring.provides
@@ -0,0 +1 @@
+provides: spring-cloud-netflix-turbine-amqp
\ No newline at end of file