diff --git a/config/options b/config/options
index cfeca9ce85..fee659cedc 100644
--- a/config/options
+++ b/config/options
@@ -3,7 +3,7 @@
 if [ -z "$PROJECT" ]; then
   PROJECT="generic"
 else
-  PROJECT=$PROJECT
+  PROJECT="$PROJECT"
 fi
 
 # determines TARGET_ARCH, if not forced by user (i386 / x86_64 / powerpc)
@@ -11,11 +11,11 @@ fi
 if [ -z "$ARCH" ]; then
   TARGET_ARCH="i386"
 else
-  TARGET_ARCH=$ARCH
+  TARGET_ARCH="$ARCH"
 fi
 
 ROOT=`pwd`
-PROJECT_DIR=$ROOT/projects
+PROJECT_DIR="$ROOT/projects"
 
 OPENELEC_VERSION=`cat VERSION`
 
@@ -28,15 +28,15 @@ else
 fi
 
 # read project options if available
- if [ -f $PROJECT_DIR/$PROJECT/options ]; then
+ if [ -f "$PROJECT_DIR/$PROJECT/options" ]; then
    . $PROJECT_DIR/$PROJECT/options
  fi
 
 # Target system library C (eglibc)
-  TARGET_LIBC=eglibc
+  TARGET_LIBC="eglibc"
 
 # Library strip
-  LIBSTRIP=yes
+  LIBSTRIP="yes"
 
 # Need to point to your actual cc
 # If you have ccache installed, take care that LOCAL_CC don't point to it
@@ -47,10 +47,10 @@ fi
   LOCAL_CXX=`which g++`
 
 # Support C++ in toolchain
-  TOOLCHAIN_CXX=yes
+  TOOLCHAIN_CXX="yes"
 
 # verbose compilation mode (yes/no)
-  VERBOSE=yes
+  VERBOSE="yes"
 
 # Concurrency make level (-j option)
 #  Try value 1 (default) to 4 on single CPU computer, or more on
@@ -58,7 +58,7 @@ fi
   CONCURRENCY_MAKE_LEVEL=`cat /proc/cpuinfo | grep -c '^processor[[:cntrl:]]*:'`
 
 # forcing install of all packages (yes/no)
-  FORCE_INSTALL=no
+  FORCE_INSTALL="no"
 
 # set jpeg library depending on ARCH
   if [ "$TARGET_ARCH" = "i386" -o "$TARGET_ARCH" = "x86_64" ]; then
@@ -69,37 +69,37 @@ fi
   fi
 
 get_graphicdrivers() {
-  if [ "$GRAPHIC_DRIVERS" = all ]; then
+  if [ "$GRAPHIC_DRIVERS" = "all" ]; then
     GRAPHIC_DRIVERS="i915 i965 r200 r300 r600 radeon nvidia vmware"
   fi
 
   for drv in $GRAPHIC_DRIVERS; do
-    [ $drv = i915 ] && MESA_DRIVERS="$MESA_DRIVERS,i915"
-    [ $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 = radeon ] && MESA_DRIVERS="$MESA_DRIVERS,radeon"
-    [ $drv = nouveau ] && MESA_DRIVERS="$MESA_DRIVERS,nouveau"
+    [ "$drv" = "i915" ] && MESA_DRIVERS="$MESA_DRIVERS,i915"
+    [ "$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" = "radeon" ] && MESA_DRIVERS="$MESA_DRIVERS,radeon"
+    [ "$drv" = "nouveau" ] && MESA_DRIVERS="$MESA_DRIVERS,nouveau"
 
-    if [ $drv = i915 -o $drv = i965 ]; then
+    if [ "$drv" = "i915" -o "$drv" = "i965" ]; then
       XORG_DRIVERS="$XORG_DRIVERS intel"
     fi
 
-    if [ $drv = r200 -o $drv = r300 -o $drv = r600 -o $drv = radeon ]; then
+    if [ "$drv" = "r200" -o "$drv" = "r300" -o "$drv" = "r600" -o "$drv" = "radeon" ]; then
       XORG_DRIVERS="$XORG_DRIVERS ati"
     fi
 
-    if [ $drv = nouveau ]; then
+    if [ "$drv" = "nouveau" ]; then
       XORG_DRIVERS="$XORG_DRIVERS nouveau"
     fi
 
-    if [ $drv = nvidia ]; then
+    if [ "$drv" = "nvidia" ]; then
       XORG_DRIVERS="$XORG_DRIVERS nvidia"
       XINERAMA_SUPPORT="yes"
     fi
 
-    if [ $drv = vmware ]; then
+    if [ "$drv" = "vmware" ]; then
       XINERAMA_SUPPORT="yes"
     fi
   done