diff --git a/.cvsignore b/.cvsignore
index 2d42f6d..e29a893 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,16 +1 @@
-gedit-2.10.3.tar.bz2
-gedit-2.10.4.tar.bz2
-gedit-2.11.91.tar.bz2
-gedit-2.12.0.tar.bz2
-gedit-2.12.1.tar.bz2
-gedit-2.13.0.tar.bz2
-gedit-2.13.1.tar.bz2
-gedit-2.13.2.tar.bz2
-gedit-2.13.3.tar.bz2
-gedit-2.13.4.tar.bz2
-gedit-2.13.90.tar.bz2
-gedit-2.13.91.tar.bz2
-gedit-2.13.92.tar.bz2
-gedit-2.14.0.tar.bz2
-gedit-2.14.1.tar.bz2
-gedit-2.14.2.tar.bz2
+gedit-2.15.1.tar.bz2
diff --git a/gedit.spec b/gedit.spec
index b2ef7e7..b8ed4b9 100644
--- a/gedit.spec
+++ b/gedit.spec
@@ -16,8 +16,8 @@
 
 Summary:	gEdit is a small but powerful text editor for GNOME.
 Name:		gedit
-Version: 	2.14.2
-Release: 	2	
+Version: 	2.15.1
+Release: 	1	
 Epoch:		1
 License:	GPL
 Group:		Applications/Editors
@@ -25,9 +25,12 @@ Source0:	http://ftp.gnome.org/pub/GNOME/sources/gedit/2.8/gedit-%{version}.tar.b
 URL:		http://gedit.sourceforge.net/
 BuildRoot:	%{_tmppath}/gedit-%{version}-root
 
-PreReq:		scrollkeeper >= 0.1.4
-PreReq:		GConf2
-PreReq:         desktop-file-utils >= %{desktop_file_utils_version}
+Requires(post):         desktop-file-utils >= %{desktop_file_utils_version}
+Requires(post):		scrollkeeper >= 0.1.4
+Requires(post):		GConf2
+Requires(preun):	GConf2
+Requires(postun):	scrollkeeper >= 0.1.4
+Requires(postun):       desktop-file-utils >= %{desktop_file_utils_version}
 
 # Make the file selector remember last window size
 Patch0: gedit-2.13.2-filesel.patch
@@ -120,13 +123,10 @@ desktop-file-install --vendor gnome --delete-original       \
 rm -rf $RPM_BUILD_ROOT
 
 %post
-update-desktop-database %{_datadir}/applications
-scrollkeeper-update
+update-desktop-database -q
+scrollkeeper-update -q
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-SCHEMAS="gedit.schemas"
-for S in $SCHEMAS; do
-  gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/$S > /dev/null
-done
+gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gedit.schemas > /dev/null
 
 # update icon themes
 touch %{_datadir}/icons/hicolor
@@ -134,9 +134,20 @@ if [ -x /usr/bin/gtk-update-icon-cache ]; then
   /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
 fi
 
+%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
+
 %postun
-update-desktop-database %{_datadir}/applications
-scrollkeeper-update
+update-desktop-database -q
+scrollkeeper-update -q
+touch %{_datadir}/icons/hicolor
+if [ -x /usr/bin/gtk-update-icon-cache ]; then
+  /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
+fi
 
 %files -f %{po_package}.lang
 %defattr(-, root, root)
@@ -158,6 +169,9 @@ scrollkeeper-update
 %{_libdir}/pkgconfig/gedit-2.14.pc
 
 %changelog
+* Tue May  9 2006 Matthias Clasen <mclasen@redhat.com> 2.15.1-1
+- Update to 2.15.1
+
 * Mon Apr 10 2006 Matthias Clasen <mclasen@redhat.com> 2.14.2-2
 - Update to 2.14.2
 
diff --git a/sources b/sources
index 4ab21e8..2fdba6c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-35d146a924fd426d448048e8db383334  gedit-2.14.2.tar.bz2
+891084f0dd8880a24ca8d5108b9ee13a  gedit-2.15.1.tar.bz2