diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml
index 0d720e1cbdf..1410402be72 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -453,7 +453,7 @@
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-starter-undertow</artifactId>
+				<artifactId>spring-boot-starter-jta-narayana</artifactId>
 				<version>2.0.0.BUILD-SNAPSHOT</version>
 			</dependency>
 			<dependency>
@@ -483,7 +483,7 @@
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-starter-jta-narayana</artifactId>
+				<artifactId>spring-boot-starter-reactor-netty</artifactId>
 				<version>2.0.0.BUILD-SNAPSHOT</version>
 			</dependency>
 			<dependency>
@@ -527,6 +527,11 @@
 				<artifactId>spring-boot-starter-tomcat</artifactId>
 				<version>2.0.0.BUILD-SNAPSHOT</version>
 			</dependency>
+			<dependency>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-starter-undertow</artifactId>
+				<version>2.0.0.BUILD-SNAPSHOT</version>
+			</dependency>
 			<dependency>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-starter-validation</artifactId>
@@ -537,6 +542,11 @@
 				<artifactId>spring-boot-starter-web</artifactId>
 				<version>2.0.0.BUILD-SNAPSHOT</version>
 			</dependency>
+			<dependency>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-starter-webflux</artifactId>
+				<version>2.0.0.BUILD-SNAPSHOT</version>
+			</dependency>
 			<dependency>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-starter-websocket</artifactId>
diff --git a/spring-boot-starters/pom.xml b/spring-boot-starters/pom.xml
index 1cd0f43dfdc..cac52775435 100644
--- a/spring-boot-starters/pom.xml
+++ b/spring-boot-starters/pom.xml
@@ -56,6 +56,7 @@
 		<module>spring-boot-starter-mustache</module>
 		<module>spring-boot-starter-actuator</module>
 		<module>spring-boot-starter-parent</module>
+		<module>spring-boot-starter-reactor-netty</module>
 		<module>spring-boot-starter-security</module>
 		<module>spring-boot-starter-social-facebook</module>
 		<module>spring-boot-starter-social-twitter</module>
@@ -66,6 +67,7 @@
 		<module>spring-boot-starter-undertow</module>
 		<module>spring-boot-starter-validation</module>
 		<module>spring-boot-starter-web</module>
+		<module>spring-boot-starter-webflux</module>
 		<module>spring-boot-starter-websocket</module>
 		<module>spring-boot-starter-web-services</module>
 	</modules>
diff --git a/spring-boot-starters/spring-boot-starter-reactor-netty/pom.xml b/spring-boot-starters/spring-boot-starter-reactor-netty/pom.xml
new file mode 100644
index 00000000000..bfc2601e71c
--- /dev/null
+++ b/spring-boot-starters/spring-boot-starter-reactor-netty/pom.xml
@@ -0,0 +1,26 @@
+<?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.boot</groupId>
+		<artifactId>spring-boot-starters</artifactId>
+		<version>2.0.0.BUILD-SNAPSHOT</version>
+	</parent>
+	<artifactId>spring-boot-starter-reactor-netty</artifactId>
+	<name>Spring Boot Reactor Netty Starter</name>
+	<description>Starter for using Reactor Netty as the embedded reactive HTTP server.</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>io.projectreactor.ipc</groupId>
+			<artifactId>reactor-netty</artifactId>
+		</dependency>
+	</dependencies>
+</project>
diff --git a/spring-boot-starters/spring-boot-starter-reactor-netty/src/main/resources/META-INF/spring.provides b/spring-boot-starters/spring-boot-starter-reactor-netty/src/main/resources/META-INF/spring.provides
new file mode 100644
index 00000000000..6aaea8ae603
--- /dev/null
+++ b/spring-boot-starters/spring-boot-starter-reactor-netty/src/main/resources/META-INF/spring.provides
@@ -0,0 +1 @@
+provides: reactor-netty
\ No newline at end of file
diff --git a/spring-boot-starters/spring-boot-starter-webflux/pom.xml b/spring-boot-starters/spring-boot-starter-webflux/pom.xml
new file mode 100644
index 00000000000..208380826e2
--- /dev/null
+++ b/spring-boot-starters/spring-boot-starter-webflux/pom.xml
@@ -0,0 +1,47 @@
+<?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.boot</groupId>
+		<artifactId>spring-boot-starters</artifactId>
+		<version>2.0.0.BUILD-SNAPSHOT</version>
+	</parent>
+	<artifactId>spring-boot-starter-webflux</artifactId>
+	<name>Spring Boot WebFlux Starter</name>
+	<description>Starter for building WebFlux applications using Spring Framework's
+		Reactive Web support</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.boot</groupId>
+			<artifactId>spring-boot-starter</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-reactor-netty</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-databind</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.hibernate</groupId>
+			<artifactId>hibernate-validator</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-web</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-webflux</artifactId>
+		</dependency>
+	</dependencies>
+</project>
diff --git a/spring-boot-starters/spring-boot-starter-webflux/src/main/resources/META-INF/spring.provides b/spring-boot-starters/spring-boot-starter-webflux/src/main/resources/META-INF/spring.provides
new file mode 100644
index 00000000000..9c0d58c173b
--- /dev/null
+++ b/spring-boot-starters/spring-boot-starter-webflux/src/main/resources/META-INF/spring.provides
@@ -0,0 +1 @@
+provides: spring-webflux
\ No newline at end of file