diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000000000000000000000000000000000000..89e9e061ced5c5ea443a61b34f80f2a5b1097958
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,14 @@
+# Editor configuration normalization
+# @see http://editorconfig.org/
+
+# This is the top-most .editorconfig file; do not search in parent directories.
+root = true
+
+# All files.
+[*]
+end_of_line = LF
+indent_style = space
+indent_size = 4
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
diff --git a/bin/build-release.sh b/bin/build-release.sh
index 35023ba087603e08dd542f1b7d8dcdab92c720af..0a981b53a156f51db5fca6ef7e4ada40842a2f15 100755
--- a/bin/build-release.sh
+++ b/bin/build-release.sh
@@ -50,6 +50,7 @@ rm -rf "$TARGET/.git"
 rm "$TARGET/.coveralls.yml"
 rm "$TARGET/.travis.yml"
 rm "$TARGET/.gitignore"
+rm "$TARGET/.editorconfig"
 rm "$TARGET/composer.phar"
 tar --owner 0 --group 0 -cvzf "$TARGET.tar.gz" "$TARGET"
 rm -rf "$TARGET"