diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml
index a44df9699b..f21fc31594 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -291,6 +291,11 @@
 				<artifactId>spring-boot-starter-data-mongodb</artifactId>
 				<version>1.4.0.BUILD-SNAPSHOT</version>
 			</dependency>
+			<dependency>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-starter-data-redis</artifactId>
+				<version>1.4.0.BUILD-SNAPSHOT</version>
+			</dependency>
 			<dependency>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-starter-data-rest</artifactId>
@@ -386,11 +391,6 @@
 				<artifactId>spring-boot-starter-mustache</artifactId>
 				<version>1.4.0.BUILD-SNAPSHOT</version>
 			</dependency>
-			<dependency>
-				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-starter-redis</artifactId>
-				<version>1.4.0.BUILD-SNAPSHOT</version>
-			</dependency>
 			<dependency>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-starter-remote-shell</artifactId>
diff --git a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc b/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
index 7aa7582164..54b2a2ba3c 100644
--- a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
+++ b/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
@@ -2711,7 +2711,7 @@ http://redis.io/[Redis] is a cache, message broker and richly-featured key-value
 Spring Boot offers basic auto-configuration for the
 https://github.com/xetorthio/jedis/[Jedis] client library and abstractions on top of it
 provided by https://github.com/spring-projects/spring-data-redis[Spring Data Redis]. There
-is a `spring-boot-starter-redis` '`Starter POM`' for collecting the dependencies in a
+is a `spring-boot-starter-data-redis` '`Starter POM`' for collecting the dependencies in a
 convenient way.
 
 
diff --git a/spring-boot-docs/src/main/asciidoc/using-spring-boot.adoc b/spring-boot-docs/src/main/asciidoc/using-spring-boot.adoc
index c2a414ea8b..2dd8791e70 100644
--- a/spring-boot-docs/src/main/asciidoc/using-spring-boot.adoc
+++ b/spring-boot-docs/src/main/asciidoc/using-spring-boot.adoc
@@ -416,6 +416,9 @@ and Hibernate.
 |`spring-boot-starter-data-mongodb`
 |Support for the MongoDB NoSQL Database, including `spring-data-mongodb`.
 
+|`spring-boot-starter-data-redis`
+|Support for the REDIS key-value data store, including `spring-data-redis`.
+
 |`spring-boot-starter-data-rest`
 |Support for exposing Spring Data repositories over REST via `spring-data-rest-webmvc`.
 
@@ -458,9 +461,6 @@ and Hibernate.
 |`spring-boot-starter-mustache`
 |Support for the Mustache templating engine.
 
-|`spring-boot-starter-redis`
-|Support for the REDIS key-value data store, including `spring-redis`.
-
 |`spring-boot-starter-security`
 |Support for `spring-security`.
 
diff --git a/spring-boot-samples/spring-boot-sample-cache/README.adoc b/spring-boot-samples/spring-boot-sample-cache/README.adoc
index bbce5605f8..5a44d740e4 100644
--- a/spring-boot-samples/spring-boot-sample-cache/README.adoc
+++ b/spring-boot-samples/spring-boot-sample-cache/README.adoc
@@ -79,7 +79,7 @@ can set the `spring.cache.infinispan.config` property to use the provided
 
 
 === Redis
