diff --git a/gnome-user-share-0.41.tar.bz2 b/gnome-user-share-0.41.tar.bz2
deleted file mode 100644
index f47d7f4..0000000
--- a/gnome-user-share-0.41.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:673aa5c7bd79c35baa16e5f3186bf493c956042c12a32608492e69a34aa92a5b
-size 359397
diff --git a/gnome-user-share-2.25.91.tar.bz2 b/gnome-user-share-2.25.91.tar.bz2
new file mode 100644
index 0000000..b5ccea6
--- /dev/null
+++ b/gnome-user-share-2.25.91.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:edeec954c5325a623918f4633ca45c1e594a05637d9273475b9a3f0fa9bfbcca
+size 531745
diff --git a/gnome-user-share.changes b/gnome-user-share.changes
index 8b310d3..394c08e 100644
--- a/gnome-user-share.changes
+++ b/gnome-user-share.changes
@@ -1,3 +1,30 @@
+-------------------------------------------------------------------
+Thu Feb  5 14:02:58 CET 2009 - vuntz@novell.com
+
+- Update to version 2.25.91:
+  + Fix httpd configuration file
+- Changes from version 2.26.90:
+  + Use mod_dnssd 0.6 to export the user TXT record, necessary to
+    work with the latest gvfs
+  + Check for httpd version and binary location at run-time, rather
+    than compile-time
+  + Documentation updates
+- Changes from version 0.41:
+  + Use Apache's mod_dnssd module instead of doing the work
+    ourselves
+  + Refuse to run as root, so as to avoid sensitive files being
+    shared
+  + Add end-user documentation, and UI changes to match
+  + Make it possible for build daemons to build without Apache
+    installed
+- Remove BuildRequires on apache2-prefork: we can build without
+  having apache installed now.
+- Remove BuildRequires on libavahi-glib-devel: this is not needed
+  anymore: mod_dnssd is now used.
+- Add gnome-doc-utils-devel BuildRequires.
+- Do not call autoreconf.
+- Use fdupes.
+
 -------------------------------------------------------------------
 Sat Dec 20 10:36:28 EST 2008 - mboman@suse.de
 
diff --git a/gnome-user-share.spec b/gnome-user-share.spec
index 2c3f4cc..5dd1dd9 100644
--- a/gnome-user-share.spec
+++ b/gnome-user-share.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package gnome-user-share (Version 0.41)
+# spec file for package gnome-user-share (Version 2.25.91)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -19,7 +19,11 @@
 
 Name:           gnome-user-share
 Summary:        GNOME user file sharing
-Version:        0.41
+# FIXME: we need to package mod_dnssd to have file-sharing over
+# webdav to correctly be announced through avahi.
+# We'll want to have a Suggests here, and a Supplements in
+# mod_dnssd (supplements(apache2-prefork:gnome-user-share))
+Version:        2.25.91
 Release:        1
 License:        GPL v2 or later
 Group:          Productivity/Networking/File-Sharing
@@ -29,12 +33,10 @@ Patch3:         gnome-user-share-soft-dep-apache.patch
 Url:            http://www.gnome.org/
 BuildRequires:  gconf2-devel
 BuildRequires:  dbus-1-glib-devel
+BuildRequires:  fdupes
+BuildRequires:  gnome-doc-utils-devel
 BuildRequires:  gtk2-devel
-# We need some apache2 binary during the build. Let's use the prefork one,
-# although which one doesn't really matter.
-BuildRequires:  apache2-prefork
 BuildRequires:  intltool
-BuildRequires:  libavahi-glib-devel
 BuildRequires:  libnotify-devel
 BuildRequires:  update-desktop-files
 Requires:       obex-data-server
@@ -70,10 +72,10 @@ Authors:
 %patch3 -p1
 
 %build
-autoreconf -f -i
 %configure \
     --with-modules-path=%{_libdir}/apache2/ \
     --disable-schemas-install \
+    --disable-scrollkeeper \
     --libexecdir=%{_libexecdir}/gnome-user-share
 make %{?jobs:-j%jobs}
 
@@ -84,6 +86,7 @@ make %{?jobs:-j%jobs}
 %find_lang %{name}
 %find_gconf_schemas
 cat %{name}.schemas_list >%{name}.lst
+%fdupes $RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -97,17 +100,39 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc README COPYING NEWS
 %{_bindir}/*
-%dir %{_libexecdir}/gnome-user-share
-%{_libexecdir}/gnome-user-share/gnome-user-share
+%{_libexecdir}/gnome-user-share
 %{_datadir}/applications/*
 %{_datadir}/gnome-user-share
 %{_sysconfdir}/xdg/autostart/gnome-user-share.desktop
-#%{_sysconfdir}/gconf/schemas/*
 %{_datadir}/icons/hicolor/*/apps/gnome-obex-server.png
 
 %files lang -f %{name}.lang
 
 %changelog
+* Thu Feb 05 2009 vuntz@novell.com
+- Update to version 2.25.91:
+  + Fix httpd configuration file
+- Changes from version 2.26.90:
+  + Use mod_dnssd 0.6 to export the user TXT record, necessary to
+  work with the latest gvfs
+  + Check for httpd version and binary location at run-time, rather
+  than compile-time
+  + Documentation updates
+- Changes from version 0.41:
+  + Use Apache's mod_dnssd module instead of doing the work
+  ourselves
+  + Refuse to run as root, so as to avoid sensitive files being
+  shared
+  + Add end-user documentation, and UI changes to match
+  + Make it possible for build daemons to build without Apache
+  installed
+- Remove BuildRequires on apache2-prefork: we can build without
+  having apache installed now.
+- Remove BuildRequires on libavahi-glib-devel: this is not needed
+  anymore: mod_dnssd is now used.
+- Add gnome-doc-utils-devel BuildRequires.
+- Do not call autoreconf.
+- Use fdupes.
 * Sat Dec 20 2008 mboman@suse.de
 - Update to version 0.41:
   + Port to BlueZ 4.x API
@@ -122,6 +147,6 @@ rm -rf $RPM_BUILD_ROOT
 * Sat Nov 22 2008 aj@suse.de
 - Fix package list to fix build.
 - gnome-user-share helper is a binary, put it into libexecdir.
-* Wed Nov 19 2008 vuntz@novell.com
+* Thu Nov 20 2008 vuntz@novell.com
 - Import package, based on the one from Fedora. Required to fix
   bnc#402048.