diff --git a/Mesa.changes b/Mesa.changes
index 27bc0bf..cf79a28 100644
--- a/Mesa.changes
+++ b/Mesa.changes
@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Tue May 27 13:39:00 CEST 2014 - tiwai@suse.de
+
+- Fix zero-division with empty height (bnc#879462)
+  u_mesa-gallium-llvmpipe-fix-SIGFPE.patch
+
+-------------------------------------------------------------------
+Mon May 26 23:36:44 UTC 2014 - tobias.johannes.klausmann@mni.thm.de
+
+- Update to version 10.2-rc4:
+  Another round of bugfixes towards the final 10.2
+
+-------------------------------------------------------------------
+Mon May 19 16:10:36 UTC 2014 - tobias.johannes.klausmann@mni.thm.de
+
+- Update to 10.2-rc3
+  Even more bugfixes
+
 -------------------------------------------------------------------
 Mon May 12 09:32:19 UTC 2014 - schwab@suse.de
 
diff --git a/Mesa.spec b/Mesa.spec
index 806a716..17d7f88 100644
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -58,10 +58,10 @@
 %endif
 
 %define _name_archive MesaLib
-%define _version 10.2.0-rc2
+%define _version 10.2.0-rc4
 
 Name:           Mesa
-Version:        10.2.0~rc2
+Version:        10.2.0~rc4
 Release:        0
 BuildRequires:  autoconf >= 2.60
 BuildRequires:  automake
@@ -149,6 +149,8 @@ Patch11:        u_Fix-crash-in-swrast-when-setting-a-texture-for-a-pix.patch
 Patch13:        u_mesa-8.0.1-fix-16bpp.patch
 # Patch from Fedora, use shmget when available, under llvmpipe
 Patch15:        u_mesa-8.0-llvmpipe-shmget.patch
+# to be upstreamed
+Patch16:        u_mesa-gallium-llvmpipe-fix-SIGFPE.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -514,6 +516,7 @@ rm -rf docs/README.{VMS,WIN32,OS2}
 #%patch15 -p1
 #%patch13 -p1
 ###
+%patch16 -p1
 
 %build
 rm -f src/mesa/depend
diff --git a/MesaLib-10.2.0-rc2.tar.bz2 b/MesaLib-10.2.0-rc2.tar.bz2
deleted file mode 100644
index 8613b14..0000000
--- a/MesaLib-10.2.0-rc2.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d7ef2f04c1decbee6ff0b452d49e61bc88f3e349581e232c6d4287b20c083ce2
-size 7098130
diff --git a/MesaLib-10.2.0-rc4.tar.bz2 b/MesaLib-10.2.0-rc4.tar.bz2
new file mode 100644
index 0000000..67ad4be
--- /dev/null
+++ b/MesaLib-10.2.0-rc4.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:11c015b59e039d6615d2443789429f97b96c3880085416f194c421a17242c63d
+size 7110521
diff --git a/u_mesa-gallium-llvmpipe-fix-SIGFPE.patch b/u_mesa-gallium-llvmpipe-fix-SIGFPE.patch
new file mode 100644
index 0000000..db1f54a
--- /dev/null
+++ b/u_mesa-gallium-llvmpipe-fix-SIGFPE.patch
@@ -0,0 +1,24 @@
+From: Takashi Iwai <tiwai@suse.de>
+Subject: Fix zero-division in llvmpipe_texture_layout()
+References: bnc#879462
+
+Fix the crash of "gnome-control-center info" invocation on QEMU where
+zero height is passed at init.
+
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+
+---
+ src/gallium/drivers/llvmpipe/lp_texture.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/src/gallium/drivers/llvmpipe/lp_texture.c
++++ b/src/gallium/drivers/llvmpipe/lp_texture.c
+@@ -115,7 +115,7 @@ llvmpipe_texture_layout(struct llvmpipe_
+             lpr->row_stride[level] = align(nblocksx * block_size, util_cpu_caps.cacheline);
+ 
+          /* if row_stride * height > LP_MAX_TEXTURE_SIZE */
+-         if (lpr->row_stride[level] > LP_MAX_TEXTURE_SIZE / nblocksy) {
++         if (nblocksy && lpr->row_stride[level] > LP_MAX_TEXTURE_SIZE / nblocksy) {
+             /* image too large */
+             goto fail;
+          }