diff --git a/CHANGELOG.org b/CHANGELOG.org
index 07df83255..808a5deaf 100644
--- a/CHANGELOG.org
+++ b/CHANGELOG.org
@@ -45,6 +45,11 @@
     to set in their own private module. Use ~(set! :font "Font Name" :size N)~
     to do so.
 + =lang=
+  + =crystal=
+    + Add flycheck integration for the Crystal language, powered by
+      ~flycheck-crystal~.
+    + Use the ELPA source for ~crystal-mode~. The former QUELPA soruce
+      (dotmilk's fork) is no longer maintained.
   + =sh=
     + Improve how variables and subshells in double-quoted strings are
       fontified.
diff --git a/modules/lang/crystal/config.el b/modules/lang/crystal/config.el
index b6b047aa1..61618d2bf 100644
--- a/modules/lang/crystal/config.el
+++ b/modules/lang/crystal/config.el
@@ -9,3 +9,7 @@
           (:exec        . "%c %s")
           (:description . "Run Crystal script"))))
 
+
+(def-package! flycheck-crystal
+  :after crystal-mode
+  :config (add-hook 'crystal-mode-hook #'flycheck-mode))
diff --git a/modules/lang/crystal/packages.el b/modules/lang/crystal/packages.el
index e2c61e67d..d0fd6e985 100644
--- a/modules/lang/crystal/packages.el
+++ b/modules/lang/crystal/packages.el
@@ -1,5 +1,6 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; lang/crystal/packages.el
 
-(package! crystal-mode :recipe (:fetcher github :repo "dotmilk/emacs-crystal-mode"))
+(package! crystal-mode)
+(package! flycheck-crystal)