diff --git a/build.nix b/build.nix
index 94525f28c7..f52fdcb9f7 100644
--- a/build.nix
+++ b/build.nix
@@ -57,10 +57,10 @@ in rec {
         inherit evalPackages;
         src = pkgs.haskell-nix.sources."hls-2.2";
       };
-    } // pkgs.lib.optionalAttrs (ghcFromTo "9.0" "9.10.2") {
+    } // pkgs.lib.optionalAttrs (ghcFromTo "9.0" "9.13") {
       "hls" = tool compiler-nix-name "haskell-language-server" {
         inherit evalPackages;
-        src = pkgs.haskell-nix.sources."hls-2.10";
+        src = pkgs.haskell-nix.sources."hls-2.11";
       };
     })
   );
diff --git a/ci.nix b/ci.nix
index e07482ba5e..cbef43e890 100644
--- a/ci.nix
+++ b/ci.nix
@@ -66,10 +66,10 @@
       # from here (so that is no longer cached) also remove ./materialized/ghcXXX.
       # Update supported-ghc-versions.md to reflect any changes made here.
       nixpkgs.lib.optionalAttrs (builtins.elem nixpkgsName ["R2411" "R2505"]) {
-        ghc96 = true;
-        ghc98 = true;
-        ghc910 = true;
-        ghc912 = true;
+        ghc96 = false;
+        ghc98 = false;
+        ghc910 = false;
+        ghc912 = false;
       } // nixpkgs.lib.optionalAttrs (nixpkgsName == "unstable") {
         ghc96 = true;
         ghc98 = true;
diff --git a/flake.lock b/flake.lock
index 13a5a44546..fe8aba0749 100644
--- a/flake.lock
+++ b/flake.lock
@@ -217,6 +217,23 @@
         "type": "github"
       }
     },
+    "hls-2.11": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1747306193,
+        "narHash": "sha256-/MmtpF8+FyQlwfKHqHK05BdsxC9LHV70d/FiMM7pzBM=",
+        "owner": "haskell",
+        "repo": "haskell-language-server",
+        "rev": "46ef4523ea4949f47f6d2752476239f1c6d806fe",
+        "type": "github"
+      },
+      "original": {
+        "owner": "haskell",
+        "ref": "2.11.0.0",
+        "repo": "haskell-language-server",
+        "type": "github"
+      }
+    },
     "hls-2.2": {
       "flake": false,
       "locked": {
@@ -514,6 +531,7 @@
         "hls-1.10": "hls-1.10",
         "hls-2.0": "hls-2.0",
         "hls-2.10": "hls-2.10",
+        "hls-2.11": "hls-2.11",
         "hls-2.2": "hls-2.2",
         "hls-2.3": "hls-2.3",
         "hls-2.4": "hls-2.4",
diff --git a/flake.nix b/flake.nix
index 12f31554a9..a28bd6abbc 100644
--- a/flake.nix
+++ b/flake.nix
@@ -21,6 +21,7 @@
     "hls-2.8" = { url = "github:haskell/haskell-language-server/2.8.0.0"; flake = false; };
     "hls-2.9" = { url = "github:haskell/haskell-language-server/2.9.0.1"; flake = false; };
     "hls-2.10" = { url = "github:haskell/haskell-language-server/2.10.0.0"; flake = false; };
+    "hls-2.11" = { url = "github:haskell/haskell-language-server/2.11.0.0"; flake = false; };
     "hls"     = { url = "github:haskell/haskell-language-server"; flake = false; };
     hackage = {
       url = "github:input-output-hk/hackage.nix";
diff --git a/lib/call-cabal-project-to-nix.nix b/lib/call-cabal-project-to-nix.nix
index 4e7b3a73d6..952ebb1e09 100644
--- a/lib/call-cabal-project-to-nix.nix
+++ b/lib/call-cabal-project-to-nix.nix
@@ -461,6 +461,8 @@ let
                 cabal_file=${ghcSrc}/compiler/${name}.cabal.in
               elif [ -f ${ghcSrc}/libraries/${name}/${name}.cabal.in ]; then
                 cabal_file=${ghcSrc}/libraries/${name}/${name}.cabal.in
+              elif [ -f ${ghcSrc}/utils/haddock/${name}/${name}.cabal ]; then
+                cabal_file=${ghcSrc}/utils/haddock/${name}/${name}.cabal
               fi
               if [[ "$cabal_file" != "" ]]; then
                 fixed_cabal_file=$(mktemp)
diff --git a/overlays/haskell.nix b/overlays/haskell.nix
index 2000f47e83..01a15ecdce 100644
--- a/overlays/haskell.nix
+++ b/overlays/haskell.nix
@@ -1126,6 +1126,9 @@ final: prev: {
             "xhtml"
           ] ++ final.lib.optionals (builtins.compareVersions ghc.version "9.4" > 0) [
             "system-cxx-std-lib"
+          ] ++ final.lib.optionals (builtins.compareVersions ghc.version "9.12" > 0) [
+            "haddock-api"
+            "haddock-library"
           ] ++ final.lib.optionals (
                   !final.stdenv.targetPlatform.isGhcjs
                && !final.stdenv.targetPlatform.isWindows
diff --git a/test/haskell-language-server/cabal.nix b/test/haskell-language-server/cabal.nix
index fb432f4d74..26cc6a4104 100644
--- a/test/haskell-language-server/cabal.nix
+++ b/test/haskell-language-server/cabal.nix
@@ -3,7 +3,7 @@ let
   project = haskell-nix.cabalProject' {
     inherit compiler-nix-name evalPackages;
     name = "haskell-language-server";
-    src = haskell-nix.sources."hls-2.10";
+    src = haskell-nix.sources."hls-2.11";
     configureArgs = "--disable-benchmarks --disable-tests"; # This makes cabalProject' more like the `tool` function
   };
 in recurseIntoAttrs {
@@ -16,5 +16,5 @@ in recurseIntoAttrs {
   meta.disabled =
     stdenv.hostPlatform != stdenv.buildPlatform
     || __compareVersions buildPackages.haskell-nix.compiler.${compiler-nix-name}.version "9.0.1" < 0
-    || __compareVersions buildPackages.haskell-nix.compiler.${compiler-nix-name}.version "9.10.2" >= 0;
+    || __compareVersions buildPackages.haskell-nix.compiler.${compiler-nix-name}.version "9.13" >= 0;
 }