diff --git a/packages/graphics/Mesa/build b/packages/graphics/Mesa/build
index 0f2b337cd9..d08d80a260 100755
--- a/packages/graphics/Mesa/build
+++ b/packages/graphics/Mesa/build
@@ -15,25 +15,25 @@ get_graphicdrivers
 MESA_CONFIG=" --disable-gallium --disable-gallium-nouveau --disable-gallium-i915 --disable-gallium-i965"
 MESA_CONFIG="$MESA_CONFIG --disable-gallium-radeon --disable-gallium-r600 --disable-gallium-svga --disable-gallium-swrast"
 
-for drv in $GRAPHIC_DRIVERS; do
-  [ $drv = i915 ] && \
+for drv in "$GRAPHIC_DRIVERS"; do
+  [ "$drv" = "i915" ] && \
     MESA_CONFIG=`echo $MESA_CONFIG | sed -e 's/disable-gallium-intel/disable-gallium-intel/'`
 
-  [ $drv = i965 ] && \
+  [ "$drv" = "i965" ] && \
     MESA_CONFIG=`echo $MESA_CONFIG | sed -e 's/disable-gallium-intel/disable-gallium-intel/'`
 
-  [ $drv = radeon ] && \
+  [ "$drv" = "radeon" ] && \
     MESA_CONFIG=`echo $MESA_CONFIG | sed -e 's/disable-gallium-radeon/disable-gallium-radeon/'`
 
-  [ $drv = r600 ] && \
+  [ "$drv" = "r600" ] && \
     MESA_CONFIG=`echo $MESA_CONFIG | sed -e 's/disable-gallium-r600/disable-gallium-r600/'`
 
-  [ $drv = nouveau ] && \
+  [ "$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,xorg"
 
-  [ $drv = vmware ] && \
+  [ "$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,xorg"
@@ -43,13 +43,13 @@ cd $PKG_BUILD
 
 make clean
 
-HOST_CC=$HOST_CC \
+HOST_CC="$HOST_CC" \
 HOST_OPT_FLAGS="$HOST_CFLAGS" \
 X11_INCLUDES= \
 DRI_DRIVER_INSTALL_DIR="$XORG_PATH_DRI" \
 DRI_DRIVER_SEARCH_DIR="$XORG_PATH_DRI" \
-./configure --host=$TARGET_NAME \
-            --build=$HOST_NAME \
+./configure --host="$TARGET_NAME" \
+            --build="$HOST_NAME" \
             --prefix=/usr \
             --sysconfdir=/etc \
             --localstatedir=/var \
@@ -67,10 +67,10 @@ DRI_DRIVER_SEARCH_DIR="$XORG_PATH_DRI" \
             --disable-glw \
             --disable-motif \
             --with-driver=dri \
-            --with-dri-drivers=$MESA_DRIVERS \
+            --with-dri-drivers="$MESA_DRIVERS" \
             --with-dri-driverdir="$XORG_PATH_DRI" \
             --with-xorg-driver-dir="$XORG_PATH_DRIVERS" \
-            $MESA_CONFIG \
+            "$MESA_CONFIG" \
 
 make
 
diff --git a/packages/graphics/Mesa/meta b/packages/graphics/Mesa/meta
index 669f2b9e95..a3e2bf05d5 100644
--- a/packages/graphics/Mesa/meta
+++ b/packages/graphics/Mesa/meta
@@ -15,7 +15,7 @@ PKG_IS_ADDON="no"
 
 PKG_AUTORECONF="yes"
 
-if [ $MESA_MASTER = "yes" ]; then
+if [ "$MESA_MASTER" = "yes" ]; then
   PKG_VERSION="20101217"
   PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
 fi