diff --git a/custom.el b/custom.el
index d6f6621..c76af7d 100644
--- a/custom.el
+++ b/custom.el
@@ -11,7 +11,7 @@
  '(anzu-search-threshold 1000)
  '(package-selected-packages
    (quote
-    (whitespace-cleanup-mode rainbow-mode scss-mode sass-mode less-css-mode ac-php smarty-mode php-mode pkgbuild-mode markdown-mode flycheck anzu sml-modeline smart-mode-line-powerline-theme smart-mode-line nlinum sublime-themes))))
+    (editorconfig whitespace-cleanup-mode rainbow-mode scss-mode sass-mode less-css-mode ac-php smarty-mode php-mode pkgbuild-mode markdown-mode flycheck anzu sml-modeline smart-mode-line-powerline-theme smart-mode-line nlinum sublime-themes))))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.
diff --git a/init.el b/init.el
index 0003a19..3cf0d87 100644
--- a/init.el
+++ b/init.el
@@ -37,6 +37,7 @@
 ;; Tools
 (require 'init-flycheck)
 (require 'init-whitespace)
+(require 'init-editorconfig)
 ;; Languages
 (require 'init-ccc)
 (require 'init-markdown)
diff --git a/lisp/init-editorconfig.el b/lisp/init-editorconfig.el
new file mode 100644
index 0000000..b235b30
--- /dev/null
+++ b/lisp/init-editorconfig.el
@@ -0,0 +1,8 @@
+;;----------------------------------------------------------------------------
+;; EditorConfig
+;;----------------------------------------------------------------------------
+(require-package 'editorconfig)
+
+(editorconfig-mode 1)
+
+(provide 'init-editorconfig)