diff --git a/CHANGELOG.md b/CHANGELOG.md
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## [1.0.0.1] - 2022-04-26
+
+### Added
+
+* Support for `aeson >= 2.0.0.0`
+
 ## [1.0.0.0] - 2021-11-20
 
 ### Changed
diff --git a/genvalidity-aeson.cabal b/genvalidity-aeson.cabal
--- a/genvalidity-aeson.cabal
+++ b/genvalidity-aeson.cabal
@@ -1,11 +1,11 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.34.4.
+-- This file has been generated from package.yaml by hpack version 0.34.7.
 --
 -- see: https://github.com/sol/hpack
 
 name:           genvalidity-aeson
-version:        1.0.0.0
+version:        1.0.0.1
 synopsis:       GenValidity support for aeson
 category:       Testing
 homepage:       https://github.com/NorfairKing/validity#readme
diff --git a/src/Data/GenValidity/Aeson.hs b/src/Data/GenValidity/Aeson.hs
--- a/src/Data/GenValidity/Aeson.hs
+++ b/src/Data/GenValidity/Aeson.hs
@@ -1,8 +1,14 @@
+{-# LANGUAGE CPP #-}
 {-# OPTIONS_GHC -fno-warn-orphans #-}
 
 module Data.GenValidity.Aeson where
 
 import Data.Aeson
+#if MIN_VERSION_aeson(2,0,0)
+import Data.Aeson.KeyMap (KeyMap)
+import qualified Data.Aeson.KeyMap as KM
+import qualified Data.Aeson.Key as K
+#endif
 import Data.Foldable (toList)
 import Data.GenValidity
 import Data.GenValidity.HashMap ()
@@ -11,6 +17,16 @@
 import Data.GenValidity.Vector ()
 import Data.Validity.Aeson ()
 import Test.QuickCheck
+
+#if MIN_VERSION_aeson(2,0,0)
+instance GenValid Key where
+  genValid = K.fromString <$> genValid
+  shrinkValid = fmap K.fromString . shrinkValid . K.toString
+
+instance (GenValid v) => GenValid (KeyMap v) where
+  genValid = KM.fromList <$> genValid
+  shrinkValid = fmap KM.fromList . shrinkValid . KM.toList
+#endif
 
 instance GenValid Value where
   genValid =