diff --git a/gucharmap.spec b/gucharmap.spec
index 0ba7df7..e2dbaaf 100644
--- a/gucharmap.spec
+++ b/gucharmap.spec
@@ -18,7 +18,6 @@ BuildRequires: gnome-doc-utils >= 0.3.2
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: gtk3-devel >= %{gtk3_version}
 BuildRequires: gobject-introspection-devel
-BuildRequires: GConf2-devel
 BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
 BuildRequires: scrollkeeper
 BuildRequires: gettext
@@ -46,7 +45,6 @@ needed to use the libgucharmap library.
 
 %build
 %configure --with-gtk=3.0 \
-           --disable-gtk-immodules \
            --disable-scrollkeeper \
            --enable-introspection
 make %{?_smp_mflags}
@@ -55,13 +53,10 @@ sed -i -e '/^Requires.private/d' gucharmap-2.90.pc
 
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT RUN_QUERY_IMMODULES_TEST=false
+make install DESTDIR=$RPM_BUILD_ROOT
 
 rm $RPM_BUILD_ROOT/%{_libdir}/*.la
 
-sed -i -e "s#Icon=gucharmap.png#Icon=/usr/share/icons/hicolor/48x48/apps/gucharmap.png#" \
-  $RPM_BUILD_ROOT%{_datadir}/applications/gucharmap.desktop
-
 desktop-file-install --vendor gnome --delete-original       \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications             \
   $RPM_BUILD_ROOT%{_datadir}/applications/*
@@ -73,7 +68,6 @@ desktop-file-install --vendor gnome --delete-original       \
 %post
 /sbin/ldconfig
 update-desktop-database &> /dev/null || :
-%gconf_schema_upgrade gucharmap
 touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
 %postun
@@ -82,16 +76,12 @@ update-desktop-database &> /dev/null || :
 if [ $1 -eq 0 ] ; then
   touch --no-create %{_datadir}/icons/hicolor &>/dev/null
   gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+  glib-compile-schemas %{_datadir}/glib-2.0/schemas || :
 fi
 
 %posttrans
 gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-
-%pre
-%gconf_schema_prepare gucharmap
-
-%preun
-%gconf_schema_remove gucharmap
+glib-compile-schemas %{_datadir}/glib-2.0/schemas || :
 
 %files -f gucharmap.lang
 %doc AUTHORS COPYING NEWS README
@@ -100,9 +90,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_bindir}/gnome-character-map
 %{_libdir}/libgucharmap_2_90.so.*
 %{_datadir}/applications/gnome-gucharmap.desktop
-%{_sysconfdir}/gconf/schemas/gucharmap.schemas
 %{_libdir}/girepository-1.0
-
+%{_datadir}/glib-2.0/schemas/org.gnome.Charmap.enums.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.Charmap.gschema.xml
 
 %files devel
 %{_includedir}/gucharmap-2.90