diff --git a/.editorconfig b/.editorconfig
index dd6060ea..4b6c3526 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -10,10 +10,17 @@ indent_style = space
 indent_size = 2
 trim_trailing_whitespace = true
 
+[Dockerfile]
+indent_size = 4
+
 # Tab indentation (no size specified)
 [Makefile]
 indent_style = tab
 
+# Don't mess with markdown files
+[*.md]
+trim_trailing_whitespace = false
+
 [*.py]
 indent_size = 4