diff --git a/CHANGELOG.md b/CHANGELOG.md
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+### 3.9.6 [2023.08.06]
+* Support building with GHC 9.8.
+* Add `TextShow` instance for `BndrVis` in `TextShow.Language.Haskell.TH`.
+
 ### 3.9.5 [2023.03.05]
 * Allow building with `unix-2.8.*`.
 
diff --git a/src/TextShow/Language/Haskell/TH.hs b/src/TextShow/Language/Haskell/TH.hs
--- a/src/TextShow/Language/Haskell/TH.hs
+++ b/src/TextShow/Language/Haskell/TH.hs
@@ -185,4 +185,8 @@
 #if MIN_VERSION_template_haskell(2,17,0)
   , ''Specificity
 #endif
+
+#if MIN_VERSION_template_haskell(2,21,0)
+  , ''BndrVis
+#endif
   ])
diff --git a/tests/Instances/Language/Haskell/TH.hs b/tests/Instances/Language/Haskell/TH.hs
--- a/tests/Instances/Language/Haskell/TH.hs
+++ b/tests/Instances/Language/Haskell/TH.hs
@@ -37,10 +37,8 @@
 instance Arbitrary NameIs where
     arbitrary = arbitraryBoundedEnum
 
-deriving instance Bounded NameSpace
-deriving instance Enum NameSpace
 instance Arbitrary NameSpace where
-    arbitrary = arbitraryBoundedEnum
+    arbitrary = genericArbitrary
 
 instance Arbitrary Doc where
     arbitrary = text <$> arbitrary
diff --git a/text-show-instances.cabal b/text-show-instances.cabal
--- a/text-show-instances.cabal
+++ b/text-show-instances.cabal
@@ -1,5 +1,5 @@
 name:                text-show-instances
-version:             3.9.5
+version:             3.9.6
 synopsis:            Additional instances for text-show
 description:         @text-show-instances@ is a supplemental library to @text-show@
                      that provides additional @Show@ instances for data types in
@@ -78,9 +78,9 @@
                    , GHC == 8.8.4
                    , GHC == 8.10.7
                    , GHC == 9.0.2
-                   , GHC == 9.2.7
-                   , GHC == 9.4.4
-                   , GHC == 9.6.1
+                   , GHC == 9.2.8
+                   , GHC == 9.4.5
+                   , GHC == 9.6.2
 extra-source-files:  CHANGELOG.md, README.md
 cabal-version:       >=1.10
 
@@ -126,14 +126,14 @@
                        TextShow.System.Console.Terminfo
                        TextShow.System.Posix
   other-modules:       TextShow.Utils
-  build-depends:       aeson                 >= 2.0.3   && < 2.2
-                     , base                  >= 4.9     && < 4.19
+  build-depends:       aeson                 >= 2.0.3   && < 2.3
+                     , base                  >= 4.9     && < 4.20
                      , base-compat           >= 0.10    && < 1
                      , bifunctors            >= 5.2     && < 6
                      , binary                >= 0.8.3   && < 0.9
                      , containers            >= 0.5.7.1 && < 0.7
                      , directory             >= 1.3     && < 1.4
-                     , ghc-boot-th           >= 8.0     && < 9.7
+                     , ghc-boot-th           >= 8.0     && < 9.9
                      , haskeline             >= 0.7.3   && < 0.9
                      , hpc                   >= 0.6     && < 0.7
                      , old-locale            >= 1       && < 1.1
@@ -143,7 +143,7 @@
                      , scientific            >= 0.3.7   && < 0.4
                      , semigroups            >= 0.16.2  && < 1
                      , tagged                >= 0.4.4   && < 1
-                     , template-haskell      >= 2.11    && < 2.21
+                     , template-haskell      >= 2.11    && < 2.22
                      , text                  >= 0.11.1  && < 2.1
                      , text-short            >= 0.1     && < 0.2
                      , text-show             >= 3.4     && < 4
@@ -234,15 +234,15 @@
                        -- Only defines tests if not using Windows
                        Spec.System.Console.TerminfoSpec
                        Spec.System.PosixSpec
-  build-depends:       aeson                 >= 2.0.3   && < 2.2
-                     , base                  >= 4.9     && < 4.19
+  build-depends:       aeson                 >= 2.0.3   && < 2.3
+                     , base                  >= 4.9     && < 4.20
                      , base-compat           >= 0.10    && < 1
                      , bifunctors            >= 5.5.5   && < 6
                      , binary                >= 0.8.3   && < 0.9
                      , containers            >= 0.5.7.1 && < 0.7
                      , directory             >= 1.3     && < 1.4
                      , generic-deriving      >= 1.9     && < 2
-                     , ghc-boot-th           >= 8.0     && < 9.7
+                     , ghc-boot-th           >= 8.0     && < 9.9
                      , ghc-prim
                      , haskeline             >= 0.7.3   && < 0.9
                      , hpc                   >= 0.6     && < 0.7
@@ -255,7 +255,7 @@
                      , random                >= 1.0.1   && < 1.3
                      , tagged                >= 0.4.4   && < 1
                      , scientific            >= 0.3.7   && < 0.4
-                     , template-haskell      >= 2.11    && < 2.21
+                     , template-haskell      >= 2.11    && < 2.22
                      , text-short            >= 0.1     && < 0.2
                      , text-show             >= 3.10    && < 4
                      , text-show-instances