diff --git a/hledger-lib/Hledger/Data/Dates.hs b/hledger-lib/Hledger/Data/Dates.hs
index f78d50460..0925d12c1 100644
--- a/hledger-lib/Hledger/Data/Dates.hs
+++ b/hledger-lib/Hledger/Data/Dates.hs
@@ -74,9 +74,9 @@ module Hledger.Data.Dates (
 where
 
 import Prelude ()
-import "base-compat" Prelude.Compat
+import "base-compat-batteries" Prelude.Compat
 import Control.Monad
-import "base-compat" Data.List.Compat
+import "base-compat-batteries" Data.List.Compat
 import Data.Default
 import Data.Maybe
 import Data.Text (Text)
diff --git a/hledger-lib/Hledger/Data/StringFormat.hs b/hledger-lib/Hledger/Data/StringFormat.hs
index 01a618aea..daf9d57af 100644
--- a/hledger-lib/Hledger/Data/StringFormat.hs
+++ b/hledger-lib/Hledger/Data/StringFormat.hs
@@ -14,7 +14,7 @@ module Hledger.Data.StringFormat (
         ) where
 
 import Prelude ()
-import "base-compat" Prelude.Compat
+import "base-compat-batteries" Prelude.Compat
 import Numeric
 import Data.Char (isPrint)
 import Data.Maybe
diff --git a/hledger-lib/Hledger/Read/Common.hs b/hledger-lib/Hledger/Read/Common.hs
index 2355365cf..427a1ec54 100644
--- a/hledger-lib/Hledger/Read/Common.hs
+++ b/hledger-lib/Hledger/Read/Common.hs
@@ -95,8 +95,8 @@ module Hledger.Read.Common (
 where
 --- * imports
 import Prelude ()
-import "base-compat" Prelude.Compat hiding (readFile)
-import "base-compat" Control.Monad.Compat
+import "base-compat-batteries" Prelude.Compat hiding (readFile)
+import "base-compat-batteries" Control.Monad.Compat
 import Control.Monad.Except (ExceptT(..), runExceptT, throwError) --, catchError)
 import Control.Monad.State.Strict
 import Data.Char
@@ -104,7 +104,7 @@ import Data.Data
 import Data.Decimal (DecimalRaw (Decimal), Decimal)
 import Data.Default
 import Data.Functor.Identity
-import "base-compat" Data.List.Compat
+import "base-compat-batteries" Data.List.Compat
 import Data.List.NonEmpty (NonEmpty(..))
 import Data.Maybe
 import qualified Data.Map as M
diff --git a/hledger-lib/Hledger/Read/CsvReader.hs b/hledger-lib/Hledger/Read/CsvReader.hs
index 80e0a8cac..8d301f585 100644
--- a/hledger-lib/Hledger/Read/CsvReader.hs
+++ b/hledger-lib/Hledger/Read/CsvReader.hs
@@ -29,14 +29,14 @@ module Hledger.Read.CsvReader (
 )
 where
 import Prelude ()
-import "base-compat" Prelude.Compat hiding (getContents)
+import "base-compat-batteries" Prelude.Compat hiding (getContents)
 import Control.Exception hiding (try)
 import Control.Monad
 import Control.Monad.Except
 import Control.Monad.State.Strict (StateT, get, modify', evalStateT)
 -- import Test.HUnit
 import Data.Char (toLower, isDigit, isSpace)
-import "base-compat" Data.List.Compat
+import "base-compat-batteries" Data.List.Compat
 import Data.List.NonEmpty (fromList)
 import Data.Maybe
 import Data.Ord
diff --git a/hledger-lib/Hledger/Read/JournalReader.hs b/hledger-lib/Hledger/Read/JournalReader.hs
index c1695f073..a357761b7 100644
--- a/hledger-lib/Hledger/Read/JournalReader.hs
+++ b/hledger-lib/Hledger/Read/JournalReader.hs
@@ -72,7 +72,7 @@ module Hledger.Read.JournalReader (
 where
 --- * imports
 import Prelude ()
-import "base-compat" Prelude.Compat hiding (readFile)
+import "base-compat-batteries" Prelude.Compat hiding (readFile)
 import qualified Control.Exception as C
 import Control.Monad
 import Control.Monad.Except (ExceptT(..), runExceptT, throwError)
diff --git a/hledger-lib/Hledger/Read/TimeclockReader.hs b/hledger-lib/Hledger/Read/TimeclockReader.hs
index d3c837dd5..05b259c0b 100644
--- a/hledger-lib/Hledger/Read/TimeclockReader.hs
+++ b/hledger-lib/Hledger/Read/TimeclockReader.hs
@@ -52,7 +52,7 @@ module Hledger.Read.TimeclockReader (
 )
 where
 import           Prelude ()
-import "base-compat" Prelude.Compat
+import "base-compat-batteries" Prelude.Compat
 import           Control.Monad
 import           Control.Monad.Except (ExceptT)
 import           Control.Monad.State.Strict
diff --git a/hledger-lib/Hledger/Read/TimedotReader.hs b/hledger-lib/Hledger/Read/TimedotReader.hs
index ea20889b8..656384ffc 100644
--- a/hledger-lib/Hledger/Read/TimedotReader.hs
+++ b/hledger-lib/Hledger/Read/TimedotReader.hs
@@ -35,7 +35,7 @@ module Hledger.Read.TimedotReader (
 )
 where
 import Prelude ()
-import "base-compat" Prelude.Compat
+import "base-compat-batteries" Prelude.Compat
 import Control.Monad
 import Control.Monad.Except (ExceptT)
 import Control.Monad.State.Strict
diff --git a/hledger-lib/hledger-lib.cabal b/hledger-lib/hledger-lib.cabal
index 49b555abd..516d130c4 100644
--- a/hledger-lib/hledger-lib.cabal
+++ b/hledger-lib/hledger-lib.cabal
@@ -2,7 +2,7 @@
 --
 -- see: https://github.com/sol/hpack
 --
--- hash: fb6ec68fcff82e6a14e5bb15f7cb05f950ce044a69af3c3941a7134701e911b8
+-- hash: 0e72f3eaeca291a51788326f145fe2e50f9febc84f8fb6d2e039f0bdd5b3f667
 
 name:           hledger-lib
 version:        1.9.99
@@ -105,7 +105,7 @@ library
     , ansi-terminal >=0.6.2.3
     , array
     , base >=4.8 && <4.12
-    , base-compat >=0.10.1 && <0.11
+    , base-compat-batteries >=0.10.1 && <0.11
     , blaze-markup >=0.5.1
     , bytestring
     , cmdargs >=0.10
@@ -200,7 +200,7 @@ test-suite doctests
     , ansi-terminal >=0.6.2.3
     , array
     , base >=4.8 && <4.12
-    , base-compat >=0.10.1 && <0.11
+    , base-compat-batteries >=0.10.1 && <0.11
     , blaze-markup >=0.5.1
     , bytestring
     , cmdargs >=0.10
@@ -295,7 +295,7 @@ test-suite easytests
     , ansi-terminal >=0.6.2.3
     , array
     , base >=4.8 && <4.12
-    , base-compat >=0.10.1 && <0.11
+    , base-compat-batteries >=0.10.1 && <0.11
     , blaze-markup >=0.5.1
     , bytestring
     , cmdargs >=0.10
@@ -391,7 +391,7 @@ test-suite hunittests
     , ansi-terminal >=0.6.2.3
     , array
     , base >=4.8 && <4.12
-    , base-compat >=0.10.1 && <0.11
+    , base-compat-batteries >=0.10.1 && <0.11
     , blaze-markup >=0.5.1
     , bytestring
     , cmdargs >=0.10
diff --git a/hledger-lib/package.yaml b/hledger-lib/package.yaml
index 5854e45ab..896b46a83 100644
--- a/hledger-lib/package.yaml
+++ b/hledger-lib/package.yaml
@@ -40,7 +40,7 @@ extra-source-files:
 
 dependencies:
 - base >=4.8 && <4.12
-- base-compat >=0.10.1 && <0.11
+- base-compat-batteries >=0.10.1 && <0.11
 - ansi-terminal >=0.6.2.3
 - array
 - blaze-markup >=0.5.1
diff --git a/hledger-ui/hledger-ui.cabal b/hledger-ui/hledger-ui.cabal
index 6124f9fee..8cf97fbd7 100644
--- a/hledger-ui/hledger-ui.cabal
+++ b/hledger-ui/hledger-ui.cabal
@@ -2,7 +2,7 @@
 --
 -- see: https://github.com/sol/hpack
 --
--- hash: 5191302559d777c449e78ec3e41836e2777c70169c5f25eada5c8378fc081c0a
+-- hash: 76f2079643447fd282a8fb455594f8801e1a011cae69d7d1ec6bc3180dcf583f
 
 name:           hledger-ui
 version:        1.9.99
@@ -69,7 +69,7 @@ executable hledger-ui
     , ansi-terminal >=0.6.2.3
     , async
     , base >=4.8 && <4.12
-    , base-compat >=0.10.1 && <0.11
+    , base-compat-batteries >=0.10.1 && <0.11
     , cmdargs >=0.8
     , containers
     , data-default
diff --git a/hledger-ui/package.yaml b/hledger-ui/package.yaml
index 492c79891..ea4ecf2c8 100644
--- a/hledger-ui/package.yaml
+++ b/hledger-ui/package.yaml
@@ -45,7 +45,7 @@ dependencies:
 - ansi-terminal >=0.6.2.3
 - async
 - base >=4.8 && <4.12
-- base-compat >=0.10.1 && <0.11
+- base-compat-batteries >=0.10.1 && <0.11
 - cmdargs >=0.8
 - containers
 - data-default
diff --git a/hledger-web/hledger-web.cabal b/hledger-web/hledger-web.cabal
index 934f35719..256543344 100644
--- a/hledger-web/hledger-web.cabal
+++ b/hledger-web/hledger-web.cabal
@@ -2,7 +2,7 @@
 --
 -- see: https://github.com/sol/hpack
 --
--- hash: 6e05f5113e2a99d4f17688d2fa94a3ed08148105067ac15db75847e621a36d88
+-- hash: f9b958b9292d00ff739999dbd9f5a467b38eac93caa7d16950e03c4c15737b4c
 
 name:           hledger-web
 version:        1.9.99
@@ -144,7 +144,7 @@ library
   build-depends:
       HUnit
     , base >=4.8 && <4.12
-    , base-compat >=0.10.1 && <0.11
+    , base-compat-batteries >=0.10.1 && <0.11
     , blaze-html
     , blaze-markup
     , bytestring
@@ -195,7 +195,7 @@ executable hledger-web
   build-depends:
       HUnit
     , base >=4.8 && <4.12
-    , base-compat >=0.10.1 && <0.11
+    , base-compat-batteries >=0.10.1 && <0.11
     , blaze-html
     , blaze-markup
     , bytestring
@@ -254,7 +254,7 @@ test-suite test
   build-depends:
       HUnit
     , base >=4.8 && <4.12
-    , base-compat >=0.10.1 && <0.11
+    , base-compat-batteries >=0.10.1 && <0.11
     , blaze-html
     , blaze-markup
     , bytestring
diff --git a/hledger-web/package.yaml b/hledger-web/package.yaml
index c9352ef02..5043a431e 100644
--- a/hledger-web/package.yaml
+++ b/hledger-web/package.yaml
@@ -65,7 +65,7 @@ dependencies:
 - hledger-lib >=1.9.99 && <2.0
 - hledger >=1.9.99 && <2.0
 - base >=4.8 && <4.12
-- base-compat >=0.10.1 && <0.11
+- base-compat-batteries >=0.10.1 && <0.11
 - blaze-html
 - blaze-markup
 - bytestring
diff --git a/hledger/hledger.cabal b/hledger/hledger.cabal
index ab348ea87..59fdfe042 100644
--- a/hledger/hledger.cabal
+++ b/hledger/hledger.cabal
@@ -2,7 +2,7 @@
 --
 -- see: https://github.com/sol/hpack
 --
--- hash: 16dea93ba716dcd0bc9ad0027baacf924505a16f88444a92a28ae9e648e30ad6
+-- hash: 9c5b2134da8c5338d453b421424d33bf6ad43c1c12eca02dcd6711b23d7ae77a
 
 name:           hledger
 version:        1.9.99
@@ -116,7 +116,7 @@ library
     , HUnit
     , ansi-terminal >=0.6.2.3
     , base >=4.8 && <4.12
-    , base-compat >=0.10.1 && <0.11
+    , base-compat-batteries >=0.10.1 && <0.11
     , bytestring
     , cmdargs >=0.10
     , containers
@@ -168,7 +168,7 @@ executable hledger
     , HUnit
     , ansi-terminal >=0.6.2.3
     , base >=4.8 && <4.12
-    , base-compat >=0.10.1 && <0.11
+    , base-compat-batteries >=0.10.1 && <0.11
     , bytestring
     , cmdargs >=0.10
     , containers
@@ -222,7 +222,7 @@ test-suite test
     , HUnit
     , ansi-terminal >=0.6.2.3
     , base >=4.8 && <4.12
-    , base-compat >=0.10.1 && <0.11
+    , base-compat-batteries >=0.10.1 && <0.11
     , bytestring
     , cmdargs >=0.10
     , containers
@@ -275,7 +275,7 @@ benchmark bench
     , HUnit
     , ansi-terminal >=0.6.2.3
     , base >=4.8 && <4.12
-    , base-compat >=0.10.1 && <0.11
+    , base-compat-batteries >=0.10.1 && <0.11
     , bytestring
     , cmdargs >=0.10
     , containers
diff --git a/hledger/package.yaml b/hledger/package.yaml
index e148db6ce..50cbc3df4 100644
--- a/hledger/package.yaml
+++ b/hledger/package.yaml
@@ -81,7 +81,7 @@ dependencies:
 - hledger-lib >=1.9.99 && <2.0
 - ansi-terminal >=0.6.2.3
 - base >=4.8 && <4.12
-- base-compat >=0.10.1 && <0.11
+- base-compat-batteries >=0.10.1 && <0.11
 - bytestring
 - cmdargs >=0.10
 - containers