diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 4450953f9fcc..6dce97517378 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -897,8 +897,24 @@ with haskellLib;
   }) super.xml-picklers;
 
   # 2025-08-03: Too strict bounds on open-browser, data-default and containers
-  # https://github.com/lierdakil/pandoc-crossref/issues/478
-  pandoc-crossref = doJailbreak super.pandoc-crossref;
+  # https://github.com/lierdakil/pandoc-crossref/issues/478 krank:ignore-line
+  pandoc-crossref = lib.pipe super.pandoc-crossref [
+    (warnAfterVersion "0.3.21")
+    doJailbreak
+
+    # We are still using pandoc == 3.7.*
+    (appendPatch (
+      lib.warnIf (lib.versionAtLeast self.pandoc.version "3.8")
+        "haskellPackages.pandoc-crossref: remove revert of pandoc-3.8 patch"
+        pkgs.fetchpatch
+        {
+          name = "pandoc-crossref-revert-pandoc-3.8-highlight.patch";
+          url = "https://github.com/lierdakil/pandoc-crossref/commit/b0c35a59d5a802f6525407bfeb31699ffd0b4671.patch";
+          hash = "sha256-MIITL9Qr3+1fKf1sTwHzXPcYTt3YC+vr9CpMgqsBXlc=";
+          revert = true;
+        }
+    ))
+  ];
 
   # Too strict upper bound on data-default-class (< 0.2)
   # https://github.com/stackbuilders/dotenv-hs/issues/203
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
index d8ee002062d0..338b2bf16779 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
@@ -4563,7 +4563,6 @@ broken-packages:
   - pan-os-syslog # failure in job https://hydra.nixos.org/build/233244422 at 2023-09-02
   - pandoc-citeproc # failure in job https://hydra.nixos.org/build/233198462 at 2023-09-02
   - pandoc-columns # failure in job https://hydra.nixos.org/build/233234538 at 2023-09-02
-  - pandoc-crossref # failure in job https://hydra.nixos.org/build/307611190 at 2025-09-19
   - pandoc-csv2table # failure in job https://hydra.nixos.org/build/233229925 at 2023-09-02
   - pandoc-dhall-decoder # failure in job https://hydra.nixos.org/build/307611186 at 2025-09-19
   - pandoc-emphasize-code # failure in job https://hydra.nixos.org/build/252733347 at 2024-03-16
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index f70b7655702b..a142c3b0fdb5 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -499332,9 +499332,7 @@ self: {
       doHaddock = false;
       description = "Pandoc filter for cross-references";
       license = lib.licenses.gpl2Only;
-      hydraPlatforms = lib.platforms.none;
       mainProgram = "pandoc-crossref";
-      broken = true;
     }
   ) { };