diff --git a/.dotbot.conf.yaml b/.dotbot.conf.yaml
index 3765fb1..f6ac10c 100644
--- a/.dotbot.conf.yaml
+++ b/.dotbot.conf.yaml
@@ -8,6 +8,7 @@
     ~/.ack: ack
     ~/.ag: ag
     ~/.ctags: ctags
+    ~/.editorconfig: editorconfig
     ~/.wget: wget
     ~/.zshrc: zshrc
 
diff --git a/editorconfig b/editorconfig
new file mode 100644
index 0000000..1e76b4d
--- /dev/null
+++ b/editorconfig
@@ -0,0 +1,24 @@
+# http://editorconfig.org
+
+# Root file
+root = true
+
+# Unix-style newlines with a newline ending every file
+[*]
+charset = utf-8
+end_of_line = lf
+indent_size = 2
+indent_style = space
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.{py,md,rst,sh,c,h}]
+indent_size = 4
+indent_style = space
+
+[*.{md,markdown,pandoc}]
+trim_trailing_whitespace = false
+
+[Makefile]
+indent_style = tab
+