diff --git a/config/options b/config/options
index c778e89c9f..9636bb5367 100644
--- a/config/options
+++ b/config/options
@@ -85,7 +85,7 @@ get_graphicdrivers() {
     [ "$drv" = "i965" ] && MESA_DRIVERS="$MESA_DRIVERS,i965"
     [ "$drv" = "r200" ] && MESA_DRIVERS="$MESA_DRIVERS,r200"
     [ "$drv" = "r300" ] && MESA_DRIVERS="$MESA_DRIVERS,r300"
-    [ "$drv" = "r600" ] && MESA_DRIVERS="$MESA_DRIVERS,r600"
+#    [ "$drv" = "r600" ] && MESA_DRIVERS="$MESA_DRIVERS,r600"
     [ "$drv" = "radeon" ] && MESA_DRIVERS="$MESA_DRIVERS,radeon"
 #    [ "$drv" = "nouveau" ] && MESA_DRIVERS="$MESA_DRIVERS,nouveau"
     [ "$drv" = "omapfb" ] && MESA_DRIVERS="$MESA_DRIVERS,swrast"
diff --git a/packages/graphics/Mesa/build b/packages/graphics/Mesa/build
index 3a06003a7c..264c8f7f29 100755
--- a/packages/graphics/Mesa/build
+++ b/packages/graphics/Mesa/build
@@ -24,8 +24,6 @@
 
 get_graphicdrivers
 
-export PYTHONVERBOSE=1
-
 # dont use gold linker because of compiling issues
   strip_gold
   strip_linker_plugin
@@ -52,7 +50,9 @@ for drv in $GRAPHIC_DRIVERS; do
     MESA_CONFIG=`echo $MESA_CONFIG | sed -e 's/disable-gallium-r300/disable-gallium-r300/'`
 
   [ "$drv" = r600 ] && \
-    MESA_CONFIG=`echo $MESA_CONFIG | sed -e 's/disable-gallium-r600/disable-gallium-r600/'`
+    MESA_CONFIG=`echo $MESA_CONFIG | sed -e 's/disable-gallium/enable-gallium/'` && \
+    MESA_CONFIG=`echo $MESA_CONFIG | sed -e 's/disable-gallium-r600/enable-gallium-r600/'`
+    MESA_CONFIG="$MESA_CONFIG --with-state-trackers=dri,glx"
 
   [ "$drv" = nouveau ] && \
     MESA_CONFIG=`echo $MESA_CONFIG | sed -e 's/disable-gallium/enable-gallium/'` && \