diff --git a/gnome-desktop.spec b/gnome-desktop.spec
index 457ff90..32785ad 100644
--- a/gnome-desktop.spec
+++ b/gnome-desktop.spec
@@ -12,7 +12,7 @@
 Summary: Shared code among gnome-panel, gnome-session, nautilus, etc
 Name: gnome-desktop
 Version: 2.28.2
-Release: 5%{?dist}
+Release: 6%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-desktop/2.28/%{name}-%{version}.tar.bz2
 Patch1: concatenate-edid-descriptors.patch
@@ -30,6 +30,8 @@ Patch6: gnome-desktop-crash.patch
 Patch7: randr-version.patch
 # upstream enhancement
 Patch8: spanned-background.patch
+# upstream fix
+Patch9: width-for-height.patch
 
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Libraries
@@ -96,6 +98,7 @@ libgnomedesktop.
 %patch6 -p1 -b .crash
 %patch7 -p1 -b .randr-version
 %patch8 -p1 -b .spanned-background
+%patch9 -p1 -b .width-for-height
 
 %build
 %configure --with-gnome-distributor="Red Hat, Inc" \
@@ -143,6 +146,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_datadir}/gtk-doc/html/gnome-desktop/
 
 %changelog
+* Wed Apr 21 2010 Matthias Clasen <mclasen@redhat.com> - 2.28.2-6
+- Fix a typo that can cause huge memory consumption on multihead setups
+
 * Thu Feb 18 2010 Matthias Clasen <mclasen@redhat.com> - 2.28.2-5
 - Add back a way to have spanned backgrounds
 
diff --git a/width-for-height.patch b/width-for-height.patch
new file mode 100644
index 0000000..aecede8
--- /dev/null
+++ b/width-for-height.patch
@@ -0,0 +1,12 @@
+diff -up gnome-desktop-2.28.2/libgnome-desktop/gnome-bg.c.width-for-height gnome-desktop-2.28.2/libgnome-desktop/gnome-bg.c
+--- gnome-desktop-2.28.2/libgnome-desktop/gnome-bg.c.width-for-height	2010-04-21 12:40:03.985111930 -0400
++++ gnome-desktop-2.28.2/libgnome-desktop/gnome-bg.c	2010-04-21 12:40:12.654363778 -0400
+@@ -1257,7 +1257,7 @@ gnome_bg_get_pixmap_from_root (GdkScreen
+ 	}
+ 
+ 	width = gdk_screen_get_width (screen);
+-	height = gdk_screen_get_width (screen);
++	height = gdk_screen_get_height (screen);
+ 
+ 	pixmap = gdk_pixmap_new (source_pixmap != NULL? source_pixmap :
+ 				 gdk_screen_get_root_window (screen),