diff --git a/Mesa.changes b/Mesa.changes
index e5308c9..1027b43 100644
--- a/Mesa.changes
+++ b/Mesa.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Wed May 30 16:56:11 UTC 2012 - fcrozat@suse.com
+
+- Add u_mesa-8.0.1-fix-16bpp.patch (Fedora): fix 16bpp mode under
+  llvmpipe.
+
+-------------------------------------------------------------------
+Sat May 26 22:29:41 UTC 2012 - sndirsch@suse.com
+
+- added configure options "--enable-gbm --enable-glx-tls" (required
+  for glamor support)
+
 -------------------------------------------------------------------
 Fri May 25 15:57:25 UTC 2012 - meissner@suse.com
 
diff --git a/Mesa.spec b/Mesa.spec
index 12f25b5..d172410 100644
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -16,6 +16,8 @@
 #
 
 
+%define glamor 1
+
 #
 %define _version 8.0.3
 %define _name_archive mesa
@@ -88,6 +90,8 @@ Patch1:         Mesa-nodate.diff
 Patch11:        u_Fix-crash-in-swrast-when-setting-a-texture-for-a-pix.patch
 # Patch from upstream master to resolve build issues with llvm 3.1
 Patch12:        upstream-llvm-patch.diff
+# Patch from Fedora, fix 16bpp in llvmpipe
+Patch13:        u_mesa-8.0.1-fix-16bpp.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -396,6 +400,7 @@ packages.
 rm -rf docs/README.{VMS,WIN32,OS2}
 #%patch11 -p1
 %patch12 -p1
+%patch13 -p1
 
 %build
 
@@ -412,6 +417,10 @@ autoreconf -fi
            --enable-shared-dricore \
            --enable-xa \
            --enable-texture-float \
+%if %glamor
+           --enable-gbm \
+           --enable-glx-tls \
+%endif
            --with-dri-searchpath=/usr/%{_lib}/dri/updates:/usr/%{_lib}/dri \
 %ifarch %ix86 x86_64
            --enable-gallium-llvm \
diff --git a/u_mesa-8.0.1-fix-16bpp.patch b/u_mesa-8.0.1-fix-16bpp.patch
new file mode 100644
index 0000000..4ca5313
--- /dev/null
+++ b/u_mesa-8.0.1-fix-16bpp.patch
@@ -0,0 +1,13 @@
+diff -up Mesa-8.0.1/src/mesa/state_tracker/st_manager.c.jx Mesa-8.0.1/src/mesa/state_tracker/st_manager.c
+--- Mesa-8.0.1/src/mesa/state_tracker/st_manager.c.jx	2012-02-14 18:44:00.000000000 -0500
++++ Mesa-8.0.1/src/mesa/state_tracker/st_manager.c	2012-04-02 12:02:14.613964417 -0400
+@@ -528,6 +528,9 @@ st_context_teximage(struct st_context_if
+       if (util_format_get_component_bits(internal_format,
+                UTIL_FORMAT_COLORSPACE_RGB, 3) > 0)
+          internalFormat = GL_RGBA;
++      else if (util_format_get_component_bits(internal_format,
++                 UTIL_FORMAT_COLORSPACE_RGB, 0) == 5)
++         internalFormat = GL_RGB5;
+       else
+          internalFormat = GL_RGB;
+