diff --git a/README.md b/README.md
index 0d58087a..797e14f3 100644
--- a/README.md
+++ b/README.md
@@ -359,6 +359,7 @@ use nix
 
 ### Markdown
 
+- [comrak](https://github.com/kivikakk/comrak)
 - [markdownlint](https://github.com/DavidAnson/markdownlint)
 - [mdformat](https://github.com/hukkin/mdformat)
 - [mdl](https://github.com/markdownlint/markdownlint/)
diff --git a/modules/hooks.nix b/modules/hooks.nix
index 6d0099da..8b6b58bf 100644
--- a/modules/hooks.nix
+++ b/modules/hooks.nix
@@ -2464,6 +2464,13 @@ in
           entry = "${hooks.commitizen.package}/bin/cz check --allow-abort --commit-msg-file";
           stages = [ "commit-msg" ];
         };
+      comrak = {
+        name = "comrak";
+        description = "A 100% CommonMark-compatible GitHub Flavored Markdown formatter";
+        package = tools.comrak;
+        entry = "${lib.getExe hooks.comrak.package} --inplace";
+        types = [ "markdown" ];
+      };
       conform = {
         name = "conform enforce";
         description = "Policy enforcement for commits.";
diff --git a/nix/tools.nix b/nix/tools.nix
index 61837a75..66619a36 100644
--- a/nix/tools.nix
+++ b/nix/tools.nix
@@ -17,6 +17,7 @@
 , cljfmt
 , cmake-format
 , commitizen
+, comrak
 , conform
 , convco
 , crystal
@@ -121,6 +122,7 @@ in
     clippy
     cljfmt
     cmake-format
+    comrak
     conform
     convco
     crystal