diff --git a/.dir-locals.el b/.dir-locals.el
deleted file mode 100644
index 501d1d0..0000000
--- a/.dir-locals.el
+++ /dev/null
@@ -1,4 +0,0 @@
-((nil . ((indent-tabs-mode . nil)
-         (c-basic-offset . 4)
-         (fill-column . 80))))
-
diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..640a2a2
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,12 @@
+root = true
+
+# Unix-style newlines with a newline ending every file
+[*]
+end_of_line = lf
+insert_final_newline = true
+indent_style = space
+indent_size = 4
+
+# Tab indentation (no size specified)
+[Makefile]
+indent_style = tab