diff --git a/ChangeLog.md b/ChangeLog.md
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,3 +1,7 @@
+### 3.0.37
+
++ Update to haskell-gi(-base)-0.25
+
 ### 3.0.36
 
 + The pixbuf parameter for [ClipboardImageReceivedFunc](https://hackage.haskell.org/package/gi-gtk-3.0.36/docs/GI-Gtk-Callbacks.html#g:signal:ClipboardImageReceivedFunc) is nullable, but it was not marked as such.
diff --git a/Gtk.overrides b/Gtk.overrides
--- a/Gtk.overrides
+++ b/Gtk.overrides
@@ -13,7 +13,7 @@
 # upstream issue: https://bugzilla.gnome.org/show_bug.cgi?id=761339
 ignore WidgetPath.iter_add_qclass
 
-# The pixbuf parameter can be null is the request failed.
+# The pixbuf parameter can be null if the request failed.
 set-attr Gtk/ClipboardImageReceivedFunc/@parameters/pixbuf nullable 1
 
 # Wrong introspection annotation, leading to crashes. See
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.36/docs/GI-Gtk.html](https://hackage.haskell.org/package/gi-gtk-3.0.36/docs/GI-Gtk.html)
+[https://hackage.haskell.org/package/gi-gtk-3.0.37/docs/GI-Gtk.html](https://hackage.haskell.org/package/gi-gtk-3.0.37/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/Setup.hs b/Setup.hs
--- a/Setup.hs
+++ b/Setup.hs
@@ -13,9 +13,11 @@
 
 
 main :: IO ()
-main = setupBinding name version verbose overridesFile inheritedOverrides outputDir
+main = setupBinding name version pkgName pkgVersion verbose overridesFile inheritedOverrides outputDir
   where name = "Gtk"
         version = "3.0"
+        pkgName = "gi-gtk"
+        pkgVersion = "3.0.37"
         overridesFile = Just "Gtk.overrides"
         verbose = False
         outputDir = Nothing
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.36
+version:              3.0.37
 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
 category:             Bindings
 build-type:           Custom
-cabal-version:        1.24
+cabal-version:        2.0
 
 extra-source-files: README.md ChangeLog.md stack.yaml Gtk.overrides
 
 custom-setup
       setup-depends: base >= 4.9 && < 5,
                      Cabal >= 1.24,
-                     haskell-gi >= 0.24.1 && < 0.25,
+                     haskell-gi >= 0.25 && < 0.26,
                      gi-cairo == 1.0.*,
                      gi-pango == 1.0.*,
                      gi-gio == 2.0.*,
@@ -34,8 +34,8 @@
 
       pkgconfig-depends: gtk+-3.0
       build-depends: base >= 4.7 && <5,
-                     haskell-gi-base >= 0.24 && < 0.25,
-                     haskell-gi >= 0.24.1 && < 0.25,
+                     haskell-gi-base >= 0.25 && < 0.26,
+                     haskell-gi >= 0.25 && < 0.26,
                      haskell-gi-overloading < 1.1,
                      gi-cairo == 1.0.*,
                      gi-pango == 1.0.*,
@@ -256,6 +256,7 @@
                        GI.Gtk.Objects.PanedAccessible,
                        GI.Gtk.Objects.PlacesSidebar,
                        GI.Gtk.Objects.Plug,
+                       GI.Gtk.Objects.PlugAccessible,
                        GI.Gtk.Objects.Popover,
                        GI.Gtk.Objects.PopoverAccessible,
                        GI.Gtk.Objects.PopoverMenu,
@@ -301,6 +302,7 @@
                        GI.Gtk.Objects.ShortcutsWindow,
                        GI.Gtk.Objects.SizeGroup,
                        GI.Gtk.Objects.Socket,
+                       GI.Gtk.Objects.SocketAccessible,
                        GI.Gtk.Objects.SpinButton,
                        GI.Gtk.Objects.SpinButtonAccessible,
                        GI.Gtk.Objects.Spinner,
@@ -606,6 +608,7 @@
                        GI.Gtk.Objects.PanedAccessible,
                        GI.Gtk.Objects.PlacesSidebar,
                        GI.Gtk.Objects.Plug,
+                       GI.Gtk.Objects.PlugAccessible,
                        GI.Gtk.Objects.Popover,
                        GI.Gtk.Objects.PopoverAccessible,
                        GI.Gtk.Objects.PopoverMenu,
@@ -651,6 +654,7 @@
                        GI.Gtk.Objects.ShortcutsWindow,
                        GI.Gtk.Objects.SizeGroup,
                        GI.Gtk.Objects.Socket,
+                       GI.Gtk.Objects.SocketAccessible,
                        GI.Gtk.Objects.SpinButton,
                        GI.Gtk.Objects.SpinButtonAccessible,
                        GI.Gtk.Objects.Spinner,