diff --git a/spring-boot-autoconfigure/pom.xml b/spring-boot-autoconfigure/pom.xml
index 9b8c8b05e5..2fbb97c8de 100644
--- a/spring-boot-autoconfigure/pom.xml
+++ b/spring-boot-autoconfigure/pom.xml
@@ -202,8 +202,8 @@
 			<optional>true</optional>
 		</dependency>
 		<dependency>
-			<groupId>org.projectreactor</groupId>
-			<artifactId>reactor-spring</artifactId>
+			<groupId>org.projectreactor.spring</groupId>
+			<artifactId>reactor-spring-context</artifactId>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
diff --git a/spring-boot-cli/samples/reactor.groovy b/spring-boot-cli/samples/reactor.groovy
index 49a4585b3a..a2343b22a2 100644
--- a/spring-boot-cli/samples/reactor.groovy
+++ b/spring-boot-cli/samples/reactor.groovy
@@ -3,6 +3,7 @@ package org.test
 import java.util.concurrent.CountDownLatch;
 
 @EnableReactor
+@Consumer
 @Log
 class Runner implements CommandLineRunner {
 
@@ -22,7 +23,7 @@ class Runner implements CommandLineRunner {
 		latch.await()
 	}
 
-	@Selector(reactor="reactor", value="hello")
+	@Selector(value="hello")
 	void receive(String data) {
 		log.info "Hello ${data}"
 		latch.countDown()
diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/ReactorCompilerAutoConfiguration.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/ReactorCompilerAutoConfiguration.java
index a1026a774d..4b019bdd30 100644
--- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/ReactorCompilerAutoConfiguration.java
+++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/ReactorCompilerAutoConfiguration.java
@@ -37,17 +37,22 @@ public class ReactorCompilerAutoConfiguration extends CompilerAutoConfiguration
 	@Override
 	public void applyDependencies(DependencyCustomizer dependencies) {
 		dependencies.ifAnyMissingClasses("reactor.core.Reactor")
-				.add("reactor-spring", false).add("reactor-core");
+				.add("reactor-spring-context", false).add("reactor-spring-core", false)
+				.add("reactor-core");
 	}
 
 	@Override
 	public void applyImports(ImportCustomizer imports) {
 		imports.addImports("reactor.core.Reactor", "reactor.event.Event",
 				"reactor.function.Consumer", "reactor.function.Functions",
-				"reactor.event.selector.Selectors", "reactor.spring.annotation.Selector",
-				"reactor.spring.annotation.ReplyTo",
-				"reactor.spring.context.config.EnableReactor").addStarImports(
-				"reactor.event.Selectors");
+				"reactor.event.selector.Selectors",
+				"reactor.spring.context.annotation.Consumer",
+				"reactor.spring.context.annotation.Selector",
+				"reactor.spring.context.annotation.SelectorType",
+				"reactor.spring.context.annotation.ReplyTo",
+				"reactor.spring.context.config.EnableReactor")
+				.addStarImports("reactor.event.Selectors")
+				.addImport("ReactorEnvironment", "reactor.core.Environment");
 	}
 
 }
diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml
index e66a6e78eb..0cbb6396a6 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -79,7 +79,7 @@
 		<mongodb.version>2.11.4</mongodb.version>
 		<mysql.version>5.1.30</mysql.version>
 		<neo4j.version>2.0.2</neo4j.version>
-		<reactor.version>1.0.1.RELEASE</reactor.version>
+		<reactor.version>1.1.0.RELEASE</reactor.version>
 		<servlet-api.version>3.0.1</servlet-api.version>
 		<slf4j.version>1.7.7</slf4j.version>
 		<snakeyaml.version>1.13</snakeyaml.version>
@@ -418,8 +418,23 @@
 				<version>${reactor.version}</version>
 			</dependency>
 			<dependency>
-				<groupId>org.projectreactor</groupId>
-				<artifactId>reactor-spring</artifactId>
+				<groupId>org.projectreactor.spring</groupId>
+				<artifactId>reactor-spring-core</artifactId>
+				<version>${reactor.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.projectreactor.spring</groupId>
+				<artifactId>reactor-spring-context</artifactId>
+				<version>${reactor.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.projectreactor.spring</groupId>
+				<artifactId>reactor-spring-messaging</artifactId>
+				<version>${reactor.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.projectreactor.spring</groupId>
+				<artifactId>reactor-spring-webmvc</artifactId>
 				<version>${reactor.version}</version>
 			</dependency>
 			<dependency>