diff --git a/modules/prelude-programming.el b/modules/prelude-programming.el
index 7a4e4de..64f3353 100644
--- a/modules/prelude-programming.el
+++ b/modules/prelude-programming.el
@@ -117,7 +117,6 @@
   (when prelude-guru
     (guru-mode +1))
   (prelude-enable-whitespace)
-  (flycheck-mode +1)
   (prelude-local-comment-auto-fill)
   (prelude-add-watchwords))
 
@@ -126,5 +125,9 @@
 (add-hook 'prog-mode-hook (lambda ()
                             (run-hooks 'prelude-prog-mode-hook)))
 
+(if (fboundp 'global-flycheck-mode)
+    (global-flycheck-mode +1)
+  (add-hook 'prog-mode-hook 'flycheck-mode))
+
 (provide 'prelude-programming)
 ;;; prelude-programming.el ends here