diff --git a/Mesa.changes b/Mesa.changes
index e5308c9..eabc47f 100644
--- a/Mesa.changes
+++ b/Mesa.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+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..a0fd8c2 100644
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -16,6 +16,8 @@
 #
 
 
+%define glamor 1
+
 #
 %define _version 8.0.3
 %define _name_archive mesa
@@ -412,6 +414,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 \