diff --git a/emacs.el b/emacs.el
index 9495ce8..a6d41be 100644
--- a/emacs.el
+++ b/emacs.el
@@ -1151,8 +1151,9 @@ found, otherwise returns nil."
 (add-to-list 'auto-mode-alist (cons "\\.ol\\'" 'outline-mode))
 
 (add-to-list 'auto-mode-alist (cons "\\.md\\'" 'outline-mode))
-(when (autoload-eval-lazily 'markdown-mode)
-  (add-to-list 'auto-mode-alist (cons "\\.md\\'" 'markdown-mode))
+(when (autoload-eval-lazily 'markdown-mode
+          '(markdown-mode gfm-mode))
+  (add-to-list 'auto-mode-alist (cons "\\.md\\'" 'gfm-mode))
   (setq markdown-command (or (executable-find "markdown")
                              (executable-find "markdown.pl")))
   (add-hook 'markdown-mode-hook