diff --git a/ChangeLog.md b/ChangeLog.md
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,6 +1,10 @@
+### 3.0.23
+
++ Add an override to make sure that [`Cairo.FontOptions`](https://hackage.haskell.org/package/gi-cairo/docs/GI-Cairo-Structs-FontOptions.html) is always treated as boxed.
+
 ### 3.0.22
 
-+ The return of [`applicationNew`](https://hackage.haskell.org/package/gi-gtk/docs/GI-Gtk-Objects-Application.html#v:applicationNew) value can be null, but it is not marked as such in the introspection data, leading to a rather confusing error message (see [issue 142](https://github.com/haskell-gi/haskell-gi/issues/142) and [issue 143](https://github.com/haskell-gi/haskell-gi/issues/143)).
++ The return value of [`applicationNew`](https://hackage.haskell.org/package/gi-gtk/docs/GI-Gtk-Objects-Application.html#v:applicationNew) can be null, but it is not marked as such in the introspection data, leading to a rather confusing error message (see [issue 142](https://github.com/haskell-gi/haskell-gi/issues/142) and [issue 143](https://github.com/haskell-gi/haskell-gi/issues/143)).
 
 ### 3.0.21
 
diff --git a/Gtk.overrides b/Gtk.overrides
--- a/Gtk.overrides
+++ b/Gtk.overrides
@@ -75,6 +75,9 @@
 # https://github.com/haskell-gi/haskell-gi/issues/143
 set-attr Gtk/Application/new/@return-value nullable 1
 
+# https://github.com/haskell-gi/haskell-gi/issues/148
+set-attr cairo/FontOptions glib:get-type cairo_gobject_font_options_get_type
+
 # Generated from gtk+ 3.22.11 with xsltproc Nullable.xslt Gtk-3.0.gir
 set-attr Gtk/AboutDialog/set_comments/@parameters/comments nullable 1
 set-attr Gtk/AboutDialog/set_copyright/@parameters/copyright nullable 1
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-gtk-3.0.22/docs/GI-Gtk.html](https://hackage.haskell.org/package/gi-gtk-3.0.22/docs/GI-Gtk.html)
+[https://hackage.haskell.org/package/gi-gtk-3.0.23/docs/GI-Gtk.html](https://hackage.haskell.org/package/gi-gtk-3.0.23/docs/GI-Gtk.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-gtk.cabal b/gi-gtk.cabal
--- a/gi-gtk.cabal
+++ b/gi-gtk.cabal
@@ -1,5 +1,5 @@
 name:                 gi-gtk
-version:              3.0.22
+version:              3.0.23
 synopsis:             Gtk bindings
 description:          Bindings for Gtk, autogenerated by haskell-gi.
 homepage:             https://github.com/haskell-gi/haskell-gi
@@ -9,14 +9,14 @@
 maintainer:           Iñaki García Etxebarria (garetxe@gmail.com)
 category:             Bindings
 build-type:           Custom
-cabal-version:        >= 1.24
+cabal-version:        1.24
 
 extra-source-files: README.md ChangeLog.md stack.yaml Gtk.overrides
 
 custom-setup
       setup-depends: base >= 4.7 && < 5,
                      Cabal >= 1.24,
-                     haskell-gi == 0.21.*
+                     haskell-gi >= 0.21.1 && < 0.22
 
 library
       default-language: Haskell2010
@@ -27,7 +27,7 @@
       pkgconfig-depends: gtk+-3.0
       build-depends: base >= 4.7 && <5,
                      haskell-gi-base == 0.21.*,
-                     haskell-gi == 0.21.*,
+                     haskell-gi >= 0.21.1 && < 0.22,
                      haskell-gi-overloading < 1.1,
                      gi-cairo == 1.0.*,
                      gi-pango == 1.0.*,