diff --git a/.gitignore b/.gitignore
index 820c73250e..4fbf4a5f58 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,7 @@ ratReport.txt
 .settings
 .checkstyle
 .factorypath
+**/.editorconfig
 **/derby.log
 
 # for native build
diff --git a/docs/hacking-guide/en/formatting.md b/docs/hacking-guide/en/formatting.md
index daec275848..6b6469b58e 100644
--- a/docs/hacking-guide/en/formatting.md
+++ b/docs/hacking-guide/en/formatting.md
@@ -13,3 +13,9 @@ conflicts with [m2e](http://eclipse.org/m2e/).
 # Idea
 
 If you completed the step described on [idea instructions](ide.md#style-templates-and-inspection-settings-for-idea), and selected the code style accordingly you should be ready to go.
+
+# EditorConfig
+
+For editors supporting [EditorConfig](http://editorconfig.org/), a settings file is provided in
+etc/ide-settings/editorconfig.ini. Copy it to your Artemis top level directory and
+[name it .editorconfig](http://editorconfig.org/#file-location)
diff --git a/etc/ide-settings/editorconfig.ini b/etc/ide-settings/editorconfig.ini
new file mode 100644
index 0000000000..874dc21db2
--- /dev/null
+++ b/etc/ide-settings/editorconfig.ini
@@ -0,0 +1,11 @@
+# Copy to your Artemis top level dir and rename to .editorconfig
+# http://editorconfig.org/#file-location
+
+[*.{java,xml}]
+indent_style = space
+indent_size = 3
+tab_width = 3
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
diff --git a/pom.xml b/pom.xml
index e39d82c9a5..96c11876b5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1269,6 +1269,7 @@
                   <exclude>**/.settings/**</exclude>
                   <exclude>**/.project</exclude>
                   <exclude>**/.classpath</exclude>
+                  <exclude>**/.editorconfig</exclude>
                   <exclude>**/.checkstyle</exclude>
                   <exclude>**/.factorypath</exclude>
                   <exclude>ratReport.txt</exclude>