diff --git a/nautilus-2.22.1-hide-white-screen.patch b/nautilus-2.22.1-hide-white-screen.patch
new file mode 100644
index 0000000..c086189
--- /dev/null
+++ b/nautilus-2.22.1-hide-white-screen.patch
@@ -0,0 +1,29 @@
+--- nautilus-2.22.1/libbackground/preferences.c.hide-white-screen	2008-03-31 10:37:43.000000000 -0400
++++ nautilus-2.22.1/libbackground/preferences.c	2008-03-31 10:39:27.000000000 -0400
+@@ -252,6 +252,26 @@ bg_preferences_load (BGPreferences *pref
+ 		else
+ 			prefs->wallpaper_filename = g_filename_from_utf8 (tmp, -1, NULL,
+ 									  NULL, NULL);
++
++		if (!g_file_test (prefs->wallpaper_filename, G_FILE_TEST_EXISTS)) {
++			GConfValue *default_value;
++			default_value = gconf_client_get_default_from_schema (client,
++									      BG_PREFERENCES_DRAW_BACKGROUND, NULL);
++			if (default_value != NULL) {
++				prefs->enabled = gconf_value_get_bool (default_value);
++				gconf_value_free (default_value);
++
++				g_free (prefs->wallpaper_filename);
++				prefs->wallpaper_filename = NULL;
++
++				default_value = gconf_client_get_default_from_schema (client,
++										      BG_PREFERENCES_PICTURE_FILENAME, NULL);
++				if (default_value != NULL) {
++					prefs->wallpaper_filename = g_strdup (gconf_value_get_string (default_value));
++					gconf_value_free (default_value);
++				}
++			}
++		}
+ 	}
+ 	g_free (tmp);
+ 
diff --git a/nautilus.spec b/nautilus.spec
index e4fb76c..2409671 100644
--- a/nautilus.spec
+++ b/nautilus.spec
@@ -19,7 +19,7 @@
 Name:		nautilus
 Summary:        Nautilus is a file manager for GNOME
 Version: 	2.22.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 License: 	GPLv2+
 Group:          User Interface/Desktops
 Source: 	http://download.gnome.org/sources/%{name}/2.22/%{name}-%{version}.tar.bz2
@@ -82,6 +82,7 @@ Patch3:		background-no-delay.patch
 Patch6:         nautilus-2.21.1-dynamic-search-r2.patch
 
 Patch7:		rtl-fix.patch
+Patch8:		nautilus-2.22.1-hide-white-screen.patch
 
 
 %description
@@ -118,6 +119,7 @@ for writing nautilus extensions.
 #%patch5 -p1 -b .selinux
 %patch6 -p1 -b .dynamic-search
 %patch7 -p1 -b .rtl-fix
+%patch8 -p1 -b .hide-white-screen
 
 %build
 
@@ -226,6 +228,13 @@ fi
 %{_libdir}/*.so
 
 %changelog
+* Mon Mar 31 2008 Ray Strode <rstrode@redhat.com> - 2.22.1-2
+- Over the releases we've accumulated default.png, default-wide.png default-5_4.png
+  and default.jpg.  We haven't been able to drop them because it would leave some
+  users with white backgrounds on upgrade.  This patch just falls back to the
+  default image if the user's background doesn't exist.
+
+
 * Fri Mar 28 2008 Tomas Bzatek <tbzatek@redhat.com> - 2.22.1-1
 - Update to 2.22.1