diff --git a/Makefile b/Makefile
index 0ac7ca04c..8ed99e905 100644
--- a/Makefile
+++ b/Makefile
@@ -1430,6 +1430,9 @@ setversion: $(VERSIONSENSITIVEFILES) #$(call def-help,setversion, update version
 gencabal: $(call def-help,gencabal, regenerate cabal files from package.yaml files with stack )
 	$(STACK) build --dry-run --silent --stack-yaml stack-ghc8.2.yaml
 
+gencabal-with-hpack-%:
+	$(STACK) build --with-hpack hpack-$* --dry-run --silent --stack-yaml stack-ghc8.2.yaml
+
 # updatecabal: gencabal $(call def-help,updatecabal, regenerate cabal files and commit )
 # 	@read -p "please review changes then press enter to commit $(shell ls */*.cabal)"
 # 	git commit -m "update cabal files" $(shell ls */*.cabal)
diff --git a/hledger-api/hledger-api.cabal b/hledger-api/hledger-api.cabal
index 6d278ec44..f46e2da80 100644
--- a/hledger-api/hledger-api.cabal
+++ b/hledger-api/hledger-api.cabal
@@ -2,7 +2,7 @@
 --
 -- see: https://github.com/sol/hpack
 --
--- hash: f3ae96bc4a552af6049713498efd77ef61e5ade3bac393e45e47b484335029bd
+-- hash: b04bd71305e57bfa76f593730e7d5aca62144edfb3b858a2b68e78e46c476a89
 
 name:           hledger-api
 version:        1.9.99
@@ -24,7 +24,7 @@ author:         Simon Michael <simon@joyful.com>
 maintainer:     Simon Michael <simon@joyful.com>
 license:        GPL-3
 license-file:   LICENSE
-tested-with:    GHC==7.10.3, GHC==8.0.2, GHC==8.2.1
+tested-with:    GHC==7.10.3, GHC==8.0.2, GHC==8.2.2, GHC==8.4.1
 build-type:     Simple
 cabal-version:  >= 1.10
 
diff --git a/hledger-api/package.yaml b/hledger-api/package.yaml
index 3e170a8cd..7b2066b9c 100644
--- a/hledger-api/package.yaml
+++ b/hledger-api/package.yaml
@@ -19,7 +19,7 @@ github: simonmichael/hledger
 homepage: http://hledger.org
 bug-reports: http://bugs.hledger.org
 stability: alpha
-tested-with: GHC==7.10.3, GHC==8.0.2, GHC==8.2.1
+tested-with: GHC==7.10.3, GHC==8.0.2, GHC==8.2.2, GHC==8.4.1
 
 extra-source-files:
 - CHANGES
diff --git a/hledger-lib/hledger-lib.cabal b/hledger-lib/hledger-lib.cabal
index e6a9cf36e..19f9fb671 100644
--- a/hledger-lib/hledger-lib.cabal
+++ b/hledger-lib/hledger-lib.cabal
@@ -2,7 +2,7 @@
 --
 -- see: https://github.com/sol/hpack
 --
--- hash: e1ae3c73e931da0b4b4da6dd9d6afc942a3874962c493094a4b380b418e4b8be
+-- hash: 6db2d7c1ee228f58b6f1b9a99f1a088e7ef9efb64f00ca810e49e3c0a3a5c0b0
 
 name:           hledger-lib
 version:        1.9.99
@@ -23,7 +23,7 @@ author:         Simon Michael <simon@joyful.com>
 maintainer:     Simon Michael <simon@joyful.com>
 license:        GPL-3
 license-file:   LICENSE
-tested-with:    GHC==7.10.3, GHC==8.0.2, GHC==8.2.1
+tested-with:    GHC==7.10.3, GHC==8.0.2, GHC==8.2.2, GHC==8.4.1
 build-type:     Simple
 cabal-version:  >= 1.10
 
diff --git a/hledger-lib/package.yaml b/hledger-lib/package.yaml
index a0df90f27..fa063c212 100644
--- a/hledger-lib/package.yaml
+++ b/hledger-lib/package.yaml
@@ -18,7 +18,7 @@ github: simonmichael/hledger
 homepage: http://hledger.org
 bug-reports: http://bugs.hledger.org
 stability: stable
-tested-with: GHC==7.10.3, GHC==8.0.2, GHC==8.2.1
+tested-with: GHC==7.10.3, GHC==8.0.2, GHC==8.2.2, GHC==8.4.1
 
 extra-source-files:
 - CHANGES
diff --git a/hledger-ui/hledger-ui.cabal b/hledger-ui/hledger-ui.cabal
index 257248870..1d1a4369d 100644
--- a/hledger-ui/hledger-ui.cabal
+++ b/hledger-ui/hledger-ui.cabal
@@ -2,7 +2,7 @@
 --
 -- see: https://github.com/sol/hpack
 --
