diff --git a/modules/emacs.el b/modules/emacs.el
index 6601f96..d76ea36 100644
--- a/modules/emacs.el
+++ b/modules/emacs.el
@@ -461,6 +461,11 @@
     (((text-mode org-mode) . flyspell-mode)
      (prog-mode . flyspell-prog-mode))
     :config
+    (if (executable-find "aspell")
+        (progn
+          (setq-default ispell-program-name "aspell")
+          (setq-default ispell-extra-args '("--sug-mode=ultra" "--camel-case")))
+      (setq-default ispell-program-name "hunspell"))
     (unbind-key "C-M-i" flyspell-mode-map))
 
   ;; -----------------------------------------------------------------------------------------------