diff -uNr rhythmbox-0.9.8/data/Makefile.in rhythmbox-0.9.8-new/data/Makefile.in
--- rhythmbox-0.9.8/data/Makefile.in	2007-02-21 04:52:21.000000000 -0500
+++ rhythmbox-0.9.8-new/data/Makefile.in	2007-03-13 13:39:21.000000000 -0400
@@ -691,7 +691,7 @@
 	install-data-local install-playlistsDATA install-schemaDATA \
 	install-serviceDATA
 	@$(NORMAL_INSTALL)
-	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
+	$(MAKE) $(AM_MAKEFLAGS)
 
 install-exec-am:
 
diff -uNr rhythmbox-0.9.8/plugins/cd-recorder/rb-recorder-gst.c rhythmbox-0.9.8-new/plugins/cd-recorder/rb-recorder-gst.c
--- rhythmbox-0.9.8/plugins/cd-recorder/rb-recorder-gst.c	2007-01-09 01:42:20.000000000 -0500
+++ rhythmbox-0.9.8-new/plugins/cd-recorder/rb-recorder-gst.c	2007-03-13 10:45:52.000000000 -0400
@@ -26,7 +26,9 @@
 #include <string.h>
 #include <math.h>
 #include <time.h>
+#ifndef __APPLE__
 #include <sys/vfs.h>
+#endif
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
diff -uNr rhythmbox-0.9.8/plugins/daap/rb-daap-src.c rhythmbox-0.9.8-new/plugins/daap/rb-daap-src.c
--- rhythmbox-0.9.8/plugins/daap/rb-daap-src.c	2007-02-12 08:47:02.000000000 -0500
+++ rhythmbox-0.9.8-new/plugins/daap/rb-daap-src.c	2007-03-13 10:49:48.000000000 -0400
@@ -49,6 +49,10 @@
 #include "rb-debug.h"
 #include "rb-daap-plugin.h"
 
+#ifdef __APPLE__
+#define MSG_NOSIGNAL SO_NOSIGPIPE
+#endif
+
 #define RB_TYPE_DAAP_SRC (rb_daap_src_get_type())
 #define RB_DAAP_SRC(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),RB_TYPE_DAAP_SRC,RBDAAPSrc))
 #define RB_DAAP_SRC_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass),RB_TYPE_DAAP_SRC,RBDAAPSrcClass))