diff --git a/.cvsignore b/.cvsignore
index abe9fd9..f6deb0a 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,16 +1 @@
-yelp-2.6.2.tar.bz2
-yelp-2.6.3.tar.bz2
-yelp-2.6.4.tar.bz2
-yelp-2.6.5.tar.bz2
-yelp-2.9.3.tar.bz2
-yelp-2.10.0.tar.bz2
-yelp-2.11.1.tar.bz2
-yelp-2.12.0.tar.bz2
-yelp-2.12.1.tar.bz2
-yelp-2.13.1.tar.bz2
-yelp-2.13.2.tar.bz2
-yelp-2.13.3.tar.bz2
-yelp-2.13.4.tar.bz2
-yelp-2.13.5.tar.bz2
-yelp-2.13.6.tar.bz2
-yelp-2.14.0.tar.bz2
+yelp-2.15.1.tar.bz2
diff --git a/sources b/sources
index ca877cd..a4454bc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3d569f8e9372bc88c7f9fca6a94388a9  yelp-2.14.1.tar.bz2
+3f1dfa1c9f9031e614183c18d76a6f8d  yelp-2.15.1.tar.bz2
diff --git a/yelp.spec b/yelp.spec
index 392219c..1c102b2 100644
--- a/yelp.spec
+++ b/yelp.spec
@@ -12,8 +12,8 @@
 
 Summary: A system documentation reader from the Gnome project. 
 Name: yelp
-Version: 2.14.1
-Release: 2
+Version: 2.15.1
+Release: 1
 Source: %{name}-%{version}.tar.bz2
 # http://bugzilla.gnome.org/show_bug.cgi?id=319096
 Patch1: yelp-2.12.1-fedora-docs.patch
@@ -21,7 +21,6 @@ Patch2: yelp-2.13.2-add-mime-handling.patch
 License: GPL
 Group: Applications/System
 BuildRoot: %{_tmppath}/%{name}-root
-Requires: scrollkeeper
 Requires: gtk2 >= %{gtk2_version}
 Requires: gnome-vfs2 >= %{gnome_vfs2_version}
 Requires: mozilla >= %{mozilla_version}
@@ -32,8 +31,10 @@ Requires: libxslt >= %{libxslt_version}
 Requires: libglade2 >= %{libglade_version}
 Requires: libgcrypt
 Requires: gnome-doc-utils 
-Requires: GConf2
+Requires: scrollkeeper
+Requires(post): GConf2
 Requires(post): desktop-file-utils
+Requires(preun): GConf2
 Requires(postun): desktop-file-utils
 BuildRequires: pango-devel >= %{pango_version}
 BuildRequires: gtk2-devel >= %{gtk2_version}
@@ -90,11 +91,6 @@ desktop-file-install --vendor gnome --delete-original       \
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%preun
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/yelp.schemas > /dev/null
-update-desktop-database &> /dev/null ||:
-
 %post
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/yelp.schemas > /dev/null
@@ -106,6 +102,12 @@ if [ -x /usr/bin/gtk-update-icon-cache ]; then
   /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
 fi
 
+%preun
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/yelp.schemas > /dev/null
+
+%postun
+update-desktop-database &> /dev/null ||:
 
 %files -f %{name}.lang
 %defattr(-,root,root)
@@ -117,6 +119,9 @@ fi
 %{_datadir}/yelp
 
 %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.1-2
 - Update to 2.14.1