diff --git a/ibus.changes b/ibus.changes
index e7303dc..873fc96 100644
--- a/ibus.changes
+++ b/ibus.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Jun  1 21:47:54 UTC 2018 - bjorn.lie@gmail.com
+
+- Replace python3-gobject2-devel and python3-gobject2 with
+  python3-gobject-devel and python3-gobject BuildRequires and
+  Requires.
+- Drop gconf2-devel BuildRequires: No longer needed, nor used.
+
 -------------------------------------------------------------------
 Fri May 18 07:33:49 UTC 2018 - jengelh@inai.de
 
diff --git a/ibus.spec b/ibus.spec
index 56c77f0..7d5ecb8 100644
--- a/ibus.spec
+++ b/ibus.spec
@@ -69,7 +69,6 @@ Patch12:        ibus-disable-engines-preload-in-GNOME.patch
 BuildRequires:  dbus-1-glib-devel
 BuildRequires:  dconf-devel >= 0.7.5
 BuildRequires:  fdupes
-BuildRequires:  gconf2-devel
 BuildRequires:  gettext-devel
 BuildRequires:  glib2-devel >= 2.34.0
 BuildRequires:  gobject-introspection-devel >= 0.9.6
@@ -82,7 +81,7 @@ BuildRequires:  libtool
 BuildRequires:  pkgconfig
 BuildRequires:  python3-dbus-python-devel
 BuildRequires:  python3-devel
-BuildRequires:  python3-gobject2-devel
+BuildRequires:  python3-gobject-devel
 BuildRequires:  unicode-ucd
 BuildRequires:  update-desktop-files
 # copy_deep method is supported since 0.31.1
@@ -96,8 +95,8 @@ Requires:       dconf
 Requires:       iso-codes
 Requires:       libibus-1_0-5 = %{version}
 Requires:       python3-dbus-python
+Requires:       python3-gobject
 Requires:       python3-gobject-Gdk
-Requires:       python3-gobject2
 # ibus-setup will require typelib(Gdk) typelib(GdkX11), typelib(Gtk)
 # which are provided by two packages in openSUSE, so we limit their
 # versions to 3.0 only.
@@ -342,6 +341,9 @@ dconf update
 %{_datadir}/applications/org.freedesktop.IBus.Panel.Extension.Gtk3.desktop
 %{_mandir}/man7/ibus-emoji.7%{ext_man}
 %endif
+%{python3_sitearch}/gi/overrides/IBus.py
+%{python3_sitearch}/gi/overrides/__pycache__/IBus.cpython-36.opt-1.pyc
+%{python3_sitearch}/gi/overrides/__pycache__/IBus.cpython-36.pyc
 
 %files lang -f ibus10.lang
 
diff --git a/python-ibus.changes b/python-ibus.changes
index 914f223..2b96a91 100644
--- a/python-ibus.changes
+++ b/python-ibus.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Jun  1 21:47:54 UTC 2018 - bjorn.lie@gmail.com
+
+- Drop gconf2-devel BuildRequires: No longer needed, nor used.
+
 -------------------------------------------------------------------
 Fri May 18 07:33:49 UTC 2018 - jengelh@inai.de
 
diff --git a/python-ibus.spec b/python-ibus.spec
index 8fd7b39..7b0af10 100644
--- a/python-ibus.spec
+++ b/python-ibus.spec
@@ -33,7 +33,6 @@ BuildRequires:  dbus-1-glib-devel
 BuildRequires:  dbus-1-python-devel >= 0.83.0
 BuildRequires:  dconf-devel >= 0.7.5
 BuildRequires:  fdupes
-BuildRequires:  gconf2-devel
 BuildRequires:  gettext-devel
 BuildRequires:  glib2-devel >= 2.34.0
 BuildRequires:  gobject-introspection-devel >= 0.9.6