diff --git a/ChangeLog.md b/ChangeLog.md
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,3 +1,7 @@
+### 2.0.16
+
++ Remove enable-overloading flags, and use instead explicit CPP checks for 'haskell-gi-overloading-1.0', see [how to disable overloading](https://github.com/haskell-gi/haskell-gi/wiki/Overloading\#disabling-overloading).
+
 ### 2.0.15
 
 + Generate bindings for [Object.setDataFull](https://hackage.haskell.org/package/gi-gobject/docs/GI-GObject-Objects-Object.html#v:objectSetDataFull).
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-gobject-2.0.15/docs/GI-GObject.html](https://hackage.haskell.org/package/gi-gobject-2.0.15/docs/GI-GObject.html)
+[https://hackage.haskell.org/package/gi-gobject-2.0.16/docs/GI-GObject.html](https://hackage.haskell.org/package/gi-gobject-2.0.16/docs/GI-GObject.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-gobject.cabal b/gi-gobject.cabal
--- a/gi-gobject.cabal
+++ b/gi-gobject.cabal
@@ -1,5 +1,5 @@
 name:                 gi-gobject
-version:              2.0.15
+version:              2.0.16
 synopsis:             GObject bindings
 description:          Bindings for GObject, autogenerated by haskell-gi.
 homepage:             https://github.com/haskell-gi/haskell-gi
@@ -16,11 +16,7 @@
 custom-setup
       setup-depends: base >= 4.7 && < 5,
                      Cabal >= 1.24,
-                     haskell-gi >= 0.20.1 && < 1
-
-Flag enable-overloading
-      Description: Enable support for overloaded labels.
-      Default: True
+                     haskell-gi == 0.21.*
 
 library
       default-language: Haskell2010
@@ -28,18 +24,18 @@
       other-extensions: PatternSynonyms, ViewPatterns
       ghc-options: -fno-warn-unused-imports -fno-warn-warnings-deprecations
 
-      if flag(enable-overloading)
-         cpp-options: -DENABLE_OVERLOADING
-         build-depends: haskell-gi-overloading == 1.0.*
-      else
-         build-depends: haskell-gi-overloading == 0.0
-
       pkgconfig-depends: gobject-2.0
       build-depends: base >= 4.7 && <5,
-                     haskell-gi-base >= 0.20 && < 1,
-                     haskell-gi >= 0.20.1 && < 1,
+                     haskell-gi-base == 0.21.*,
+                     haskell-gi == 0.21.*,
+                     haskell-gi-overloading < 1.1,
                      gi-glib == 2.0.*,
                      bytestring >= 0.10 && < 1,
                      containers >= 0.5 && < 1,
                      text >= 1.0 && < 2,
                      transformers >= 0.4 && < 1
+
+      -- Disable overloading when compiling under GHC 8.2.x
+      -- see https://ghc.haskell.org/trac/ghc/ticket/14382
+      if impl(ghc == 8.2.*)
+              build-depends: haskell-gi-overloading == 0.0
diff --git a/stack.yaml b/stack.yaml
--- a/stack.yaml
+++ b/stack.yaml
@@ -1,5 +1,3 @@
 packages:
 - '.'
-explicit-setup-deps:
-  ! '*': true
-resolver: nightly-2016-12-05
+resolver: lts-9.21