diff --git a/gedit.spec b/gedit.spec
index 6d570ab..32eb172 100644
--- a/gedit.spec
+++ b/gedit.spec
@@ -14,22 +14,20 @@
 
 Summary:	Text editor for the GNOME desktop
 Name:		gedit
-Version: 	2.30.0
+Version: 	2.30.2
 Release: 	1%{?dist}
 Epoch:		1
 License:	GPLv2+ and GFDL
 Group:		Applications/Editors
 #VCS: git:git://git.gnome.org/gedit
-Source0:	http://download.gnome.org/sources/gedit/2.29/gedit-%{version}.tar.bz2
+Source0:	http://download.gnome.org/sources/gedit/2.30/gedit-%{version}.tar.bz2
 
 URL:		http://projects.gnome.org/gedit/
 
-Requires(post):         desktop-file-utils >= %{desktop_file_utils_version}
-Requires(post):		scrollkeeper >= 0.1.4
 Requires(post):		GConf2 >= %{gconf_version}
 Requires(pre):		GConf2 >= %{gconf_version}
 Requires(preun):	GConf2 >= %{gconf_version}
-Requires(postun):	scrollkeeper >= 0.1.4
+Requires(post):         desktop-file-utils >= %{desktop_file_utils_version}
 Requires(postun):       desktop-file-utils >= %{desktop_file_utils_version}
 
 # Make the file selector remember last window size
@@ -176,25 +174,14 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 update-desktop-database -q
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gedit.schemas > /dev/null || :
-
-# update icon themes
+%gconf_schema_upgrade gedit
 touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
 
 %pre
-if [ "$1" -gt 1 ]; then
-    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-    gconftool-2 --makefile-uninstall-rule \
-      %{_sysconfdir}/gconf/schemas/gedit.schemas > /dev/null || :
-fi
+%gconf_schema_prepare gedit
 
 %preun
-if [ "$1" -eq 0 ]; then
-    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-    gconftool-2 --makefile-uninstall-rule \
-      %{_sysconfdir}/gconf/schemas/gedit.schemas > /dev/null || :
-fi
+%gconf_schema_remove gedit
 
 %postun
 update-desktop-database -q
@@ -226,6 +213,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
 
 
 %changelog
+* Sun Apr 18 2010 Matthias Clasen <mclasen@redhat.com> - 2.30.2-1
+- Update to 2.30.2
+- Use GConf macros
+
 * Mon Mar 29 2010 Matthias Clasen <mclasen@redhat.com> - 2.30.0-1
 - Update to 2.30.0
 
diff --git a/sources b/sources
index a4d90e7..450d989 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-aebd49797406fdde7b25624b71990860  gedit-2.30.0.tar.bz2
+00ccd2fdba5c5e1d3bc54da5377f0277  gedit-2.30.2.tar.bz2