diff --git a/.gitignore b/.gitignore
index 6d2a8089b7..8c344b6a6a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,5 +19,5 @@ build/
 *.iws
 .gradle/
 atlassian-ide-plugin.xml
-!eclipse/.checkstyle
+!etc/eclipse/.checkstyle
 .checkstyle
\ No newline at end of file
diff --git a/etc/eclipse/.checkstyle b/etc/eclipse/.checkstyle
new file mode 100644
index 0000000000..ec05125409
--- /dev/null
+++ b/etc/eclipse/.checkstyle
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
+	<local-check-config name="Spring Security Checkstyle" location="${configDir}/checkstyle.xml" type="external" description="">
+		<property name="configDir" value="${configDir}"/>
+		<additional-data name="protect-config-file" value="false"/>
+	</local-check-config>
+	<fileset name="all" enabled="true" check-config-name="Spring Security Checkstyle" local="true">
+		<file-match-pattern match-pattern="." include-pattern="true"/>
+	</fileset>
+</fileset-config>
\ No newline at end of file
diff --git a/gradle/ide.gradle b/gradle/ide.gradle
index efa4e4fe53..81edfadc8b 100644
--- a/gradle/ide.gradle
+++ b/gradle/ide.gradle
@@ -15,7 +15,7 @@ task eclipseCheckstyle(type: Copy) {
 	from rootProject.files(
 		"etc/eclipse/.checkstyle")
 	into project.projectDir
-	expand(configDir: rootProject.file('config/checkstyle').absolutePath)
+	expand(configDir: rootProject.file('etc/checkstyle').absolutePath)
 }
 task eclipseSettings(type: Copy) {
 	from rootProject.files(