diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml
index 513bc1f8da0..b7a4823bf24 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -207,6 +207,11 @@
 				<artifactId>spring-boot-starter-freemarker</artifactId>
 				<version>1.1.0.BUILD-SNAPSHOT</version>
 			</dependency>
+			<dependency>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-starter-groovy-templates</artifactId>
+				<version>1.1.0.BUILD-SNAPSHOT</version>
+			</dependency>
 			<dependency>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-starter-integration</artifactId>
diff --git a/spring-boot-samples/spring-boot-sample-web-groovy-templates/pom.xml b/spring-boot-samples/spring-boot-sample-web-groovy-templates/pom.xml
index 07a396506ca..d9cc776d7d6 100644
--- a/spring-boot-samples/spring-boot-sample-web-groovy-templates/pom.xml
+++ b/spring-boot-samples/spring-boot-sample-web-groovy-templates/pom.xml
@@ -22,11 +22,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-web</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.codehaus.groovy</groupId>
-			<artifactId>groovy-templates</artifactId>
+			<artifactId>spring-boot-starter-groovy-templates</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
diff --git a/spring-boot-starters/pom.xml b/spring-boot-starters/pom.xml
index 56d176131e7..bb7a588aaef 100644
--- a/spring-boot-starters/pom.xml
+++ b/spring-boot-starters/pom.xml
@@ -30,6 +30,7 @@
 		<module>spring-boot-starter-data-rest</module>
 		<module>spring-boot-starter-data-solr</module>
 		<module>spring-boot-starter-freemarker</module>
+		<module>spring-boot-starter-groovy-templates</module>
 		<module>spring-boot-starter-integration</module>
 		<module>spring-boot-starter-jdbc</module>
 		<module>spring-boot-starter-jetty</module>
diff --git a/spring-boot-starters/spring-boot-starter-groovy-templates/pom.xml b/spring-boot-starters/spring-boot-starter-groovy-templates/pom.xml
new file mode 100644
index 00000000000..4fafe8c192b
--- /dev/null
+++ b/spring-boot-starters/spring-boot-starter-groovy-templates/pom.xml
@@ -0,0 +1,34 @@
+<?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>1.1.0.BUILD-SNAPSHOT</version>
+	</parent>
+	<artifactId>spring-boot-starter-groovy-templates</artifactId>
+	<name>spring-boot-starter-groovy-templates</name>
+	<description>Spring Boot FreeMarker Starter</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-web</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.codehaus.groovy</groupId>
+			<artifactId>groovy</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.codehaus.groovy</groupId>
+			<artifactId>groovy-templates</artifactId>
+		</dependency>
+	</dependencies>
+</project>
diff --git a/spring-boot-starters/spring-boot-starter-groovy-templates/src/main/resources/META-INF/spring.provides b/spring-boot-starters/spring-boot-starter-groovy-templates/src/main/resources/META-INF/spring.provides
new file mode 100644
index 00000000000..3f52c55a60b
--- /dev/null
+++ b/spring-boot-starters/spring-boot-starter-groovy-templates/src/main/resources/META-INF/spring.provides
@@ -0,0 +1 @@
+provides: freemarker,spring-context-support
\ No newline at end of file