diff --git a/pom.xml b/pom.xml
index 23ae2bc86..db5c59553 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,6 +46,7 @@
 		<module>spring-cloud-stream-reactive</module>
 		<module>spring-cloud-stream-schema</module>
 		<module>spring-cloud-stream-schema-server</module>
+		<module>spring-cloud-stream-tools</module>
 	</modules>
 	<build>
 		<pluginManagement>
@@ -63,7 +64,7 @@
 						<dependency>
 							<groupId>com.puppycrawl.tools</groupId>
 							<artifactId>checkstyle</artifactId>
-							<version>6.17</version>
+							<version>7.1</version>
 						</dependency>
 					</dependencies>
 				</plugin>
@@ -87,14 +88,20 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-checkstyle-plugin</artifactId>
+				<dependencies>
+					<dependency>
+						<groupId>org.springframework.cloud</groupId>
+						<artifactId>spring-cloud-stream-tools</artifactId>
+						<version>${project.version}</version>
+					</dependency>
+				</dependencies>
 				<executions>
 					<execution>
 						<id>checkstyle-validation</id>
 						<phase>validate</phase>
 						<configuration>
-							<configLocation>src/checkstyle/checkstyle.xml</configLocation>
-							<headerLocation>src/checkstyle/checkstyle-header.txt</headerLocation>
-							<propertyExpansion>checkstyle.build.directory=${project.build.directory}</propertyExpansion>
+							<configLocation>checkstyle.xml</configLocation>
+							<headerLocation>checkstyle-header.txt</headerLocation>
 							<encoding>UTF-8</encoding>
 							<consoleOutput>true</consoleOutput>
 							<failsOnError>true</failsOnError>
diff --git a/spring-cloud-stream-dependencies/pom.xml b/spring-cloud-stream-dependencies/pom.xml
index 09dc98076..f6a37fbe9 100644
--- a/spring-cloud-stream-dependencies/pom.xml
+++ b/spring-cloud-stream-dependencies/pom.xml
@@ -26,6 +26,11 @@
 				<artifactId>spring-cloud-stream</artifactId>
 				<version>1.1.0.BUILD-SNAPSHOT</version>
 			</dependency>
+			<dependency>
+				<groupId>org.springframework.cloud</groupId>
+				<artifactId>spring-cloud-stream-build-tools</artifactId>
+				<version>1.1.0.BUILD-SNAPSHOT</version>
+			</dependency>
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-stream-codec</artifactId>
diff --git a/spring-cloud-stream-tools/pom.xml b/spring-cloud-stream-tools/pom.xml
new file mode 100644
index 000000000..63d8b4632
--- /dev/null
+++ b/spring-cloud-stream-tools/pom.xml
@@ -0,0 +1,19 @@
+<?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.cloud</groupId>
+        <artifactId>spring-cloud-build</artifactId>
+        <version>1.1.2.BUILD-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
+
+    <artifactId>spring-cloud-stream-tools</artifactId>
+    <version>1.1.0.BUILD-SNAPSHOT</version>
+    <name>spring-cloud-stream-build-tools</name>
+    <description>Spring Cloud Stream Build Tools</description>
+
+
+</project>
\ No newline at end of file
diff --git a/src/checkstyle/checkstyle-header.txt b/spring-cloud-stream-tools/src/main/resources/checkstyle-header.txt
similarity index 100%
rename from src/checkstyle/checkstyle-header.txt
rename to spring-cloud-stream-tools/src/main/resources/checkstyle-header.txt
diff --git a/src/checkstyle/checkstyle.xml b/spring-cloud-stream-tools/src/main/resources/checkstyle.xml
similarity index 98%
rename from src/checkstyle/checkstyle.xml
rename to spring-cloud-stream-tools/src/main/resources/checkstyle.xml
index c4baccbb4..2d7db87b2 100644
--- a/src/checkstyle/checkstyle.xml
+++ b/spring-cloud-stream-tools/src/main/resources/checkstyle.xml
@@ -5,7 +5,7 @@
 <module name="Checker">
 	<!-- Root Checks -->
 	<module name="RegexpHeader">
-		<property name="headerFile" value="src/checkstyle/checkstyle-header.txt" />
+		<property name="headerFile" value="${checkstyle.header.file}" />
 		<property name="fileExtensions" value="java" />
 	</module>
 	<module name="NewlineAtEndOfFile">