diff --git a/rb-disable-broken-daap-stream-playback.patch b/rb-disable-broken-daap-stream-playback.patch
deleted file mode 100644
index a718e40..0000000
--- a/rb-disable-broken-daap-stream-playback.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: rb-daap-source.c
-===================================================================
---- rb-daap-source.c	(revision 5447)
-+++ rb-daap-source.c	(working copy)
-@@ -66,8 +66,9 @@
- static char * rb_daap_source_get_browser_key (RBSource *source);
- static char * rb_daap_source_get_paned_key (RBBrowserSource *source);
- static void rb_daap_source_get_status (RBSource *source, char **text, char **progress_text, float *progress);
-+#if 0
- static char * rb_daap_source_get_playback_uri (RhythmDBEntry *entry, gpointer data);
--
-+#endif
- #define CONF_STATE_SORTING CONF_PREFIX "/state/daap/sorting"
- #define CONF_STATE_PANED_POSITION CONF_PREFIX "/state/daap/paned_position"
- #define CONF_STATE_SHOW_BROWSER CONF_PREFIX "/state/daap/show_browser"
-@@ -277,7 +278,9 @@
- 	g_free (entry_type_name);
- 	type->save_to_disk = FALSE;
- 	type->category = RHYTHMDB_ENTRY_NORMAL;
-+#if 0
- 	type->get_playback_uri = (RhythmDBEntryStringFunc) rb_daap_source_get_playback_uri;
-+#endif
- 	g_object_unref (db);
- 
- 	icon = rb_daap_plugin_get_icon (RB_DAAP_PLUGIN (plugin), password_protected, FALSE);
-@@ -740,6 +743,7 @@
- 	RB_SOURCE_CLASS (rb_daap_source_parent_class)->impl_get_status (source, text, progress_text, progress);
- }
- 
-+#if 0
- static char *
- rb_daap_source_get_playback_uri (RhythmDBEntry *entry, gpointer data)
- {
-@@ -752,4 +756,4 @@
- 
- 	return g_strdup (location);
- }
--
-+#endif
diff --git a/rb-fix-broken-daap-playback.patch b/rb-fix-broken-daap-playback.patch
new file mode 100644
index 0000000..690b539
--- /dev/null
+++ b/rb-fix-broken-daap-playback.patch
@@ -0,0 +1,13 @@
+Index: plugins/daap/rb-daap-connection.c
+===================================================================
+--- plugins/daap/rb-daap-connection.c	(revision 5447)
++++ plugins/daap/rb-daap-connection.c	(working copy)
+@@ -1055,7 +1055,7 @@
+ 		entry_set_string_prop (priv->db, entry, RHYTHMDB_PROP_GENRE, genre);
+ 
+ 		/* stream URI property is stored as a mountpoint for get_playback_uri */
+-		if (streamURI) {
++		if (streamURI && *streamURI != '\0') {
+ 			entry_set_string_prop (priv->db, entry, RHYTHMDB_PROP_MOUNTPOINT, streamURI);
+ 		}
+ 
diff --git a/rhythmbox.spec b/rhythmbox.spec
index 90a8f25..8e301f9 100644
--- a/rhythmbox.spec
+++ b/rhythmbox.spec
@@ -3,7 +3,7 @@
 Name: rhythmbox
 Summary: Music Management Application 
 Version: 0.11.3
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+ and GFDL+
 Group: Applications/Multimedia
 URL: http://www.gnome.org/projects/rhythmbox/
@@ -49,7 +49,8 @@ ExcludeArch:    s390 s390x
 
 # http://bugzilla.gnome.org/show_bug.cgi?id=346434
 Patch1: rb-delete-ipod-tracks.patch
-Patch2: rb-disable-broken-daap-stream-playback.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=497430
+Patch2: rb-fix-broken-daap-playback.patch
 
 %description
 Rhythmbox is an integrated music management application based on the powerful
@@ -81,9 +82,7 @@ UPnP/DLNA network devices.
 pushd plugins/ipod/
 %patch1 -p0 -b .ipod-trash
 popd
-pushd plugins/daap/
 %patch2 -p0 -b .broken-daap
-popd
 
 %build
 
@@ -194,6 +193,9 @@ fi
 %{_libdir}/rhythmbox/plugins/upnp_coherence
 
 %changelog
+* Sat Nov 17 2007 - Bastien Nocera <bnocera@redhat.com> - 0.11.3-4
+- Better DAAP fix (#382351)
+
 * Fri Nov 16 2007 - Bastien Nocera <bnocera@redhat.com> - 0.11.3-3
 - Try to fix DAAP playback (#382351)