diff --git a/Mesa.changes b/Mesa.changes
index 980fe56..ff9eb3d 100644
--- a/Mesa.changes
+++ b/Mesa.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Sun Jul  3 13:21:31 UTC 2011 - vljn@ovi.com
+
+- Update Mesa 7.10.3
+  * Few crashes and rendering fixes.
+
+-------------------------------------------------------------------
+Mon Jun 20 15:05:42 UTC 2011 - sndirsch@novell.com
+
+- libdrm-2.4.26-nouveau.diff
+  * Fixes build of Mesa 7.10.2 nouveau driver with libdrm 2.4.26
+   (fdo #35562)
+
 -------------------------------------------------------------------
 Thu Jun 16 15:55:44 UTC 2011 - mhopf@novell.com
 
diff --git a/Mesa.spec b/Mesa.spec
index e4ad10e..27719cd 100644
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -20,9 +20,9 @@
 %define enable_nouveau_gallium 1
 %define enable_radeon_gallium 1
 
-%define _version 7.10.2
+%define _version 7.10.3
 
-Version:        7.10.2
+Version:        7.10.3
 Release:        12
 
 Name:           Mesa
@@ -53,6 +53,7 @@ Source5:        drirc
 Patch8:         egl-buildfix.diff
 Patch9:         u_GLX-SWrast-Make-GLX-with-SWrast-enabled-work-on-olde.patch
 Patch11:        u_Fix-crash-in-swrast-when-setting-a-texture-for-a-pix.patch
+Patch12:        libdrm-2.4.26-nouveau.diff
 # already upstream
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -143,6 +144,7 @@ rm -rf docs/README.{VMS,WIN32,OS2}
 %patch8
 %patch9 -p1
 %patch11 -p1
+%patch12 -p1
 
 %build
 
diff --git a/MesaLib-7.10.2.tar.bz2 b/MesaLib-7.10.2.tar.bz2
deleted file mode 100644
index c75adfc..0000000
--- a/MesaLib-7.10.2.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8ced2678ce11cf30804694a92ea3ca6b82f158ae8995bdc626c7e85aac71c7c1
-size 5863551
diff --git a/MesaLib-7.10.3.tar.bz2 b/MesaLib-7.10.3.tar.bz2
new file mode 100644
index 0000000..e6d61e0
--- /dev/null
+++ b/MesaLib-7.10.3.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:39b307fcf910e4f4f43e515097dc4fd40d19323163c8e8e9af757dc686eb5751
+size 6686992
diff --git a/libdrm-2.4.26-nouveau.diff b/libdrm-2.4.26-nouveau.diff
new file mode 100644
index 0000000..24586e2
--- /dev/null
+++ b/libdrm-2.4.26-nouveau.diff
@@ -0,0 +1,153 @@
+Fixes build of Mesa 7.10.2 nouveau driver with libdrm 2.4.26 ...
+
+  --> https://bugs.freedesktop.org/show_bug.cgi?id=35562
+
+--- Mesa-7.10.1/src/gallium/drivers/nv50/nv50_clear.c.ark	2011-04-11 10:26:00.717291484 +0200
++++ Mesa-7.10.1/src/gallium/drivers/nv50/nv50_clear.c	2011-04-11 10:26:05.600624698 +0200
+@@ -24,6 +24,8 @@
+ #include "pipe/p_defines.h"
+ #include "pipe/p_state.h"
+ 
++#include <nouveau/nv04_pushbuf.h>
++
+ #include "nv50_context.h"
+ 
+ void
+--- Mesa-7.10.1/src/gallium/drivers/nv50/nv50_context.c.ark	2011-04-11 10:25:55.913958268 +0200
++++ Mesa-7.10.1/src/gallium/drivers/nv50/nv50_context.c	2011-04-11 10:26:00.663958154 +0200
+@@ -23,6 +23,8 @@
+ #include "draw/draw_context.h"
+ #include "pipe/p_defines.h"
+ 
++#include <nouveau/nv04_pushbuf.h>
++
+ #include "nv50_context.h"
+ #include "nv50_screen.h"
+ #include "nv50_resource.h"
+--- Mesa-7.10.1/src/gallium/drivers/nv50/nv50_push.c.ark	2011-04-11 10:25:50.250625073 +0200
++++ Mesa-7.10.1/src/gallium/drivers/nv50/nv50_push.c	2011-04-11 10:25:55.873958269 +0200
+@@ -4,6 +4,8 @@
+ #include "util/u_format.h"
+ #include "util/u_split_prim.h"
+ 
++#include <nouveau/nv04_pushbuf.h>
++
+ #include "nv50_context.h"
+ #include "nv50_resource.h"
+ 
+--- Mesa-7.10.1/src/gallium/drivers/nv50/nv50_query.c.ark	2011-04-11 10:25:44.790625206 +0200
++++ Mesa-7.10.1/src/gallium/drivers/nv50/nv50_query.c	2011-04-11 10:25:50.183958407 +0200
+@@ -23,6 +23,8 @@
+ #include "pipe/p_context.h"
+ #include "util/u_inlines.h"
+ 
++#include <nouveau/nv04_pushbuf.h>
++
+ #include "nv50_context.h"
+ 
+ struct nv50_query {
+--- Mesa-7.10.1/src/gallium/drivers/nv50/nv50_screen.c.ark	2011-04-11 10:25:32.790625497 +0200
++++ Mesa-7.10.1/src/gallium/drivers/nv50/nv50_screen.c	2011-04-11 10:25:38.633958688 +0200
+@@ -23,6 +23,8 @@
+ #include "util/u_format_s3tc.h"
+ #include "pipe/p_screen.h"
+ 
++#include <nouveau/nv04_pushbuf.h>
++
+ #include "nv50_context.h"
+ #include "nv50_screen.h"
+ #include "nv50_resource.h"
+--- Mesa-7.10.1/src/gallium/drivers/nv50/nv50_shader_state.c.ark	2011-04-11 10:25:38.710625354 +0200
++++ Mesa-7.10.1/src/gallium/drivers/nv50/nv50_shader_state.c	2011-04-11 10:25:44.713958540 +0200
+@@ -26,6 +26,8 @@
+ #include "pipe/p_state.h"
+ #include "util/u_inlines.h"
+ 
++#include <nouveau/nv04_pushbuf.h>
++
+ #include "nv50_context.h"
+ 
+ static void
+--- Mesa-7.10.1/src/gallium/drivers/nv50/nv50_state_validate.c.ark	2011-04-11 10:25:27.520625626 +0200
++++ Mesa-7.10.1/src/gallium/drivers/nv50/nv50_state_validate.c	2011-04-11 10:25:32.737292166 +0200
+@@ -22,6 +22,7 @@
+ 
+ #include "util/u_format.h"
+ 
++#include <nouveau/nv04_pushbuf.h>
+ #include "nv50_context.h"
+ #include "nv50_resource.h"
+ #include "nouveau/nouveau_stateobj.h"
+--- Mesa-7.10.1/src/gallium/drivers/nv50/nv50_surface.c.ark	2011-04-11 10:25:22.407292417 +0200
++++ Mesa-7.10.1/src/gallium/drivers/nv50/nv50_surface.c	2011-04-11 10:25:27.450625628 +0200
+@@ -22,6 +22,7 @@
+ 
+ #define __NOUVEAU_PUSH_H__
+ #include <stdint.h>
++#include <nouveau/nv04_pushbuf.h>
+ #include "nouveau/nouveau_pushbuf.h"
+ #include "nv50_context.h"
+ #include "nv50_resource.h"
+--- Mesa-7.10.1/src/gallium/drivers/nv50/nv50_transfer.c.ark	2011-04-11 10:25:14.903959267 +0200
++++ Mesa-7.10.1/src/gallium/drivers/nv50/nv50_transfer.c	2011-04-11 10:25:22.353959086 +0200
+@@ -4,6 +4,8 @@
+ #include "util/u_format.h"
+ #include "util/u_math.h"
+ 
++#include <nouveau/nv04_pushbuf.h>
++
+ #include "nv50_context.h"
+ #include "nv50_transfer.h"
+ #include "nv50_resource.h"
+--- Mesa-7.10.1/src/gallium/drivers/nv50/nv50_vbo.c.ark	2011-04-11 10:25:01.717292921 +0200
++++ Mesa-7.10.1/src/gallium/drivers/nv50/nv50_vbo.c	2011-04-11 10:25:14.850625935 +0200
+@@ -26,6 +26,8 @@
+ #include "util/u_format.h"
+ #include "util/u_split_prim.h"
+ 
++#include <nouveau/nv04_pushbuf.h>
++
+ #include "nv50_context.h"
+ #include "nv50_resource.h"
+ 
+--- Mesa-7.10.1/src/gallium/drivers/nvfx/nv04_2d.c.ark	2011-04-11 10:23:22.800628664 +0200
++++ Mesa-7.10.1/src/gallium/drivers/nvfx/nv04_2d.c	2011-04-11 10:25:01.640626257 +0200
+@@ -39,6 +39,7 @@
+ #include <nouveau/nouveau_bo.h>
+ #include <nouveau/nouveau_notifier.h>
+ #include <nouveau/nouveau_grobj.h>
++#include <nouveau/nv04_pushbuf.h>
+ #include "nv04_2d.h"
+ 
+ #include "nouveau/nv_object.xml.h"
+--- Mesa-7.10.1/src/gallium/drivers/nvfx/nvfx_screen.c.ark	2011-04-11 10:27:59.380621927 +0200
++++ Mesa-7.10.1/src/gallium/drivers/nvfx/nvfx_screen.c	2011-04-11 10:28:02.833955176 +0200
+@@ -3,6 +3,7 @@
+ #include "util/u_format_s3tc.h"
+ #include "util/u_simple_screen.h"
+ 
++#include <nouveau/nv04_pushbuf.h>
+ #include "nouveau/nouveau_screen.h"
+ #include "nouveau/nv_object.xml.h"
+ #include "nvfx_context.h"
+--- Mesa-7.10.1/src/mesa/drivers/dri/nouveau/nv04_context.c.ark	2011-04-11 10:27:27.220622711 +0200
++++ Mesa-7.10.1/src/mesa/drivers/dri/nouveau/nv04_context.c	2011-04-11 11:09:24.147228063 +0200
+@@ -24,6 +24,8 @@
+  *
+  */
+ 
++#include <stdint.h>
++#include <nouveau/nv04_pushbuf.h>
+ #include "nouveau_driver.h"
+ #include "nouveau_context.h"
+ #include "nouveau_fbo.h"
+--- Mesa-7.10.2/src/mesa/drivers/dri/nouveau/nouveau_driver.h.orig	2011-06-20 16:48:59.000000000 +0200
++++ Mesa-7.10.2/src/mesa/drivers/dri/nouveau/nouveau_driver.h	2011-06-20 16:49:16.000000000 +0200
+@@ -37,6 +37,7 @@
+ #undef NDEBUG
+ #include <assert.h>
+ 
++#include <nouveau/nv04_pushbuf.h>
+ #include "nouveau_device.h"
+ #include "nouveau_pushbuf.h"
+ #include "nouveau_grobj.h"