diff --git a/.cvsignore b/.cvsignore
index e3f4988..6de6e81 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -9,3 +9,4 @@ nautilus-2.11.90.tar.bz2
 nautilus-2.11.91.tar.bz2
 nautilus-2.12.0.tar.bz2
 nautilus-2.12.1.tar.bz2
+nautilus-2.13.2.tar.bz2
diff --git a/nautilus-2.13-format.patch b/nautilus-2.13-format.patch
new file mode 100644
index 0000000..ce91136
--- /dev/null
+++ b/nautilus-2.13-format.patch
@@ -0,0 +1,53 @@
+--- nautilus-2.13.2/src/file-manager/fm-directory-view.c.format	2005-12-02 08:41:23.000000000 -0500
++++ nautilus-2.13.2/src/file-manager/fm-directory-view.c	2005-12-02 08:46:44.000000000 -0500
+@@ -5864,6 +5864,8 @@
+ 	NautilusFile *file;
+ 	GList *selection, *l;
+ 	GnomeVFSDrive *drive;
++        char *device_path;
++        char *cmdline;
+ 	FMDirectoryView *view;
+ 
+         view = FM_DIRECTORY_VIEW (data);
+@@ -5874,9 +5876,16 @@
+ 
+ 		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);
+@@ -6607,16 +6616,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 &&
+-		    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 3bc0d9f..fa7ca5f 100644
--- a/nautilus.spec
+++ b/nautilus.spec
@@ -17,8 +17,8 @@
 
 Name:		nautilus
 Summary:        Nautilus is a file manager for GNOME.
-Version: 	2.12.1
-Release: 	6
+Version: 	2.13.2
+Release: 	1
 License: 	GPL
 Group:          User Interface/Desktops
 Source: 	ftp://ftp.gnome.org/pub/GNOME/sources/2.7/%{name}/%{name}-%{version}.tar.bz2
@@ -78,10 +78,7 @@ Obsoletes:      nautilus-media
 
 # Some changes to default config
 Patch1:         nautilus-2.5.7-rhconfig.patch
-# Partially upstream in 2.13
-Patch2:         nautilus-2.12.1-format.patch
-# Upstream in 2.13
-Patch3: 	nautilus-2.12.1-stretch.patch
+Patch2:         nautilus-2.13-format.patch
 
 %description
 Nautilus integrates access to files, applications, media,
@@ -95,7 +92,6 @@ GNOME desktop project.
 
 %patch1 -p1 -b .rhconfig
 %patch2 -p1 -b .format
-%patch3 -p1 -b .stretch
 
 %build
 
@@ -172,6 +168,10 @@ scrollkeeper-update
 %{_includedir}/nautilus
 
 %changelog
+* Fri Dec  2 2005 Matthias Clasen <mclasen@redhat.com> 2.13.2-1
+- Update to 2.13.2
+- Update patches
+
 * Tue Nov  1 2005 Alexander Larsson <alexl@redhat.com> - 2.12.1-6
 - Switch XFree86-devel buildrequirement to libX11-devel
 
diff --git a/sources b/sources
index 213fb7c..442d5ae 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-61878b1c3f9bee37cd568e17b31d66b1  nautilus-2.12.1.tar.bz2
+0cc0df8b01b095103f63c8fe3580d7ca  nautilus-2.13.2.tar.bz2