diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 00000000..5c683c50
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,26 @@
+root = true
+
+[*]
+indent_style = space
+indent_size = 4
+insert_final_newline = true
+trim_trailing_whitespace = true
+end_of_line = lf
+charset = utf-8
+
+[*.py]
+max_line_length = 79
+
+[*.yml]
+indent_size = 2
+max_line_length = 79
+
+[doc/**.rst]
+max_line_length = 79
+
+[Dockerfile]
+indent_size = 2
+
+[Makefile]
+indent_style = tab
+max_line_length = 79
diff --git a/MANIFEST.in b/MANIFEST.in
index c39bca5c..b74a9578 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,10 +1,10 @@
-recursive-include testinfra *.py 
+recursive-include testinfra *.py
 recursive-include test *.py ssh_key
 recursive-include images Dockerfile
 recursive-include doc *.py *.rst *.svg
 include doc/source/_templates/piwik.html
 include doc/Makefile
-include tox.ini 
+include tox.ini
 include Makefile
 include README.rst CONTRIBUTING.rst CHANGELOG.rst
 include pylintrc
@@ -13,3 +13,4 @@ include ansible.cfg
 include dev-requirements.txt
 include test-requirements.txt
 include LICENSE
+prune .editorconfig