diff --git a/spring-boot-autoconfigure/pom.xml b/spring-boot-autoconfigure/pom.xml
index fc25f6fb604..ae2a39f0207 100755
--- a/spring-boot-autoconfigure/pom.xml
+++ b/spring-boot-autoconfigure/pom.xml
@@ -528,7 +528,22 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.session</groupId>
-			<artifactId>spring-session</artifactId>
+			<artifactId>spring-session-core</artifactId>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.session</groupId>
+			<artifactId>spring-session-data-redis</artifactId>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.session</groupId>
+			<artifactId>spring-session-hazelcast</artifactId>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.session</groupId>
+			<artifactId>spring-session-jdbc</artifactId>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml
index f3f2b319663..b36b9fd52a5 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -169,7 +169,7 @@
 		<spring-security.version>5.0.0.M2</spring-security.version>
 		<spring-security-jwt.version>1.0.8.RELEASE</spring-security-jwt.version>
 		<spring-security-oauth.version>2.1.1.RELEASE</spring-security-oauth.version>
-		<spring-session.version>2.0.0.M2</spring-session.version>
+		<spring-session.version>2.0.0.BUILD-SNAPSHOT</spring-session.version>
 		<spring-social.version>2.0.0.M3</spring-social.version>
 		<spring-social-facebook.version>3.0.0.M2</spring-social-facebook.version>
 		<spring-social-linkedin.version>2.0.0.M2</spring-social-linkedin.version>
@@ -2309,7 +2309,7 @@
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.session</groupId>
-				<artifactId>spring-session</artifactId>
+				<artifactId>spring-session-core</artifactId>
 				<version>${spring-session.version}</version>
 				<exclusions>
 					<exclusion>
@@ -2318,6 +2318,11 @@
 					</exclusion>
 				</exclusions>
 			</dependency>
+			<dependency>
+				<groupId>org.springframework.session</groupId>
+				<artifactId>spring-session-data-redis</artifactId>
+				<version>${spring-session.version}</version>
+			</dependency>
 			<dependency>
 				<groupId>org.springframework.session</groupId>
 				<artifactId>spring-session-hazelcast</artifactId>
@@ -2328,11 +2333,6 @@
 				<artifactId>spring-session-jdbc</artifactId>
 				<version>${spring-session.version}</version>
 			</dependency>
-			<dependency>
-				<groupId>org.springframework.session</groupId>
-				<artifactId>spring-session-data-redis</artifactId>
-				<version>${spring-session.version}</version>
-			</dependency>
 			<dependency>
 				<groupId>org.springframework.social</groupId>
 				<artifactId>spring-social-config</artifactId>
diff --git a/spring-boot-devtools/pom.xml b/spring-boot-devtools/pom.xml
index ef20def8fb8..559a2470a34 100644
--- a/spring-boot-devtools/pom.xml
+++ b/spring-boot-devtools/pom.xml
@@ -71,7 +71,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.session</groupId>
-			<artifactId>spring-session</artifactId>
+			<artifactId>spring-session-core</artifactId>
 			<optional>true</optional>
 		</dependency>
 		<!-- Annotation processing -->
diff --git a/spring-boot-docs/pom.xml b/spring-boot-docs/pom.xml
index 96d569930aa..84ba8a3fd16 100644
--- a/spring-boot-docs/pom.xml
+++ b/spring-boot-docs/pom.xml
@@ -630,7 +630,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.session</groupId>
-			<artifactId>spring-session</artifactId>
+			<artifactId>spring-session-core</artifactId>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
diff --git a/spring-boot-samples/spring-boot-sample-session-redis/pom.xml b/spring-boot-samples/spring-boot-sample-session-redis/pom.xml
index 37606d443f2..2eeca2f5ec6 100644
--- a/spring-boot-samples/spring-boot-sample-session-redis/pom.xml
+++ b/spring-boot-samples/spring-boot-sample-session-redis/pom.xml
@@ -30,7 +30,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.session</groupId>
-			<artifactId>spring-session</artifactId>
+			<artifactId>spring-session-data-redis</artifactId>
 		</dependency>
 		<!-- Test -->
 		<dependency>