diff --git a/modules/lang/fortran/config.el b/modules/lang/fortran/config.el
index 1a1f420b7..15b2400ae 100644
--- a/modules/lang/fortran/config.el
+++ b/modules/lang/fortran/config.el
@@ -35,6 +35,9 @@
         :desc "build" "b" #'+fortran/build
         :desc "run"   "r" #'+fortran/run)
 
+  (when (executable-find "fprettify")
+    (set-formatter! 'fprettify '("fprettify" "-") :modes '(f90-mode fortran-mode)))
+
   (when (modulep! +intel)
     (map! :map f90-mode-map
           :localleader
diff --git a/modules/lang/fortran/doctor.el b/modules/lang/fortran/doctor.el
index 27a12c0c9..976c36a45 100644
--- a/modules/lang/fortran/doctor.el
+++ b/modules/lang/fortran/doctor.el
@@ -18,6 +18,8 @@
 
 (when (modulep! +lsp)
   (unless (executable-find "fortls")
-    (warn! "Couldn't find fortls."))
+    (warn! "Couldn't find fortls. Language features will be disabled.")))
+
+(when (modulep! :editor format)
   (unless (executable-find "fprettify")
-    (warn! "Couldn't find fprettify.")))
+    (warn! "Couldn't find fprettify. Formatting will be disabled.")))