diff --git a/.cvsignore b/.cvsignore
index b41b17d..468118f 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-volume-manager-0.9.9.tar.gz
+gnome-volume-manager-0.9.10.tar.gz
diff --git a/gnome-volume-manager-0.9.10.add-to-base.patch b/gnome-volume-manager-0.9.10.add-to-base.patch
new file mode 100644
index 0000000..74d7290
--- /dev/null
+++ b/gnome-volume-manager-0.9.10.add-to-base.patch
@@ -0,0 +1,11 @@
+--- gnome-volume-manager-0.9.10/gnome-volume-properties.desktop.in.addtobase	2004-08-31 13:30:04.591853000 -0400
++++ gnome-volume-manager-0.9.10/gnome-volume-properties.desktop.in	2004-08-31 13:31:07.369012000 -0400
+@@ -6,7 +6,7 @@
+ Exec=gnome-volume-properties
+ Terminal=false
+ Type=Application
+-Categories=Application;Settings;
++Categories=Application;Settings;X-Red-Hat-Base
+ OnlyShowIn=GNOME;
+ X-GNOME-Bugzilla-Bugzilla=GNOME
+ X-GNOME-Bugzilla-Product=gnome-volume-manager
diff --git a/gnome-volume-manager-0.9.10.photo-import-default.patch b/gnome-volume-manager-0.9.10.photo-import-default.patch
new file mode 100644
index 0000000..75f4c73
--- /dev/null
+++ b/gnome-volume-manager-0.9.10.photo-import-default.patch
@@ -0,0 +1,11 @@
+--- gnome-volume-manager-0.9.10/gnome-volume-manager.schemas.in.photo-import-default	2004-08-31 13:36:20.198869000 -0400
++++ gnome-volume-manager-0.9.10/gnome-volume-manager.schemas.in	2004-08-31 13:35:35.612500000 -0400
+@@ -146,7 +146,7 @@
+         <key>/schemas/desktop/gnome/volume_manager/autophoto_command</key>
+ 	<applyto>/desktop/gnome/volume_manager/autophoto_command</applyto>
+ 	<type>string</type>
+-	<default>gthumb --import-photos</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 
diff --git a/gnome-volume-manager.spec b/gnome-volume-manager.spec
index 93ed277..de0f7d1 100644
--- a/gnome-volume-manager.spec
+++ b/gnome-volume-manager.spec
@@ -1,12 +1,14 @@
 Summary: The GNOME Volume Manager
 Name: gnome-volume-manager
-Version: 0.9.9
-Release: 2
+Version: 0.9.10
+Release: 1 
 License: GPL
 Group: Applications/System
 Source0: gnome-volume-manager-%{version}.tar.gz
 Source1: magicdev-wrapper
-Patch0: gvm-mount-unmount-3.patch
+Source2: gthumb-import
+Patch0: gnome-volume-manager-0.9.10.add-to-base.patch
+Patch1: gnome-volume-manager-0.9.10.photo-import-default.patch 
 BuildRoot: /var/tmp/%{name}-root
 BuildPrereq: libgnomeui-devel, libglade2-devel, hal-devel, dbus-devel >= 0.22
 Requires: gnome-mime-data, hal >= 0.2.97, kernel >= 2.6, control-center >= 2.0
@@ -28,7 +30,8 @@ applications.
 
 %prep
 %setup -q
-%patch0 -p0 
+%patch0 -p1 -b .add-to-base
+%patch1 -p1 -b .photo-import-default 
 
 %build
 %configure
@@ -39,6 +42,7 @@ rm -rf $RPM_BUILD_ROOT
 %makeinstall
 
 install -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/magicdev
+install -m 755 %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/gthumb-import
 
 %find_lang %name
 
@@ -61,6 +65,13 @@ done
 %{_sysconfdir}/gconf/schemas/*.schemas
 
 %changelog
+* Tue Aug 31 2004 John (J5) Palmieri <johnp@redhat.com>
+- Update to upstream release 0.9.10
+- Add gthumb-import wrapper to import photos correctly
+- Add patch to set gthumb-import as the default photo importer
+- Add patch to put desktop file in the X-Red-Hat-Base Catagory
+- Fixes RH Bug 130866
+
 * Fri Aug 20 2004 John (J5) Palmieri <johnp@redhat.com>
 - Added Provides: magicdev to fix conflict
 
diff --git a/gthumb-import b/gthumb-import
new file mode 100755
index 0000000..59925c9
--- /dev/null
+++ b/gthumb-import
@@ -0,0 +1,7 @@
+#!/bin/sh
+MOUNT_POINT=`hal-get-property --udi "$1" --key volume.mount_point`
+if test "$MOUNT_POINT" == ""; then
+	gthumb --import-photos
+else
+	gthumb $MOUNT_POINT
+fi
diff --git a/sources b/sources
index 39c062b..1655a81 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5352a2a3f8587a596054303dc349bde3  gnome-volume-manager-0.9.9.tar.gz
+4e04c20232bd621bed25d1e838a41990  gnome-volume-manager-0.9.10.tar.gz