diff --git a/scripts/image b/scripts/image
index 76c40e530a..92d5870c1d 100755
--- a/scripts/image
+++ b/scripts/image
@@ -34,7 +34,7 @@ mkdir -p $INSTALL
   ln -sf /var/tmp $INSTALL/tmp
   ln -sf /var/media $INSTALL/media
 
-  if [ $TARGET_ARCH = x86_64 -o $TARGET_ARCH = powerpc64 ]; then
+  if [ "$TARGET_ARCH" = "x86_64" -o "$TARGET_ARCH" = "powerpc64" ]; then
     ln -s /lib $INSTALL/lib64
     ln -s lib $INSTALL/usr/lib64
   fi
@@ -46,7 +46,7 @@ mkdir -p $INSTALL
   echo "$TARGET_VERSION" > $INSTALL/etc/release
 
 # copy project related files to filesystem
-  if [ -d $PROJECT_DIR/$PROJECT/filesystem ]; then
+  if [ -d "$PROJECT_DIR/$PROJECT/filesystem" ]; then
     cp -PR $PROJECT_DIR/$PROJECT/filesystem/* $INSTALL
   fi
 
@@ -59,53 +59,53 @@ mkdir -p $INSTALL
   $SCRIPTS/install util-linux-ng
 
 # Network support
-  [ "$NETWORK" = yes ] && $SCRIPTS/install network
+  [ "$NETWORK" = "yes" ] && $SCRIPTS/install network
 
 # Transmission BitTorrent support
-  [ "$TRANSMISSION" = yes ] && $SCRIPTS/install transmission
+  [ "$TRANSMISSION" = "yes" ] && $SCRIPTS/install transmission
 
 # Graphic support
-  [ ! "$DISPLAYSERVER" = no ] && $SCRIPTS/install $DISPLAYSERVER
+  [ ! "$DISPLAYSERVER" = "no" ] && $SCRIPTS/install $DISPLAYSERVER
 
 # Multimedia support
-  [ ! "$MEDIACENTER" = no ] && $SCRIPTS/install mediacenter
-  [ "$TVHEADEND" = yes ] && $SCRIPTS/install hts-tvheadend
+  [ ! "$MEDIACENTER" = "no" ] && $SCRIPTS/install mediacenter
+  [ "$TVHEADEND" = "yes" ] && $SCRIPTS/install hts-tvheadend
 
 # Automounter support
-  [ "$UDISKS" = yes ] && $SCRIPTS/install udisks
+  [ "$UDISKS" = "yes" ] && $SCRIPTS/install udisks
 
 # Powermanagement support
-  [ "$UPOWER" = yes ] && $SCRIPTS/install upower
-  [ "$UPOWER" = yes ] && $SCRIPTS/install ConsoleKit
+  [ "$UPOWER" = "yes" ] && $SCRIPTS/install upower
+  [ "$UPOWER" = "yes" ] && $SCRIPTS/install ConsoleKit
 
 # NTFS 3G support
-  [ "$NTFS3G" = yes ] && $SCRIPTS/install ntfs-3g
+  [ "$NTFS3G" = "yes" ] && $SCRIPTS/install ntfs-3g
 
 # Remote support
-  [ "$REMOTE_SUPPORT" = yes ] && $SCRIPTS/install remote
+  [ "$REMOTE_SUPPORT" = "yes" ] && $SCRIPTS/install remote
 
 # LCD support
-  [ ! "$LCD_DRIVER" = none ] && $SCRIPTS/install lcdproc
+  [ ! "$LCD_DRIVER" = "none" ] && $SCRIPTS/install lcdproc
 
 # Sensors support
-  [ "$SENSOR_SUPPORT" = yes ] && $SCRIPTS/install lm_sensors
+  [ "$SENSOR_SUPPORT" = "yes" ] && $SCRIPTS/install lm_sensors
 
 # Update support
-  [ "$UPDATE_SUPPORT" = yes ] && $SCRIPTS/install autoupdate
+  [ "$UPDATE_SUPPORT" = "yes" ] && $SCRIPTS/install autoupdate
 
 # Update support
-  [ "$INSTALLER_SUPPORT" = yes ] && $SCRIPTS/install installer
+  [ "$INSTALLER_SUPPORT" = "yes" ] && $SCRIPTS/install installer
 
 # Games and Emulators support (SDK's)
-  [ "$GAMES" = yes ] && $SCRIPTS/install games-sdk
-  [ "$EMULATORS" = yes ] && $SCRIPTS/install emulators-sdk
+  [ "$GAMES" = "yes" ] && $SCRIPTS/install games-sdk
+  [ "$EMULATORS" = "yes" ] && $SCRIPTS/install emulators-sdk
 
 # Devtools... (not for Release)
-  [ "$TESTING" = yes ] && $SCRIPTS/install testing
-  [ "$DEVTOOLS" = yes ] && $SCRIPTS/install debug
+  [ "$TESTING" = "yes" ] && $SCRIPTS/install testing
+  [ "$DEVTOOLS" = "yes" ] && $SCRIPTS/install debug
 
 # OEM packages
-  [ "$OEM_SUPPORT" = yes ] && $SCRIPTS/install oem
+  [ "$OEM_SUPPORT" = "yes" ] && $SCRIPTS/install oem
 
 # strip kernel modules
   for MOD in `find $INSTALL/lib/modules/ -name *.ko`; do