diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 00000000000..70b6c0f1390
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,17 @@
+# EditorConfig configuration for systemd
+# http://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+# Unix-style newlines with a newline ending every file, utf-8 charset
+[*]
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+charset = utf-8
+
+# match config files, set indent to spaces with width of eight
+[*.{c,h}]
+indent_style = space
+indent_size = 8
diff --git a/Makefile.am b/Makefile.am
index cd9aea6bc8d..319d71befeb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -660,6 +660,7 @@ EXTRA_DIST += \
 	README.md \
 	autogen.sh \
 	.dir-locals.el \
+	.editorconfig \
 	.vimrc \
 	.ycm_extra_conf.py \
 	.travis.yml \