diff --git a/gnome-desktop.spec b/gnome-desktop.spec
index 5abd522..b271ee5 100644
--- a/gnome-desktop.spec
+++ b/gnome-desktop.spec
@@ -12,12 +12,14 @@
 Summary: Shared code among gnome-panel, gnome-session, nautilus, etc
 Name: gnome-desktop
 Version: 2.30.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: http://www.gnome.org
 #VCS: git:git://git.gnome.org/gnome-desktop
 Source0: http://download.gnome.org/sources/gnome-desktop/2.30/%{name}-%{version}.tar.bz2
 # https://bugzilla.gnome.org/show_bug.cgi?id=612276
 Patch1: concatenate-edid-descriptors.patch
+# upstream fix
+Patch2: width-for-height.patch
 
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Libraries
@@ -77,6 +79,7 @@ libgnomedesktop.
 %prep
 %setup -q
 %patch1 -p1 -b .concatenate-edid-descriptors
+%patch2 -p1 -b .width-for-height
 
 
 %build
@@ -125,6 +128,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_datadir}/gtk-doc/html/gnome-desktop/
 
 %changelog
+* Wed Apr 21 2010 Matthias Clasen <mclasen@redhat.com> - 2.30.0-3
+- Fix a typo that can lead to huge memory allocations in multihead setups
+
 * Mon Apr 19 2010 Matthias Clasen <mclasen@redhat.com> - 2.30.0-2
 - Require the right themes and 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),