diff --git a/.checkstyle b/.checkstyle
new file mode 100644
index 00000000..4541c40a
--- /dev/null
+++ b/.checkstyle
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<fileset-config file-format-version="1.2.0" simple-config="false">
+    <local-check-config name="Ivy Checkstyle Config" location="src/etc/checkstyle/checkstyle-config" type="project" description="">
+        <property name="checkstyle.src.dir" value="${basedir}/src/etc/checkstyle"/>
+        <additional-data name="protect-config-file" value="true"/>
+    </local-check-config>
+    <fileset name="Ivy Checkstyle config" enabled="true" check-config-name="Ivy Checkstyle Config" local="true">
+        <file-match-pattern match-pattern=".java$" include-pattern="true"/>
+    </fileset>
+</fileset-config>
diff --git a/.project b/.project
index e4f4f022..e0ad3e2f 100644
--- a/.project
+++ b/.project
@@ -10,8 +10,14 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>com.atlassw.tools.eclipse.checkstyle.CheckstyleNature</nature>
 	</natures>
 </projectDescription>