diff --git a/CHANGELOG.md b/CHANGELOG.md
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,20 +1,24 @@
+## Changes in 0.36.1
+  - Allow `Cabal-3.12.*`
+  - Support `base >= 4.20.0` (`Imports` does not re-export `Data.List.List`)
+
 ## Changes in 0.36.0
- - Don't infer `Paths_`-module with `spec-version: 0.36.0` or later
+  - Don't infer `Paths_`-module with `spec-version: 0.36.0` or later
 
 ## Changes in 0.35.5
- - Add (undocumented) `list` command
+  - Add (undocumented) `list` command
 
 ## Changes in 0.35.4
- - Add `--canonical`, which can be used to produce canonical output instead of
-   trying to produce minimal diffs
- - Avoid unnecessary writes on `--force` (see #555)
- - When an existing `.cabal` does not align fields then do not align fields in
-   the generated `.cabal` file.
- - Fix a bug related to git conflict markers in existing `.cabal` files: When a
-   `.cabal` file was essentially unchanged, but contained git conflict markers
-   then `hpack` did not write a new `.cabal` file at all.  To address this
-   `hpack` now unconditionally writes a new `.cabal` file when the existing
-   `.cabal` file contains any git conflict markers.
+  - Add `--canonical`, which can be used to produce canonical output instead of
+    trying to produce minimal diffs
+  - Avoid unnecessary writes on `--force` (see #555)
+  - When an existing `.cabal` does not align fields then do not align fields in
+    the generated `.cabal` file.
+  - Fix a bug related to git conflict markers in existing `.cabal` files: When a
+    `.cabal` file was essentially unchanged, but contained git conflict markers
+    then `hpack` did not write a new `.cabal` file at all.  To address this
+    `hpack` now unconditionally writes a new `.cabal` file when the existing
+    `.cabal` file contains any git conflict markers.
 
 ## Changes in 0.35.3
   - Depend on `crypton` instead of `cryptonite`
diff --git a/hpack.cabal b/hpack.cabal
--- a/hpack.cabal
+++ b/hpack.cabal
@@ -5,7 +5,7 @@
 -- see: https://github.com/sol/hpack
 
 name:           hpack
-version:        0.36.0
+version:        0.36.1
 synopsis:       A modern format for Haskell packages
 description:    See README at <https://github.com/sol/hpack#readme>
 category:       Development
@@ -29,7 +29,7 @@
       src
   ghc-options: -Wall -fno-warn-incomplete-uni-patterns
   build-depends:
-      Cabal >=3.0.0.0 && <3.11
+      Cabal >=3.0.0.0 && <3.13
     , Glob >=0.9.0
     , aeson >=1.4.3.0
     , base >=4.13 && <5
@@ -97,7 +97,7 @@
       driver
   ghc-options: -Wall -fno-warn-incomplete-uni-patterns
   build-depends:
-      Cabal >=3.0.0.0 && <3.11
+      Cabal >=3.0.0.0 && <3.13
     , Glob >=0.9.0
     , aeson >=1.4.3.0
     , base >=4.13 && <5
@@ -135,7 +135,7 @@
   ghc-options: -Wall -fno-warn-incomplete-uni-patterns
   cpp-options: -DTEST
   build-depends:
-      Cabal >=3.0.0.0 && <3.11
+      Cabal >=3.0.0.0 && <3.13
     , Glob >=0.9.0
     , HUnit >=1.6.0.0
     , QuickCheck
diff --git a/resources/test/hpack.cabal b/resources/test/hpack.cabal
--- a/resources/test/hpack.cabal
+++ b/resources/test/hpack.cabal
@@ -5,7 +5,7 @@
 -- see: https://github.com/sol/hpack
 
 name:           hpack
-version:        0.36.0
+version:        0.36.1
 synopsis:       A modern format for Haskell packages
 description:    See README at <https://github.com/sol/hpack#readme>
 category:       Development
@@ -29,7 +29,7 @@
       src
   ghc-options: -Wall -fno-warn-incomplete-uni-patterns
   build-depends:
-      Cabal >=3.0.0.0 && <3.11
+      Cabal >=3.0.0.0 && <3.13
     , Glob >=0.9.0
     , aeson >=1.4.3.0
     , base >=4.13 && <5
@@ -97,7 +97,7 @@
       driver
   ghc-options: -Wall -fno-warn-incomplete-uni-patterns
   build-depends:
-      Cabal >=3.0.0.0 && <3.11
+      Cabal >=3.0.0.0 && <3.13
     , Glob >=0.9.0
     , aeson >=1.4.3.0
     , base >=4.13 && <5
@@ -135,7 +135,7 @@
   ghc-options: -Wall -fno-warn-incomplete-uni-patterns
   cpp-options: -DTEST
   build-depends:
-      Cabal >=3.0.0.0 && <3.11
+      Cabal >=3.0.0.0 && <3.13
     , Glob >=0.9.0
     , HUnit >=1.6.0.0
     , QuickCheck
diff --git a/src/Imports.hs b/src/Imports.hs
--- a/src/Imports.hs
+++ b/src/Imports.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP #-}
 module Imports (module Imports) where
 
 import           Control.Applicative as Imports
@@ -6,7 +7,11 @@
 import           Control.Monad as Imports
 import           Control.Monad.IO.Class as Imports
 import           Data.Bifunctor as Imports
+#if MIN_VERSION_base(4,20,0)
+import           Data.List as Imports hiding (List, sort, nub)
+#else
 import           Data.List as Imports hiding (sort, nub)
+#endif
 import           Data.Monoid as Imports (Monoid(..))
 import           Data.Semigroup as Imports (Semigroup(..))
 import           Data.String as Imports