diff --git a/modules/lang/perl/config.el b/modules/lang/perl/config.el
index 9301646b7..c2ecef283 100644
--- a/modules/lang/perl/config.el
+++ b/modules/lang/perl/config.el
@@ -2,9 +2,16 @@
 
 ;; There's also `perl-mode' for perl < 6, which is already set up.
 
-(use-package! perl6-detect)
+;; REVIEW Until Raku/raku-mode#33 is merged.
+(use-package! raku-mode
+  :interpreter "raku"
+  :mode "\\.nqp\\'"
+  :mode "\\.raku\\(mod\\|test\\)?"
+  :init (defalias 'perl6-mode #'raku-mode)
+  :config
+  (set-repl-handler! 'raku-mode #'run-raku))
 
 
-(use-package! flycheck-perl6
+(use-package! flycheck-raku
   :when (featurep! :checkers syntax)
-  :after perl6-mode)
+  :after raku-mode)
diff --git a/modules/lang/perl/packages.el b/modules/lang/perl/packages.el
index 7c7adfd1d..39c69311c 100644
--- a/modules/lang/perl/packages.el
+++ b/modules/lang/perl/packages.el
@@ -1,7 +1,9 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; lang/perl/packages.el
 
-(package! perl6-mode :pin "88de065795")
+(package! raku-mode :pin "44529c097f98723067f852c6496d91257978c1e2")
 
 (when (featurep! :checkers syntax)
-  (package! flycheck-perl6 :pin "b804702305"))
+  (package! flycheck-raku
+    :recipe (:host github :repo "widefox/flycheck-raku")
+    :pin "046f35abe0c61967157e151126e4dd7ec5d1c004"))