diff --git a/CHANGELOG b/CHANGELOG
index 341e5808..e97c7bd7 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,5 @@
+- gh-67 Use checkstyle (m1ch1)
+
 0.1.4 - 2/22/12 
 
 - Fixes for Cassandra 0.7 client (tjake)
diff --git a/build-tools/pom.xml b/build-tools/pom.xml
deleted file mode 100644
index 72a07a30..00000000
--- a/build-tools/pom.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<project>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.yahoo.ycsb</groupId>
-  <artifactId>build-tools</artifactId>
-  <version>0.1.4</version>
-  <name>Build Tools</name>
-</project>
diff --git a/build-tools/src/main/resources/checkstyle.xml b/checkstyle.xml
similarity index 100%
rename from build-tools/src/main/resources/checkstyle.xml
rename to checkstyle.xml
diff --git a/pom.xml b/pom.xml
index bc181f56..1325e918 100644
--- a/pom.xml
+++ b/pom.xml
@@ -88,15 +88,8 @@
         <version>2.6</version>
         <configuration>
           <consoleOutput>true</consoleOutput>
-          <!--configLocation>checkstyle.xml</configLocation-->
+          <configLocation>checkstyle.xml</configLocation>
         </configuration>
-        <!--dependencies>
-          <dependency>
-            <groupId>com.yahoo.ycsb</groupId>
-            <artifactId>build-tools</artifactId>
-            <version>0.1.4</version>
-          </dependency>
-        </dependencies-->
         <executions>
           <execution>
           <id>validate</id>