diff --git a/CI.hs b/CI.hs
index 87de0805..0c9d8aa0 100755
--- a/CI.hs
+++ b/CI.hs
@@ -48,6 +48,7 @@ data GhcFlavor
   | GhcMaster String
   | Ghc9121
   | Ghc9101
+  | Ghc985
   | Ghc984
   | Ghc983
   | Ghc982
@@ -106,6 +107,7 @@ ghcFlavorOpt :: GhcFlavor -> String
 ghcFlavorOpt = \case
   Ghc9121 -> "--ghc-flavor ghc-9.12.1"
   Ghc9101 -> "--ghc-flavor ghc-9.10.1"
+  Ghc985 -> "--ghc-flavor ghc-9.8.5"
   Ghc984 -> "--ghc-flavor ghc-9.8.4"
   Ghc983 -> "--ghc-flavor ghc-9.8.3"
   Ghc982 -> "--ghc-flavor ghc-9.8.2"
@@ -171,6 +173,7 @@ genVersionStr flavor suffix =
       GhcMaster _ -> "0"
       Ghc9121 -> "9.12.1"
       Ghc9101 -> "9.10.1"
+      Ghc985 -> "9.8.5"
       Ghc984 -> "9.8.4"
       Ghc983 -> "9.8.3"
       Ghc982 -> "9.8.2"
@@ -240,6 +243,7 @@ parseOptions =
     readFlavor = Opts.eitherReader $ \case
       "ghc-9.12.1" -> Right Ghc9121
       "ghc-9.10.1" -> Right Ghc9101
+      "ghc-9.8.5" -> Right Ghc985
       "ghc-9.8.4" -> Right Ghc984
       "ghc-9.8.3" -> Right Ghc983
       "ghc-9.8.2" -> Right Ghc982
@@ -510,6 +514,7 @@ buildDists ghcFlavor noGhcCheckout noBuilds versionSuffix = do
     branch = \case
       Ghc9121 -> "ghc-9.12.1-release"
       Ghc9101 -> "ghc-9.10.1-release"
+      Ghc985 -> "ghc-9.8"
       Ghc984 -> "ghc-9.8.4-release"
       Ghc983 -> "ghc-9.8.3-release"
       Ghc982 -> "ghc-9.8.2-release"
diff --git a/examples/ghc-lib-test-utils/src/TestUtils.hs b/examples/ghc-lib-test-utils/src/TestUtils.hs
index 1ca8d5bf..44da0b74 100644
--- a/examples/ghc-lib-test-utils/src/TestUtils.hs
+++ b/examples/ghc-lib-test-utils/src/TestUtils.hs
@@ -59,6 +59,7 @@ data GhcVersion
   | Ghc982
   | Ghc983
   | Ghc984
+  | Ghc985
   | Ghc9101
   | Ghc9121
   | GhcMaster
@@ -74,6 +75,7 @@ showGhcVersion :: GhcVersion -> String
 showGhcVersion = \case
   Ghc9121 -> "ghc-9.12.1"
   Ghc9101 -> "ghc-9.10.1"
+  Ghc985 -> "ghc-9.8.5"
   Ghc984 -> "ghc-9.8.4"
   Ghc983 -> "ghc-9.8.3"
   Ghc982 -> "ghc-9.8.2"
@@ -132,6 +134,7 @@ readFlavor =
     -- ghc-9.10
     "ghc-9.10.1" -> Just Ghc9101
     -- ghc-9.8
+    "ghc-9.8.5" -> Just Ghc985
     "ghc-9.8.4" -> Just Ghc984
     "ghc-9.8.3" -> Just Ghc983
     "ghc-9.8.2" -> Just Ghc982
diff --git a/ghc-lib-gen/src/Ghclibgen.hs b/ghc-lib-gen/src/Ghclibgen.hs
index 8876ab0c..a3ff90a6 100644
--- a/ghc-lib-gen/src/Ghclibgen.hs
+++ b/ghc-lib-gen/src/Ghclibgen.hs
@@ -1234,6 +1234,7 @@ baseBounds = \case
   -- base-4.19.2.0
   Ghc983 -> "base >= 4.17 && < 4.20" -- [ghc-9.4.1, ghc-9.10.1)
   Ghc984 -> "base >= 4.17 && < 4.20" -- [ghc-9.4.1, ghc-9.10.1)
+  Ghc985 -> "base >= 4.17 && < 4.20" -- [ghc-9.4.1, ghc-9.10.1)
   -- base-4.20.0.0
   Ghc9101 -> "base >= 4.18 && < 4.21" -- [ghc-9.6.1, ghc-9.12.1)
   -- base-4.21.0.0
diff --git a/ghc-lib-gen/src/GhclibgenFlavor.hs b/ghc-lib-gen/src/GhclibgenFlavor.hs
index 25e46f15..6ca3d652 100644
--- a/ghc-lib-gen/src/GhclibgenFlavor.hs
+++ b/ghc-lib-gen/src/GhclibgenFlavor.hs
@@ -51,6 +51,7 @@ data GhcFlavor
   | Ghc982
   | Ghc983
   | Ghc984
+  | Ghc985
   | Ghc9101
   | Ghc9121
   | GhcMaster
diff --git a/ghc-lib-gen/src/GhclibgenOpts.hs b/ghc-lib-gen/src/GhclibgenOpts.hs
index de52b889..ff6ab811 100644
--- a/ghc-lib-gen/src/GhclibgenOpts.hs
+++ b/ghc-lib-gen/src/GhclibgenOpts.hs
@@ -98,6 +98,7 @@ readFlavor = eitherReader $ \case
   -- ghc-9.10
   "ghc-9.10.1" -> Right Ghc9101
   -- ghc-9.8
+  "ghc-9.8.5" -> Right Ghc985
   "ghc-9.8.4" -> Right Ghc984
   "ghc-9.8.3" -> Right Ghc983
   "ghc-9.8.2" -> Right Ghc982