diff --git a/bazel_tools/ghc-lib/version.bzl b/bazel_tools/ghc-lib/version.bzl
index c8c44672ed3..81758b4635a 100644
--- a/bazel_tools/ghc-lib/version.bzl
+++ b/bazel_tools/ghc-lib/version.bzl
@@ -9,7 +9,7 @@ GHC_LIB_PATCHES = [
 ]
 
 GHC_REPO_URL = "https://github.com/digital-asset/ghc"
-GHC_REV = "bc8ba7ed6a1ec23f516971b2f19195d7025a021d"
+GHC_REV = "81f87342aa67307891ba47e7425ac62d0de05917"
 GHC_PATCHES = [
 ]
 
diff --git a/compiler/damlc/tests/daml-test-files/UniqueEnum.daml b/compiler/damlc/tests/daml-test-files/UniqueEnum.daml
new file mode 100644
index 00000000000..97760af24dd
--- /dev/null
+++ b/compiler/damlc/tests/daml-test-files/UniqueEnum.daml
@@ -0,0 +1,12 @@
+-- Copyright (c) 2024, Digital Asset (Switzerland) GmbH and/or its affiliates.
+-- All rights reserved.
+
+-- This tests that single-constructor enumerations work properly when deriving
+-- all derivable typeclasses.
+-- Regression test for https://github.com/digital-asset/daml/issues/18504
+
+module UniqueEnum where
+
+data MyEnum
+  = MyEnum
+  deriving (Eq, Ord, Enum, Bounded, Show)