diff --git a/Gtk.overrides b/Gtk.overrides
--- a/Gtk.overrides
+++ b/Gtk.overrides
@@ -17,6 +17,11 @@
     ignore drag_get_icon_gicon
 endif
 
+# Wrong introspection data, see https://github.com/haskell-gi/haskell-gi/issues/56
+set-attr Gtk/Widget/intersect/@parameters/intersection direction out
+set-attr Gtk/Widget/intersect/@parameters/intersection caller-allocates 1
+set-attr Gtk/Widget/intersect/@parameters/intersection nullable 0
+
 # Generated from gtk+ 3.20.3 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
@@ -823,7 +828,6 @@
 set-attr Gtk/Widget/get_window/@return-value nullable 1
 set-attr Gtk/Widget/input_shape_combine_region/@parameters/region nullable 1
 set-attr Gtk/Widget/insert_action_group/@parameters/group nullable 1
-set-attr Gtk/Widget/intersect/@parameters/intersection nullable 1
 set-attr Gtk/Widget/modify_base/@parameters/color nullable 1
 set-attr Gtk/Widget/modify_bg/@parameters/color nullable 1
 set-attr Gtk/Widget/modify_cursor/@parameters/primary nullable 1
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.6
+version:              3.0.7
 synopsis:             Gtk bindings
 description:          Bindings for Gtk, autogenerated by haskell-gi.
 homepage:             https://github.com/haskell-gi/haskell-gi
@@ -9,14 +9,9 @@
 maintainer:           Iñaki García Etxebarria (garetxe@gmail.com)
 category:             Bindings
 build-type:           Custom
-cabal-version:        >= 1.24
-
-extra-source-files: Gtk.overrides
+cabal-version:        >= 1.22
 
-custom-setup
-      setup-depends: base >= 4.7 && < 5,
-                     Cabal >= 1.24,
-                     haskell-gi >= 0.18 && < 1
+extra-source-files: stack.yaml Gtk.overrides
 
 Flag overloaded-methods
       Description: Generate support for overloaded methods.
@@ -35,7 +30,8 @@
 
       pkgconfig-depends: gtk+-3.0
       build-depends: base >= 4.7 && <5,
-                     haskell-gi-base >= 0.18 && < 1,
+                     haskell-gi-base >= 0.20 && < 1,
+                     haskell-gi >= 0.20 && < 1,
                      gi-cairo == 1.0.*,
                      gi-pango == 1.0.*,
                      gi-gio == 2.0.*,
diff --git a/stack.yaml b/stack.yaml
new file mode 100644
--- /dev/null
+++ b/stack.yaml
@@ -0,0 +1,8 @@
+packages:
+- '.'
+extra-deps:
+- 'haskell-gi-0.20'
+- 'haskell-gi-base-0.20'
+explicit-setup-deps:
+  ! '*': true
+resolver: lts-7.11