diff --git a/core/prelude-editor.el b/core/prelude-editor.el
index 5cc8e70..4a9b1b4 100644
--- a/core/prelude-editor.el
+++ b/core/prelude-editor.el
@@ -181,6 +181,12 @@ The body of the advice is in BODY."
 (when (version<= "24.4" emacs-version)
   (add-hook 'focus-out-hook 'prelude-save-all-buffers))
 
+(defadvice set-buffer-major-mode (after set-major-mode activate compile)
+  "Set buffer major mode according to `auto-mode-alist'."
+  (let* ((name (buffer-name buffer))
+         (mode (assoc-default name auto-mode-alist 'string-match)))
+    (with-current-buffer buffer (if mode (funcall mode)))))
+
 ;; highlight the current line
 (global-hl-line-mode +1)