diff --git a/etc/ide/README.md b/etc/ide/README.md
new file mode 100644
index 00000000..32c74a94
--- /dev/null
+++ b/etc/ide/README.md
@@ -0,0 +1,17 @@
+# Spring Data Code Formatting Settings
+
+This directory contains `eclipse-formatting.xml` and `springdata.importorder` settings files to be used with Eclipse and IntelliJ.
+
+## Eclipse Setup
+
+Import both files in Eclipse through the Preferences dialog.
+
+## IntelliJ Setup
+
+Use the IntelliJ [Eclipse Code Formatter](https://plugins.jetbrains.com/plugin/6546-eclipse-code-formatter) plugin to configure code formatting and import ordering with the newest Eclipse formatter version.
+
+Additionally, make sure to configure your import settings in `Editor -> Code Style -> Java` with the following explicit settings:
+
+* Use tab character indents
+* Class count to use import with `*`: 10
+* Names count to use static import with `*`: 1
diff --git a/etc/ide/intellij-formatting.jar b/etc/ide/intellij-formatting.jar
deleted file mode 100644
index eea8ae54..00000000
Binary files a/etc/ide/intellij-formatting.jar and /dev/null differ
diff --git a/etc/ide/springdata.importorder b/etc/ide/springdata.importorder
new file mode 100644
index 00000000..a974f58e
--- /dev/null
+++ b/etc/ide/springdata.importorder
@@ -0,0 +1,8 @@
+#Organize Import Order
+#Mon Nov 14 09:58:12 CET 2016
+5=com
+4=org
+3=javax
+2=java
+1=
+0=\#