diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 00000000..651554ba
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,5 @@
+root = true
+# Unix-style newlines with a newline ending every file
+[*]
+end_of_line = lf
+insert_final_newline = true
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000..6313b56c
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+* text=auto eol=lf
diff --git a/.gitignore b/.gitignore
index 782304db..4c9964d3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,8 +21,6 @@ object_script.goldendict.Release
 
 version.txt
 
-.gitattributes
-
 *.dmg
 
 .DS_Store