diff --git a/gnome-volume-manager-1.5.11-rh-defaults.patch b/gnome-volume-manager-1.5.11-rh-defaults.patch
deleted file mode 100644
index 8914b87..0000000
--- a/gnome-volume-manager-1.5.11-rh-defaults.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- gnome-volume-manager-2.15.0/gnome-volume-manager.schemas.in.rh-defaults	2006-07-20 16:48:23.000000000 -0400
-+++ gnome-volume-manager-2.15.0/gnome-volume-manager.schemas.in	2006-08-03 15:27:25.000000000 -0400
-@@ -189,7 +189,7 @@
-         <key>/schemas/desktop/gnome/volume_manager/autophoto</key>
- 	<applyto>/desktop/gnome/volume_manager/autophoto</applyto>
- 	<type>bool</type>
--	<default>false</default>
-+	<default>true</default>
- 	<locale name="C">
- 	  <short>Run photo management command</short>
- 	  <long>Whether, when a digital camera is connected or media from a
-@@ -202,7 +202,7 @@
-         <key>/schemas/desktop/gnome/volume_manager/autophoto_command</key>
- 	<applyto>/desktop/gnome/volume_manager/autophoto_command</applyto>
- 	<type>string</type>
--	<default></default>
-+	<default>gthumb-import %h</default>
- 	<locale name="C">
- 	  <short>Photo management command</short>
- 	  <long>Command to run when a digital camera is connected or media 
-@@ -237,7 +237,7 @@
-         <key>/schemas/desktop/gnome/volume_manager/autoprinter</key>
- 	<applyto>/desktop/gnome/volume_manager/autoprinter</applyto>
- 	<type>bool</type>
--	<default>true</default>
-+	<default>false</default>
- 	<locale name="C">
- 	  <short>Run printer program</short>
- 	  <long>Whether, when a printer is connected, gnome-volume-manager should run
-@@ -249,7 +249,7 @@
-         <key>/schemas/desktop/gnome/volume_manager/autoprinter_command</key>
- 	<applyto>/desktop/gnome/volume_manager/autoprinter_command</applyto>
- 	<type>string</type>
--	<default>gnome-printer-add hal://%h</default>
-+	<default></default>
- 	<locale name="C">
- 	  <short>printer command</short>
- 	  <long>Command to run when a printer is connected.</long>
diff --git a/gnome-volume-manager-2.17.0-rh-defaults.patch b/gnome-volume-manager-2.17.0-rh-defaults.patch
new file mode 100644
index 0000000..e3d9a72
--- /dev/null
+++ b/gnome-volume-manager-2.17.0-rh-defaults.patch
@@ -0,0 +1,47 @@
+--- gnome-volume-manager-2.17.0/gnome-volume-manager.schemas.in.rh-defaults	2006-11-07 18:01:15.000000000 +0000
++++ gnome-volume-manager-2.17.0/gnome-volume-manager.schemas.in	2007-10-05 17:48:46.000000000 +0100
+@@ -98,7 +98,7 @@
+         <key>/schemas/desktop/gnome/volume_manager/autoplay_cda_command</key>
+ 	<applyto>/desktop/gnome/volume_manager/autoplay_cda_command</applyto>
+ 	<type>string</type>
+-	<default>totem %d</default>
++	<default>rhythmbox %d</default>
+ 	<locale name="C">
+ 	  <short>CD play command</short>
+ 	  <long>Command to run when an audio CD is inserted.</long>
+@@ -189,7 +189,7 @@
+         <key>/schemas/desktop/gnome/volume_manager/autophoto</key>
+ 	<applyto>/desktop/gnome/volume_manager/autophoto</applyto>
+ 	<type>bool</type>
+-	<default>false</default>
++	<default>true</default>
+ 	<locale name="C">
+ 	  <short>Run photo management command</short>
+ 	  <long>Whether, when a digital camera is connected or media from a
+@@ -202,7 +202,7 @@
+         <key>/schemas/desktop/gnome/volume_manager/autophoto_command</key>
+ 	<applyto>/desktop/gnome/volume_manager/autophoto_command</applyto>
+ 	<type>string</type>
+-	<default></default>
++	<default>gthumb-import %h</default>
+ 	<locale name="C">
+ 	  <short>Photo management command</short>
+ 	  <long>Command to run when a digital camera is connected or media 
+@@ -237,7 +237,7 @@
+         <key>/schemas/desktop/gnome/volume_manager/autoprinter</key>
+ 	<applyto>/desktop/gnome/volume_manager/autoprinter</applyto>
+ 	<type>bool</type>
+-	<default>true</default>
++	<default>false</default>
+ 	<locale name="C">
+ 	  <short>Run printer program</short>
+ 	  <long>Whether, when a printer is connected, gnome-volume-manager should run
+@@ -249,7 +249,7 @@
+         <key>/schemas/desktop/gnome/volume_manager/autoprinter_command</key>
+ 	<applyto>/desktop/gnome/volume_manager/autoprinter_command</applyto>
+ 	<type>string</type>
+-	<default>gnome-printer-add hal://%h</default>
++	<default></default>
+ 	<locale name="C">
+ 	  <short>printer command</short>
+ 	  <long>Command to run when a printer is connected.</long>
diff --git a/gnome-volume-manager.spec b/gnome-volume-manager.spec
index b13642d..1900378 100644
--- a/gnome-volume-manager.spec
+++ b/gnome-volume-manager.spec
@@ -1,7 +1,7 @@
 Summary: The GNOME Volume Manager
 Name: gnome-volume-manager
 Version: 2.17.0
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPLv2
 Group: Applications/System
 Source0: http://download.gnome.org/sources/gnome-volume-manager/2.17/gnome-volume-manager-%{version}.tar.bz2
@@ -10,7 +10,7 @@ Source2: gthumb-import
 Source3: gnome-cdda-handler
 Source4: cdda-url-handler.schemas
 Patch0: gnome-volume-manager-0.9.10.add-to-base.patch
-Patch1: gnome-volume-manager-1.5.11-rh-defaults.patch
+Patch1: gnome-volume-manager-2.17.0-rh-defaults.patch
 Patch2: gnome-volume-manager-2.17.0-add-console-user-check.patch 
 Patch3: gnome-volume-manager-2.15.0-check-screensaver.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
@@ -114,6 +114,9 @@ fi
 %{_datadir}/gnome/autostart/gnome-volume-manager.desktop
 
 %changelog
+* Fri Oct 05 2007 - Bastien Nocera <bnocera@redhat.com> - 2.17.0-9
+- Change the default CD player to rhythmbox (#278331)
+
 * Mon Oct  1 2007 Matthias Clasen <mclasen@redhat.com> - 2.17.0-8
 - Drop the hard gthumb requirement (#228759)
 - Fix license field