diff --git a/ChangeLog.md b/ChangeLog.md
new file mode 100644
--- /dev/null
+++ b/ChangeLog.md
@@ -0,0 +1,25 @@
+# Revision history for th-extras
+
+## 0.0.0.6 - 2022-01-04
+
+* Fix GHC 8.0 build
+
+* Support GHC 9.0 and 9.2
+
+## 0.0.0.5 - 2019-05-13
+
+* Improve support for various corner cases
+
+* Ensure works with a range of GHCs.
+
+## 0.0.0.4 - 2016-05-10
+
+* Support GHC 8.0
+
+## 0.0.0.2 - 2012-01-13
+
+* Added some more utility functions
+
+## 0.0.0.1 - 2011-11-15
+
+* Initial release
diff --git a/ReadMe.md b/ReadMe.md
new file mode 100644
--- /dev/null
+++ b/ReadMe.md
@@ -0,0 +1,10 @@
+# th-extras
+[![Haskell](https://img.shields.io/badge/language-Haskell-orange.svg)](https://haskell.org) [![Hackage](https://img.shields.io/hackage/v/th-extras.svg)](https://hackage.haskell.org/package/th-extras) [![Hackage CI](https://matrix.hackage.haskell.org/api/v2/packages/th-extras/badge)](https://matrix.hackage.haskell.org/#/package/th-extras) [![Github CI](https://github.com/mokus0/th-extras/workflows/github-action/badge.svg)](https://github.com/mokus0/th-extras/actions) [![BSD3 License](https://img.shields.io/badge/license-BSD3-blue.svg)](https://github.com/mokus0/th-extras/blob/master/LICENSE)
+
+A grab bag of useful functions for use with Template Haskell.
+
+This is basically the place I put all my ugly CPP hacks to support the
+ever-changing interface of the template haskell system by providing high-level
+operations and making sure they work on as many versions of Template Haskell as
+I can.
+
diff --git a/readme.md b/readme.md
deleted file mode 100644
--- a/readme.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# th-extras
-[![Haskell](https://img.shields.io/badge/language-Haskell-orange.svg)](https://haskell.org) [![Hackage](https://img.shields.io/hackage/v/th-extras.svg)](https://hackage.haskell.org/package/th-extras) [![Hackage CI](https://matrix.hackage.haskell.org/api/v2/packages/th-extras/badge)](https://matrix.hackage.haskell.org/#/package/th-extras) [![Github CI](https://github.com/mokus0/th-extras/workflows/github-action/badge.svg)](https://github.com/mokus0/th-extras/actions) [![BSD3 License](https://img.shields.io/badge/license-BSD3-blue.svg)](https://github.com/mokus0/th-extras/blob/master/LICENSE)
-
-A grab bag of useful functions for use with Template Haskell.
-
-This is basically the place I put all my ugly CPP hacks to support the
-ever-changing interface of the template haskell system by providing high-level
-operations and making sure they work on as many versions of Template Haskell as
-I can.
-
diff --git a/src/Language/Haskell/TH/Extras.hs b/src/Language/Haskell/TH/Extras.hs
--- a/src/Language/Haskell/TH/Extras.hs
+++ b/src/Language/Haskell/TH/Extras.hs
@@ -57,7 +57,11 @@
 namesBoundInPat :: Pat -> [Name]
 namesBoundInPat (VarP name)             = [name]
 namesBoundInPat (TupP pats)             = pats >>= namesBoundInPat
+#if MIN_VERSION_template_haskell(2,18,0)
+namesBoundInPat (ConP _ _ pats)         = pats >>= namesBoundInPat
+#else
 namesBoundInPat (ConP _ pats)           = pats >>= namesBoundInPat
+#endif
 namesBoundInPat (InfixP p1 _ p2)        = namesBoundInPat p1 ++ namesBoundInPat p2
 namesBoundInPat (TildeP pat)            = namesBoundInPat pat
 namesBoundInPat (AsP name pat)          = name : namesBoundInPat pat
@@ -195,8 +199,10 @@
       InfixT t1 x t2 -> InfixT (subst bs t1) x (subst bs t2)
       ParensT t -> ParensT (subst bs t)
       UInfixT t1 x t2 -> UInfixT (subst bs t1) x (subst bs t2)
-      UnboxedSumT k -> UnboxedSumT k
       WildCardT -> WildCardT
+#endif
+#if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ >= 802
+      UnboxedSumT k -> UnboxedSumT k
 #endif
 #if defined (__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ >= 710
       EqualityT -> EqualityT
diff --git a/th-extras.cabal b/th-extras.cabal
--- a/th-extras.cabal
+++ b/th-extras.cabal
@@ -1,5 +1,5 @@
 name:                   th-extras
-version:                0.0.0.5
+version:                0.0.0.6
 stability:              experimental
 
 cabal-version:          >= 1.10
@@ -22,23 +22,19 @@
 tested-with:            GHC == 8.2.2, GHC == 8.4.4, GHC == 8.6.5,
                         GHC == 8.8.4, GHC == 8.10.2, GHC == 9.0.1
 
-extra-source-files:     readme.md
+extra-source-files:     ReadMe.md
+                      , ChangeLog.md
 
 source-repository head
   type:                 git
   location:             https://github.com/mokus0/th-extras.git
 
-flag base4
-  default:              True
-
 Library
   hs-source-dirs:       src
   exposed-modules:      Language.Haskell.TH.Extras
-  build-depends:        base >= 3 && < 5,
-                        containers,
-                        template-haskell < 2.18,
-                        th-abstraction >= 0.4 && < 0.5
+  build-depends:        base >= 4.9 && < 5
+                      , containers
+                      , template-haskell < 2.19
+                      , th-abstraction >= 0.4 && < 0.5
+                      , syb
   default-language:     Haskell2010
-
-  if flag(base4)
-    build-depends:      base >= 4, syb