diff --git a/.cvsignore b/.cvsignore
index afc1978..4260fe7 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-mousetweaks-2.30.0.tar.bz2
+mousetweaks-2.30.1.tar.bz2
diff --git a/mousetweaks.spec b/mousetweaks.spec
index 64c35c8..df17383 100644
--- a/mousetweaks.spec
+++ b/mousetweaks.spec
@@ -1,12 +1,12 @@
 Name:           mousetweaks
-Version:        2.30.0
+Version:        2.30.1
 Release:        1%{?dist}
 Summary:        Mouse accessibility support for the GNOME desktop
 Group:          User Interface/Desktops
 License:        GPLv3 and GFDL
 #VCS: git:git://git.gnome.org/mousetweaks
 URL:            http://live.gnome.org/Mousetweaks/Home
-Source0:        http://download.gnome.org/sources/mousetweaks/2.29/%{name}-%{version}.tar.bz2
+Source0:        http://download.gnome.org/sources/mousetweaks/2.30/%{name}-%{version}.tar.bz2
 
 BuildRequires:  gettext
 BuildRequires:  gnome-doc-utils
@@ -67,32 +67,13 @@ done
 rm -rf $RPM_BUILD_ROOT
 
 %pre
-if [ "$1" -gt 1 ]; then
-  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-  for f in %{_sysconfdir}/gconf/schemas/mouseweaks.schemas \
-           %{_sysconfdir}/gconf/schemas/pointer-capture-applet.schemas ;
-    do
-      if [ -f $f ]; then
-        gconftool-2 --makefile-uninstall-rule $f >/dev/null
-      fi
-    done
-fi
+%gconf_schema_prepare mouseweaks pointer-capture-applet
 
 %post
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule \
-        %{_sysconfdir}/gconf/schemas/mousetweaks.schemas \
-        %{_sysconfdir}/gconf/schemas/pointer-capture-applet.schemas \
-        >/dev/null
+%gconf_schema_upgrade mousetweaks pointer-capture-applet
 
 %preun
-if [ "$1" -eq 0 ]; then
-  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-  gconftool-2 --makefile-uninstall-rule \
-        %{_sysconfdir}/gconf/schemas/mousetweaks.schemas \
-        %{_sysconfdir}/gconf/schemas/pointer-capture-applet.schemas \
-        >/dev/null
-fi
+%gconf_schema_remove mousetweaks pointer-capture-applet
 
 %files -f mousetweaks.lang
 %defattr(-,root,root,-)
@@ -108,6 +89,10 @@ fi
 %doc %{_mandir}/man1/*
 
 %changelog
+* Tue Apr 27 2010 Matthias Clasen <mclasen@redhat.com> 2.30.1-1
+- Update to 2.30.1
+- Spec file cleanups
+
 * Sun Mar 28 2010 Matthias Clasen <mclasen@redhat.com> 2.30.0-1
 - Update to 2.30.0
 
diff --git a/sources b/sources
index f230135..8ce475c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9a6eeea6ec0538c4f9a80a8eea4162b4  mousetweaks-2.30.0.tar.bz2
+ba764f315df090bb5c99474b36ae768d  mousetweaks-2.30.1.tar.bz2