diff --git a/modules/lang/ess/config.el b/modules/lang/ess/config.el
index 5665589fd..8d3236fae 100644
--- a/modules/lang/ess/config.el
+++ b/modules/lang/ess/config.el
@@ -89,3 +89,18 @@
         "m" #'ess-noweb-mark-chunk
         "p" #'ess-noweb-previous-chunk
         "n" #'ess-noweb-next-chunk))
+
+
+(use-package! stan-mode
+  :when (featurep! +stan)
+  :hook (stan-mode . stan-mode-setup)
+  :hook (stan-mode . eldoc-stan-setup)
+  :init
+  (use-package! company-stan
+    :when (featurep! :completion company)
+    :hook (stan-mode . company-stan-setup))
+
+  (use-package! flycheck-stan
+    :when (featurep! :checkers syntax)
+    :hook (stan-mode . flycheck-stan-stanc2-setup)
+    :hook (stan-mode . flycheck-stan-stanc3-setup)))
diff --git a/modules/lang/ess/packages.el b/modules/lang/ess/packages.el
index 34dd2577e..f0eee29ad 100644
--- a/modules/lang/ess/packages.el
+++ b/modules/lang/ess/packages.el
@@ -5,3 +5,11 @@
 (package! ess-R-data-view :pin "d6e98d3ae1e2a2ea39a56eebcdb73e99d29562e9")
 (package! polymode :pin "54888d6c15249503e1a66da7bd7761a9eda9b075")
 (package! poly-R :pin "c42ff3a4d0da96ccb7f826dca5c6b2eb558a2ab5")
+
+(when (featurep! +stan)
+  (package! stan-mode :pin "9bb858b9f1314dcf1a5df23e39f9af522098276b")
+  (package! eldoc-stan :pin "9bb858b9f1314dcf1a5df23e39f9af522098276b")
+  (when (featurep! :completion company)
+    (package! company-stan :pin "9bb858b9f1314dcf1a5df23e39f9af522098276b"))
+  (when (featurep! :checkers syntax)
+    (package! flycheck-stan :pin "9bb858b9f1314dcf1a5df23e39f9af522098276b")))