diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 00000000..ab417694
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,11 @@
+#
+# http://editorconfig.org
+#
+
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+trim_trailing_whitespace = true
+
diff --git a/packages/core/acme-client/.editorconfig b/packages/core/acme-client/.editorconfig
index 7660a90c..8214df12 100644
--- a/packages/core/acme-client/.editorconfig
+++ b/packages/core/acme-client/.editorconfig
@@ -6,7 +6,7 @@ root = true
 
 [*]
 indent_style = space
-indent_size = 4
+indent_size = 2
 trim_trailing_whitespace = true
 
 [{*.yml,*.yaml}]