diff --git a/CHANGELOG.md b/CHANGELOG.md
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# list-tries-0.6.7 (2020-05-12)
+* Updated dependencies and code for GHC 8.8 and 8.10.
+
 # list-tries-0.6.6 (2018-11-20)
 * Updated dependencies and code for GHC 8.6.1, thanks as usual to Mikhail
   Glushenkov.
diff --git a/README.md b/README.md
--- a/README.md
+++ b/README.md
@@ -1,3 +1,3 @@
-# list-tries [![Hackage version](https://img.shields.io/hackage/v/list-tries.svg?label=Hackage)](https://hackage.haskell.org/package/list-tries) [![Build Status](https://secure.travis-ci.org/Deewiant/list-tries.svg?branch=master)](http://travis-ci.org/Deewiant/list-tries)
+# list-tries [![Hackage version](https://img.shields.io/hackage/v/list-tries.svg?label=Hackage)](https://hackage.haskell.org/package/list-tries) [![Build Status](https://secure.travis-ci.org/arybczak/list-tries.svg?branch=master)](http://travis-ci.org/arybczak/list-tries)
 
 Tries and Patricia tries: finite sets and maps for list keys.
diff --git a/list-tries.cabal b/list-tries.cabal
--- a/list-tries.cabal
+++ b/list-tries.cabal
@@ -1,7 +1,7 @@
-Cabal-Version: >= 1.9.2
+Cabal-Version: >= 1.10
 
 Name:        list-tries
-Version:     0.6.6
+Version:     0.6.7
 Homepage:    http://iki.fi/matti.niemenmaa/list-tries/
 Synopsis:    Tries and Patricia tries: finite sets and maps for list keys
 Category:    Data, Data Structures
@@ -23,13 +23,13 @@
    Data.IntMap respectively.
 
 Author:       Matti Niemenmaa
-Maintainer:   Matti Niemenmaa <matti.niemenmaa+list-tries@iki.fi>
+Maintainer:   Andrzej Rybczak <andrzej@rybczak.net>
 License:      BSD3
 License-File: LICENSE.txt
 Tested-With:  GHC == 7.0.4, GHC == 7.2.2, GHC == 7.4.2,
               GHC == 7.6.3, GHC == 7.8.4, GHC == 7.10.3,
               GHC == 8.0.2, GHC == 8.2.2, GHC == 8.4.4,
-              GHC == 8.6.2
+              GHC == 8.6.3, GHC == 8.8.3, GHC == 8.10.1
 
 Build-Type: Simple
 
@@ -43,10 +43,10 @@
 
 source-repository head
   type: git
-  location: https://github.com/Deewiant/list-tries
+  location: https://github.com/arybczak/list-tries
 
 Library
-   Build-Depends: base       >= 4.3  && < 4.13
+   Build-Depends: base       >= 4.3  && < 5
                 , containers >= 0.4  && < 0.7
                 , dlist      >= 0.4  && < 0.9
                 , binary     >= 0.5  && < 0.11
@@ -79,6 +79,8 @@
 
    Include-Dirs: headers
 
+   Default-language: Haskell2010
+
    Other-Extensions: CPP
                      FlexibleContexts
                      FlexibleInstances
@@ -95,9 +97,9 @@
    main-is: Main.hs
 
    Build-Depends: list-tries
-                , base                       >= 4.3 && < 4.13
+                , base                       >= 4.3 && < 5
                 , binary                     >= 0.5 && < 0.11
-                , template-haskell           >= 2.3 && < 2.15
+                , template-haskell           >= 2.3 && < 2.17
                 , HUnit                      >= 1.2 && < 1.7
                 , QuickCheck                 >= 2.1 && < 3
                 , test-framework             >= 0.2 && < 1
@@ -110,6 +112,8 @@
                   Tests.Properties
                   Tests.Strictness
                   Tests.TH
+
+   Default-language: Haskell2010
 
    Other-Extensions: CPP
                      EmptyDataDecls
diff --git a/tests/Tests/TH.hs b/tests/Tests/TH.hs
--- a/tests/Tests/TH.hs
+++ b/tests/Tests/TH.hs
@@ -1,6 +1,6 @@
 -- File created: 2009-01-09 13:57:13
 
-{-# LANGUAGE EmptyDataDecls, PatternGuards, TemplateHaskell #-}
+{-# LANGUAGE CPP, EmptyDataDecls, PatternGuards, TemplateHaskell #-}
 
 module Tests.TH
    ( Module(..)
@@ -115,7 +115,11 @@
                                            (expandE m e)
                                            (fmap (expandE m) me2)
    expandE m (LamE pats e)        = LamE pats (expandE m e)
+#if MIN_VERSION_template_haskell(2,16,0)
+   expandE m (TupE es)            = TupE (map (fmap $ expandE m) es)
+#else
    expandE m (TupE es)            = TupE (map (expandE m) es)
+#endif
    expandE m (CondE e1 e2 e3)     = CondE (expandE m e1)
                                           (expandE m e2)
                                           (expandE m e3)