diff --git a/packages/graphics/Mesa/build b/packages/graphics/Mesa/build
index 264c8f7f29..f58bb9047c 100755
--- a/packages/graphics/Mesa/build
+++ b/packages/graphics/Mesa/build
@@ -43,26 +43,22 @@ for drv in $GRAPHIC_DRIVERS; do
   [ "$drv" = i965 ] && \
     MESA_CONFIG=`echo $MESA_CONFIG | sed -e 's/disable-gallium-i965/disable-gallium-i965/'`
 
-  [ "$drv" = radeon ] && \
-    MESA_CONFIG=`echo $MESA_CONFIG | sed -e 's/disable-gallium-radeon/disable-gallium-radeon/'`
-
-  [ "$drv" = r300 ] && \
-    MESA_CONFIG=`echo $MESA_CONFIG | sed -e 's/disable-gallium-r300/disable-gallium-r300/'`
+  [ "$drv" = r300 -o "$drv" = radeon ] && \
+    MESA_CONFIG=`echo $MESA_CONFIG | sed -e 's/disable-gallium-radeon/enable-gallium-radeon/'` && \
+    MESA_CONFIG=`echo $MESA_CONFIG | sed -e 's/disable-gallium-r300/enable-gallium-r300/'` && \
+    MESA_CONFIG="$MESA_CONFIG --with-state-trackers=dri,glx --enable-gallium"
 
   [ "$drv" = 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"
+    MESA_CONFIG=`echo $MESA_CONFIG | sed -e 's/disable-gallium-r600/enable-gallium-r600/'` && \
+    MESA_CONFIG="$MESA_CONFIG --with-state-trackers=dri,glx --enable-gallium"
 
   [ "$drv" = nouveau ] && \
-    MESA_CONFIG=`echo $MESA_CONFIG | sed -e 's/disable-gallium/enable-gallium/'` && \
     MESA_CONFIG=`echo $MESA_CONFIG | sed -e 's/disable-gallium-nouveau/enable-gallium-nouveau/'` && \
-    MESA_CONFIG="$MESA_CONFIG --with-state-trackers=dri,glx"
+    MESA_CONFIG="$MESA_CONFIG --with-state-trackers=dri,glx --enable-gallium"
 
   [ "$drv" = vmware ] && \
-    MESA_CONFIG=`echo $MESA_CONFIG | sed -e 's/disable-gallium/enable-gallium/'` && \
     MESA_CONFIG=`echo $MESA_CONFIG | sed -e 's/disable-gallium-svga/enable-gallium-svga/'` && \
-    MESA_CONFIG="$MESA_CONFIG --with-state-trackers=dri,glx"
+    MESA_CONFIG="$MESA_CONFIG --with-state-trackers=dri,glx --enable-gallium"
 done
 
 cd $PKG_BUILD