-Add the `spring-boot-starter-redis` and make sure it is configured properly (by default,
+Add the `spring-boot-starter-data-redis` and make sure it is configured properly (by default,
 a redis instance with the default settings is expected on your local box).
 
 
diff --git a/spring-boot-samples/spring-boot-sample-cache/pom.xml b/spring-boot-samples/spring-boot-sample-cache/pom.xml
index a30e0033b0..e54fb39323 100644
--- a/spring-boot-samples/spring-boot-sample-cache/pom.xml
+++ b/spring-boot-samples/spring-boot-sample-cache/pom.xml
@@ -71,7 +71,7 @@
 		<!--
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-redis</artifactId>
+			<artifactId>spring-boot-starter-data-redis</artifactId>
 		</dependency>
 		-->
 		<!--
diff --git a/spring-boot-samples/spring-boot-sample-data-redis/pom.xml b/spring-boot-samples/spring-boot-sample-data-redis/pom.xml
index 8b77d24429..6c11f4129e 100644
--- a/spring-boot-samples/spring-boot-sample-data-redis/pom.xml
+++ b/spring-boot-samples/spring-boot-sample-data-redis/pom.xml
@@ -21,7 +21,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-redis</artifactId>
+			<artifactId>spring-boot-starter-data-redis</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
diff --git a/spring-boot-samples/spring-boot-sample-metrics-redis/pom.xml b/spring-boot-samples/spring-boot-sample-metrics-redis/pom.xml
index 3840f43661..cd8ecb6df7 100644
--- a/spring-boot-samples/spring-boot-sample-metrics-redis/pom.xml
+++ b/spring-boot-samples/spring-boot-sample-metrics-redis/pom.xml
@@ -29,7 +29,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-redis</artifactId>
+			<artifactId>spring-boot-starter-data-redis</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
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 08657f3da9..30f7127f2f 100644
--- a/spring-boot-samples/spring-boot-sample-session-redis/pom.xml
+++ b/spring-boot-samples/spring-boot-sample-session-redis/pom.xml
@@ -25,7 +25,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-redis</artifactId>
+			<artifactId>spring-boot-starter-data-redis</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.session</groupId>
diff --git a/spring-boot-starters/pom.xml b/spring-boot-starters/pom.xml
index c0b9af6f5c..c755242332 100644
--- a/spring-boot-starters/pom.xml
+++ b/spring-boot-starters/pom.xml
@@ -32,6 +32,7 @@
 		<module>spring-boot-starter-data-gemfire</module>
 		<module>spring-boot-starter-data-jpa</module>
 		<module>spring-boot-starter-data-mongodb</module>
+		<module>spring-boot-starter-data-redis</module>
 		<module>spring-boot-starter-data-rest</module>
 		<module>spring-boot-starter-data-solr</module>
 		<module>spring-boot-starter-freemarker</module>
@@ -52,7 +53,6 @@
 		<module>spring-boot-starter-mustache</module>
 		<module>spring-boot-starter-actuator</module>
 		<module>spring-boot-starter-parent</module>
-		<module>spring-boot-starter-redis</module>
 		<module>spring-boot-starter-security</module>
 		<module>spring-boot-starter-social-facebook</module>
 		<module>spring-boot-starter-social-twitter</module>
diff --git a/spring-boot-starters/spring-boot-starter-redis/pom.xml b/spring-boot-starters/spring-boot-starter-data-redis/pom.xml
similarity index 86%
rename from spring-boot-starters/spring-boot-starter-redis/pom.xml
rename to spring-boot-starters/spring-boot-starter-data-redis/pom.xml
index 46f3b6d41f..87dc122d01 100644
--- a/spring-boot-starters/spring-boot-starter-redis/pom.xml
+++ b/spring-boot-starters/spring-boot-starter-data-redis/pom.xml
@@ -6,9 +6,9 @@
 		<artifactId>spring-boot-starters</artifactId>
 		<version>1.4.0.BUILD-SNAPSHOT</version>
 	</parent>
-	<artifactId>spring-boot-starter-redis</artifactId>
-	<name>Spring Boot Redis Starter</name>
-	<description>Spring Boot Redis Starter</description>
+	<artifactId>spring-boot-starter-data-redis</artifactId>
+	<name>Spring Boot Data Redis Starter</name>
+	<description>Spring Boot Data Redis Starter</description>
 	<url>http://projects.spring.io/spring-boot/</url>
 	<organization>
 		<name>Pivotal Software, Inc.</name>
diff --git a/spring-boot-starters/spring-boot-starter-redis/src/main/resources/META-INF/spring.provides b/spring-boot-starters/spring-boot-starter-data-redis/src/main/resources/META-INF/spring.provides
similarity index 100%
rename from spring-boot-starters/spring-boot-starter-redis/src/main/resources/META-INF/spring.provides
rename to spring-boot-starters/spring-boot-starter-data-redis/src/main/resources/META-INF/spring.provides