diff --git a/.cvsignore b/.cvsignore
index 2d57e86..27d0dbd 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-nautilus-2.15.1.tar.bz2
+nautilus-2.15.2.tar.bz2
diff --git a/nautilus-2.15.2-format.patch b/nautilus-2.15.2-format.patch
new file mode 100644
index 0000000..ec023bf
--- /dev/null
+++ b/nautilus-2.15.2-format.patch
@@ -0,0 +1,55 @@
+--- nautilus-2.15.2/src/file-manager/fm-directory-view.c.format	2006-06-13 10:35:04.000000000 -0400
++++ nautilus-2.15.2/src/file-manager/fm-directory-view.c	2006-06-13 10:49:07.000000000 -0400
+@@ -6315,6 +6315,8 @@
+ 	GList *selection, *l;
+ 	GnomeVFSDrive *drive;
+ 	FMDirectoryView *view;
++        char *device_path;
++        char *cmdline;
+ 
+         view = FM_DIRECTORY_VIEW (data);
+ 	
+@@ -6324,9 +6326,18 @@
+ 
+ 		if (nautilus_file_has_drive (file)) {
+ 			drive = nautilus_file_get_drive (file);
++                        device_path = gnome_vfs_drive_get_device_path (drive);
++
+ 			if (gnome_vfs_drive_get_device_type (drive) == GNOME_VFS_DEVICE_TYPE_FLOPPY) {
+-				g_spawn_command_line_async ("gfloppy", NULL);
++                                cmdline = g_strconcat ("gfloppy ", device_path, NULL);
++
+ 			}
++                        else {
++                               cmdline = g_strconcat ("userformat ", device_path, NULL);
++                        }
++                        g_spawn_command_line_async (cmdline, NULL);
++                        g_free (cmdline);
++                        g_free (device_path);
+ 		}
+ 	}	
+ 	nautilus_file_list_free (selection);
+@@ -7188,17 +7199,18 @@
+ 	} else if (nautilus_file_has_drive (file)) {
+ 		drive = nautilus_file_get_drive (file);
+ 		*show_eject = eject_for_type (gnome_vfs_drive_get_device_type (drive));
++		if ((gnome_vfs_drive_get_device_type (drive) == GNOME_VFS_DEVICE_TYPE_FLOPPY &&
++		     g_find_program_in_path ("gfloppy")) ||
++		    g_find_program_in_path ("userformat")) {
++			*show_format = TRUE;
++		}
+ 		if (gnome_vfs_drive_is_mounted (drive)) {
+ 			*show_unmount = TRUE;
++			*show_format = FALSE;
+ 		} else {
+ 			*show_mount = TRUE;
+ 		}
+ 
+-		if (gnome_vfs_drive_get_device_type (drive) == GNOME_VFS_DEVICE_TYPE_FLOPPY &&
+-		    !gnome_vfs_drive_is_mounted (drive) &&
+-		    g_find_program_in_path ("gfloppy")) {
+-			*show_format = TRUE;
+-		}
+ 	} else if (nautilus_file_is_nautilus_link (file)) {
+ 		uri = nautilus_file_get_activation_uri (file);
+ 		if (uri != NULL &&
diff --git a/nautilus.spec b/nautilus.spec
index cc56f4b..0af0fc8 100644
--- a/nautilus.spec
+++ b/nautilus.spec
@@ -17,8 +17,8 @@
 
 Name:		nautilus
 Summary:        Nautilus is a file manager for GNOME.
-Version: 	2.15.1
-Release:	2
+Version: 	2.15.2
+Release:	1
 License: 	GPL
 Group:          User Interface/Desktops
 Source: 	ftp://ftp.gnome.org/pub/GNOME/sources/2.7/%{name}/%{name}-%{version}.tar.bz2
@@ -69,6 +69,8 @@ BuildRequires:  libexif-devel >= %{libexif_version}
 BuildRequires:  gettext
 %ifnarch  s390 s390x ppc64
 BuildRequires:  libbeagle-devel
+%else
+%define disable_beagle --disable-beagle
 %endif
 # For intltool:
 BuildRequires: perl-XML-Parser >= 2.31-16
@@ -82,7 +84,7 @@ Obsoletes:      nautilus-media
 
 # Some changes to default config
 Patch1:         nautilus-2.5.7-rhconfig.patch
-Patch2:         nautilus-2.13-format.patch
+Patch2:         nautilus-2.15.2-format.patch
 Patch3:		background-no-delay.patch
 
 %description
@@ -102,7 +104,7 @@ GNOME desktop project.
 %build
 
 libtoolize --force --copy
-CFLAGS="$RPM_OPT_FLAGS -g -DUGLY_HACK_TO_DETECT_KDE" %configure --disable-more-warnings --disable-update-mimedb
+CFLAGS="$RPM_OPT_FLAGS -g -DUGLY_HACK_TO_DETECT_KDE" %configure --disable-more-warnings --disable-update-mimedb %{disable_beagle}
 
 export tagname=CC
 LANG=en_US make LIBTOOL=/usr/bin/libtool %{?_smp_mflags}
@@ -176,6 +178,9 @@ scrollkeeper-update
 %{_includedir}/nautilus
 
 %changelog
+* Tue Jun 13 2006 Matthias Clasen <mclasen@redhat.com> - 2.15.2-1
+- Update to 2.15.1
+
 * Sun May 21 2006 Matthias Clasen <mclasen@redhat.com> - 2.15.1-2
 - Add missing BuildRequires (#129184)
 
diff --git a/sources b/sources
index b1cb1cf..46edb7b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-57d5dea7758205258d85afc30cb3afaf  nautilus-2.15.1.tar.bz2
+1c175ed790330aa48bdb62de8ac98343  nautilus-2.15.2.tar.bz2