diff --git a/Cask b/Cask
index 2b40a5adb..782a6c7f1 100644
--- a/Cask
+++ b/Cask
@@ -64,6 +64,7 @@
 (depends-on "rotate-text" :git "https://github.com/debug-ito/rotate-text.el")
 (depends-on "smart-forward")
 (depends-on "smartparens")
+(depends-on "editorconfig")
 
 ;; Completion --- core/core-company.el
 (depends-on "company")
diff --git a/core/core-editor.el b/core/core-editor.el
index 7744891c3..063dfa362 100644
--- a/core/core-editor.el
+++ b/core/core-editor.el
@@ -71,8 +71,6 @@ enable multiple minor modes for the same regexp.")
 (associate! nxml-mode           :match "\\.plist$")
 
 (add-hook! help-mode      'visual-line-mode)
-(add-hook! makefile-mode  'narf|enable-tabs) ; Use normal tabs in makefiles
-(add-hook! prog-mode      'narf|enable-comment-hard-wrap)
 (add-hook! special-mode   (setq truncate-lines nil))
 (add-hook! before-save    'delete-trailing-whitespace)
 (add-hook! python-mode    'electric-indent-local-mode)
@@ -135,6 +133,9 @@ enable multiple minor modes for the same regexp.")
                 aw-scope 'frame
                 aw-background t))
 
+(use-package editorconfig
+  :config (editorconfig-mode +1))
+
 (use-package emr
   :commands (emr-initialize emr-show-refactor-menu emr-declare-command)
   :config (define-key popup-menu-keymap [escape] 'keyboard-quit))