diff --git a/rb-fix-daap-plugin.patch b/rb-fix-daap-plugin.patch
new file mode 100644
index 0000000..a58369d
--- /dev/null
+++ b/rb-fix-daap-plugin.patch
@@ -0,0 +1,21 @@
+commit 3bf2e8b95d5a2c8000a7e46b73f0b92c5319e927
+Author: Christophe Fergeau <cfergeau@mandriva.com>
+Date:   Sat Oct 10 14:16:35 2009 +0200
+
+    link daap plugin with RHYTHMBOX_LIBS (bug #597899)
+    
+    The DAAP plugin uses libsoup, so it needs to link with libsoup which is
+    part of RHYTHMBOX_LIBS.
+
+diff --git a/plugins/daap/Makefile.am b/plugins/daap/Makefile.am
+index 90935ee..dfc1058 100644
+--- a/plugins/daap/Makefile.am
++++ b/plugins/daap/Makefile.am
+@@ -35,6 +35,7 @@ libdaap_la_LIBTOOLFLAGS = --tag=disable-static
+ libdaap_la_LIBADD = 					\
+ 	$(top_builddir)/shell/librhythmbox-core.la	\
+ 	$(DBUS_LIBS)					\
++	$(RHYTHMBOX_LIBS)				\
+ 	$(MDNS_LIBS)
+ 
+ INCLUDES = 						\
diff --git a/rhythmbox.spec b/rhythmbox.spec
index 5023f17..eef86dd 100644
--- a/rhythmbox.spec
+++ b/rhythmbox.spec
@@ -3,7 +3,7 @@
 Name: rhythmbox
 Summary: Music Management Application
 Version: 0.12.5
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+ with exceptions and GFDL
 Group: Applications/Multimedia
 URL: http://projects.gnome.org/rhythmbox/
@@ -53,6 +53,8 @@ Patch0: rhythmbox-0.12.5-use-gnome-session-to-inhibit.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=525826
 BuildRequires: automake autoconf libtool
 Patch1: 0001-Use-C-only-for-the-browser-plugin.patch
+# https://bugzilla.gnome.org/show_bug.cgi?id=597899
+Patch2: rb-fix-daap-plugin.patch
 
 %description
 Rhythmbox is an integrated music management application based on the powerful
@@ -86,8 +88,9 @@ from, and sending media to UPnP/DLNA network devices.
 %prep
 %setup -q
 %patch0 -p1 -b .inhibit-gnome-session
-%patch1 -p1 -b .itms
 
+%patch1 -p1 -b .itms
+%patch2 -p1 -b .daap
 autoreconf -i
 
 # Use the installed louie, not the one in Coherence
@@ -219,6 +222,9 @@ fi
 %{_libdir}/rhythmbox/plugins/upnp_coherence
 
 %changelog
+* Tue Oct 13 2009 Bastien Nocera <bnocera@redhat.com> 0.12.5-6
+- Fix DAAP plugin linkage
+
 * Wed Oct 07 2009 Bastien Nocera <bnocera@redhat.com> 0.12.5-5
 - Remove work-around for brasero bug