diff --git a/.gitmodules b/.gitmodules
index bc607e2..aa4ab94 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -85,3 +85,6 @@
 [submodule "site-lisp/avy"]
 	path = site-lisp/avy
 	url = https://github.com/abo-abo/avy.git
+[submodule "site-lisp/editorconfig-emacs"]
+	path = site-lisp/editorconfig-emacs
+	url = https://github.com/editorconfig/editorconfig-emacs.git
diff --git a/init.el b/init.el
index 3f86bb8..474e57e 100644
--- a/init.el
+++ b/init.el
@@ -114,6 +114,7 @@ If freezing sometimes, decrease it. If stuttering, increase it.")
 (require 'init-tools)
 (require 'init-ibuffer)
 (require 'init-which-key)
+(require 'init-editorconfig)
 
 
 (setq custom-file (expand-file-name "custom.el" creature/cache-dir))
diff --git a/lisp/init-editorconfig.el b/lisp/init-editorconfig.el
new file mode 100644
index 0000000..ca4f5b5
--- /dev/null
+++ b/lisp/init-editorconfig.el
@@ -0,0 +1,9 @@
+;; -*- coding: utf-8; lexical-binding: t; -*-
+
+(require 'editorconfig)
+
+(editorconfig-mode 1)
+
+(setq creature/editorconfig-timer nil)
+
+(provide 'init-editorconfig)
diff --git a/site-lisp/editorconfig-emacs b/site-lisp/editorconfig-emacs
new file mode 160000
index 0000000..bcd3775
--- /dev/null
+++ b/site-lisp/editorconfig-emacs
@@ -0,0 +1 @@
+Subproject commit bcd377596fc0c5c315598adaa59fcd0455916f8d