diff --git a/Mesa.changes b/Mesa.changes
index 5c9df99..6ba68a3 100644
--- a/Mesa.changes
+++ b/Mesa.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Wed Apr 25 13:17:59 UTC 2012 - sndirsch@suse.com
+
+- For full OpenGL 3.0 compliance, it is necessary to
+  have floating-point textures, so Mesa is now compiled with
+  "--enable-texture-float" parameter to have OpenGL 3.0 support.
+- disabling glut/glw no longer required since it's no longer
+  shipped with Mesa
+
 -------------------------------------------------------------------
 Mon Apr 23 15:09:29 UTC 2012 - vljn@ovi.com
 
diff --git a/Mesa.spec b/Mesa.spec
index cdc4e8d..7c9abc5 100644
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -390,10 +390,6 @@ packages.
 %prep
 %setup -n %{_name_archive}-%{_version} -b4 -q
 %patch1 -p1
-# no need to build (GLUT-)Demos
-rm -rf src/glut progs/{demos,redbook,samples,xdemos,glsl}
-# we use freeglut
-rm -f include/GL/{glut.h,uglglutshapes.h,glutf90.h}
 # remove some docs
 rm -rf docs/README.{VMS,WIN32,OS2}
 #%patch11 -p1
@@ -405,14 +401,14 @@ rm -f src/mesa/depend
 export TALLOC_LIBS=-ltalloc
 export TALLOC_CFLAGS="-I/usr/include"
 autoreconf -fi
-%configure --disable-glw \
-           --enable-gles1 \
+%configure --enable-gles1 \
            --enable-gles2 \
            --with-driver=dri \
            --with-egl-platforms=x11,drm \
            --enable-shared-glapi \
            --enable-shared-dricore \
            --enable-xa \
+           --enable-texture-float \
            --with-dri-searchpath=/usr/%{_lib}/dri/updates:/usr/%{_lib}/dri \
 %ifarch %ix86 x86_64
            --enable-gallium-llvm \
@@ -427,7 +423,6 @@ autoreconf -fi
            --with-dri-drivers=swrast \
            --with-gallium-drivers="" \
 %endif
-           --disable-glut \
            CFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
 make %{?_smp_mflags}
 make install DESTDIR=$RPM_BUILD_ROOT
@@ -435,8 +430,6 @@ make install DESTDIR=$RPM_BUILD_ROOT
 make realclean
 %configure --with-driver=xlib \
            --disable-glu \
-           --disable-glw \
-           --disable-glut \
            --with-gallium-drivers="" \
            CFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
 sed -i 's/GL_LIB = .*/GL_LIB = IndirectGL/g' configs/autoconf