diff --git a/modules/base/emacs/default.nix b/modules/base/emacs/default.nix
index baf5a05b..862565d3 100644
--- a/modules/base/emacs/default.nix
+++ b/modules/base/emacs/default.nix
@@ -19,7 +19,9 @@
         package = pkgs.emacsPgtkGcc;
         alwaysEnsure = true;
         # mu4e is included in the mu package and should be used from there
-        extraEmacsPackages = epkgs: lib.optional config.chvp.graphical.mail.enable pkgs.mu;
+        extraEmacsPackages = epkgs:
+          (lib.optional config.chvp.graphical.mail.enable pkgs.mu) ++
+          (lib.optional config.chvp.development.enable pkgs.gforth);
       };
     };
   };
diff --git a/modules/development/default.nix b/modules/development/default.nix
index 061d6bfe..443c1828 100644
--- a/modules/development/default.nix
+++ b/modules/development/default.nix
@@ -40,6 +40,14 @@
               "SPC" '(:keymap lsp-command-map)
               )
             )
+
+          ;; Forth syntax support
+          (use-package gforth
+            ;; Included in the gforth package, see emacs/default.nix
+            :ensure nil
+            :mode ("\\.fs\\'" . forth-mode)
+            :mode ("\\.fb\\'" . forth-block-mode)
+          )
           
           ;; Markdown syntax support
           (use-package markdown-mode
diff --git a/modules/graphical/mail/default.nix b/modules/graphical/mail/default.nix
index 2efdb0fb..a6f4ef68 100644
--- a/modules/graphical/mail/default.nix
+++ b/modules/graphical/mail/default.nix
@@ -111,7 +111,7 @@ in
           [
             ''
               (use-package mu4e
-                ;; Use mu4e included in the mu package, see emacs.nix
+                ;; Use mu4e included in the mu package, see emacs/default.nix
                 :ensure nil
                 :commands (mu4e mu4e-update-index)
                 :after (selectrum)