--- hash: 8f7cf36397f3ab035f9675d1fa84026577f34d963b9613d32c555b3e02a05a50
+-- hash: 811dd6654c9fd5470772abf3683b9756ce8fb1163e6a9a4b526217552d32b6ad
 
 name:           hledger-ui
 version:        1.9.99
@@ -25,7 +25,7 @@ author:         Simon Michael <simon@joyful.com>
 maintainer:     Simon Michael <simon@joyful.com>
 license:        GPL-3
 license-file:   LICENSE
-tested-with:    GHC==7.10.3, GHC==8.0
+tested-with:    GHC==7.10.3, GHC==8.0.2, GHC==8.2.2
 build-type:     Simple
 cabal-version:  >= 1.10
 
diff --git a/hledger-ui/package.yaml b/hledger-ui/package.yaml
index d8e7a096b..6e3bff4ab 100644
--- a/hledger-ui/package.yaml
+++ b/hledger-ui/package.yaml
@@ -20,7 +20,7 @@ github      : simonmichael/hledger
 homepage    : http://hledger.org
 bug-reports : http://bugs.hledger.org
 stability   : stable
-tested-with : GHC==7.10.3, GHC==8.0
+tested-with : GHC==7.10.3, GHC==8.0.2, GHC==8.2.2
 
 extra-source-files:
   - CHANGES
diff --git a/hledger-web/hledger-web.cabal b/hledger-web/hledger-web.cabal
index cf4881d86..9a381c2b2 100644
--- a/hledger-web/hledger-web.cabal
+++ b/hledger-web/hledger-web.cabal
@@ -2,7 +2,7 @@
 --
 -- see: https://github.com/sol/hpack
 --
--- hash: 9ed266dc999899788c21fd578199b9e538208aab91294e22147f54f06a373373
+-- hash: f0045f00e612c42ed6ed0374542d86395b7a495076744f09bbfbafacecfc853f
 
 name:           hledger-web
 version:        1.9.99
@@ -25,7 +25,7 @@ author:         Simon Michael <simon@joyful.com>
 maintainer:     Simon Michael <simon@joyful.com>
 license:        GPL-3
 license-file:   LICENSE
-tested-with:    GHC==7.10.3, GHC==8.0.2, GHC==8.2.1
+tested-with:    GHC==7.10.3, GHC==8.0.2, GHC==8.2.2, GHC==8.4.1
 build-type:     Simple
 cabal-version:  >= 1.10
 
diff --git a/hledger-web/package.yaml b/hledger-web/package.yaml
index 42f8ce06e..85edc4f72 100644
--- a/hledger-web/package.yaml
+++ b/hledger-web/package.yaml
@@ -20,7 +20,7 @@ github: simonmichael/hledger
 homepage: http://hledger.org
 bug-reports: http://bugs.hledger.org
 stability: stable
-tested-with: GHC==7.10.3, GHC==8.0.2, GHC==8.2.1
+tested-with: GHC==7.10.3, GHC==8.0.2, GHC==8.2.2, GHC==8.4.1
 
 extra-source-files:
 - CHANGES
diff --git a/hledger/hledger.cabal b/hledger/hledger.cabal
index e20b60322..69b945589 100644
--- a/hledger/hledger.cabal
+++ b/hledger/hledger.cabal
@@ -2,7 +2,7 @@
 --
 -- see: https://github.com/sol/hpack
 --
--- hash: 4df8f6b465dfbd9367d1233a03bf6fa420e6d972b3e75b284d0ba8a19a8c4588
+-- hash: 43c8b035b9b2996f5498fe30c459d7851c3d892fb3984a3e076f7fbe16a7240e
 
 name:           hledger
 version:        1.9.99
@@ -25,7 +25,7 @@ author:         Simon Michael <simon@joyful.com>
 maintainer:     Simon Michael <simon@joyful.com>
 license:        GPL-3
 license-file:   LICENSE
-tested-with:    GHC==7.10.3, GHC==8.0.2, GHC==8.2.1
+tested-with:    GHC==7.10.3, GHC==8.0.2, GHC==8.2.2, GHC==8.4.1
 build-type:     Simple
 cabal-version:  >= 1.10
 
diff --git a/hledger/package.yaml b/hledger/package.yaml
index 523ae8157..468d7407a 100644
--- a/hledger/package.yaml
+++ b/hledger/package.yaml
@@ -20,7 +20,7 @@ github: simonmichael/hledger
 homepage: http://hledger.org
 bug-reports: http://bugs.hledger.org
 stability: stable
-tested-with: GHC==7.10.3, GHC==8.0.2, GHC==8.2.1
+tested-with: GHC==7.10.3, GHC==8.0.2, GHC==8.2.2, GHC==8.4.1
 
 extra-source-files:
 - CHANGES