diff --git a/modules/feature/spellcheck/config.el b/modules/feature/spellcheck/config.el
new file mode 100644
index 000000000..32b5c6220
--- /dev/null
+++ b/modules/feature/spellcheck/config.el
@@ -0,0 +1,31 @@
+;;; feature/spellcheck/config.el
+
+(@def-package flyspell ; built-in
+  :commands flyspell-mode
+  :init (@add-hook text-mode 'flyspell-mode))
+
+
+(@def-package flyspell-correct
+  :commands (flyspell-correct-word-generic
+             flyspell-correct-previous-word-generic))
+
+
+(@def-package flyspell-correct-popup
+  :after flyspell-correct
+  :config
+  (setq flyspell-popup-correct-delay 0.8)
+  (add-hook 'flyspell-mode-hook 'flyspell-popup-auto-correct-mode))
+
+
+(@def-package flyspell-correct-ivy
+  :when (@featurep :completion ivy)
+  :after flyspell-correct)
+
+(@def-package flyspell-correct-helm
+  :when (@featurep :completion helm)
+  :after flyspell-correct)
+
+(@def-package flyspell-correct-ido
+  :when (@featurep :emacs ido)
+  :after flyspell-correct)
+
diff --git a/modules/feature/spellcheck/packages.el b/modules/feature/spellcheck/packages.el
new file mode 100644
index 000000000..9a665ac52
--- /dev/null
+++ b/modules/feature/spellcheck/packages.el
@@ -0,0 +1,14 @@
+;; -*- no-byte-compile: t; -*-
+;;; feature/spellcheck/packages.el
+
+(@package flyspell-correct)
+(@package flyspell-correct-popup)
+
+(cond ((@featurep :completion ivy)
+       (@package flyspell-correct-ivy))
+      ((@featurep :completion helm)
+       (@package flyspell-correct-helm))
+      ((@featurep :emacs ido)
+       (@package flyspell-correct-ido)))
+
+