diff --git a/ChangeLog.md b/ChangeLog.md
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,3 +1,7 @@
+### 1.0.22
+
++ Update for haskell-gi(-base)-0.23
+
 ### 1.0.21
 
 + Add support for inherited dependencies
diff --git a/README.md b/README.md
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Documentation
 Autogenerated documentation for this package can be found at
 
-[https://hackage.haskell.org/package/gi-girepository-1.0.21/docs/GI-GIRepository.html](https://hackage.haskell.org/package/gi-girepository-1.0.21/docs/GI-GIRepository.html)
+[https://hackage.haskell.org/package/gi-girepository-1.0.22/docs/GI-GIRepository.html](https://hackage.haskell.org/package/gi-girepository-1.0.22/docs/GI-GIRepository.html)
 
 For general documentation on using [haskell-gi](https://github.com/haskell-gi/haskell-gi) based bindings, see [the project page](https://github.com/haskell-gi/haskell-gi) or [the Wiki](https://github.com/haskell-gi/haskell-gi/wiki).
diff --git a/gi-girepository.cabal b/gi-girepository.cabal
--- a/gi-girepository.cabal
+++ b/gi-girepository.cabal
@@ -1,12 +1,12 @@
 name:                 gi-girepository
-version:              1.0.21
+version:              1.0.22
 synopsis:             GIRepository (gobject-introspection) bindings
 description:          Bindings for GIRepository, autogenerated by haskell-gi.
 homepage:             https://github.com/haskell-gi/haskell-gi
 license:              LGPL-2.1
 license-file:         LICENSE
 author:               Will Thompson, Iñaki García Etxebarria and Jonas Platte
-maintainer:           Iñaki García Etxebarria (inaki@blueleaf.cc)
+maintainer:           Iñaki García Etxebarria
 category:             Bindings
 build-type:           Custom
 cabal-version:        1.24
@@ -16,20 +16,20 @@
 custom-setup
       setup-depends: base >= 4.9 && < 5,
                      Cabal >= 1.24,
-                     haskell-gi >= 0.22.5 && < 0.23,
+                     haskell-gi >= 0.23 && < 0.24,
                      gi-glib == 2.0.*,
                      gi-gobject == 2.0.*
 
 library
       default-language: Haskell2010
       default-extensions: NoImplicitPrelude, ScopedTypeVariables, CPP, OverloadedStrings, NegativeLiterals, ConstraintKinds, TypeFamilies, MultiParamTypeClasses, KindSignatures, FlexibleInstances, UndecidableInstances, DataKinds, FlexibleContexts, UndecidableSuperClasses
-      other-extensions: PatternSynonyms, ViewPatterns
+      other-extensions: PatternSynonyms, ViewPatterns, TypeApplications
       ghc-options: -fno-warn-unused-imports -fno-warn-warnings-deprecations
 
       pkgconfig-depends: gobject-introspection-1.0
       build-depends: base >= 4.7 && <5,
-                     haskell-gi-base >= 0.22.0 && < 0.23,
-                     haskell-gi >= 0.22.5 && < 0.23,
+                     haskell-gi-base >= 0.23 && < 0.24,
+                     haskell-gi >= 0.23.0 && < 0.24,
                      haskell-gi-overloading < 1.1,
                      gi-glib == 2.0.*,
                      gi-gobject == 2.0.*,
@@ -49,7 +49,8 @@
       -- to be built will be built at configure time, based on the
       -- available introspection data.
 
-      exposed-modules: GI.GIRepository,
+      exposed-modules: GI.GIRepository.Config,
+                       GI.GIRepository,
                        GI.GIRepository.Constants,
                        GI.GIRepository.Enums,
                        GI.GIRepository.Flags,
@@ -64,7 +65,8 @@
                        GI.GIRepository.Unions,
                        GI.GIRepository.Unions.Argument
 
-      autogen-modules: GI.GIRepository,
+      autogen-modules: GI.GIRepository.Config,
+                       GI.GIRepository,
                        GI.GIRepository.Constants,
                        GI.GIRepository.Enums,
                        GI.GIRepository.Flags,