diff --git a/packages/addons/service/downloadmanager/transmission/source/bin/transmission.service b/packages/addons/service/downloadmanager/transmission/source/bin/transmission.service
index 453445267c..c8893fd38e 100755
--- a/packages/addons/service/downloadmanager/transmission/source/bin/transmission.service
+++ b/packages/addons/service/downloadmanager/transmission/source/bin/transmission.service
@@ -64,7 +64,7 @@ else
   TRANSMISSION_ARG="$TRANSMISSION_ARG -T"
 fi
 
-if [ ! $(pidof transmission-daemon) ];then
+if [ ! "$(pidof transmission-daemon)" ];then
   chmod +x $ADDON_DIR/lib/*
 
   LD_LIBRARY_PATH="$ADDON_DIR/lib:$LD_LIBRARY_PATH" transmission-daemon $TRANSMISSION_ARG &>$LOG_FILE
diff --git a/packages/addons/service/multimedia/boblightd/source/bin/boblightd.service b/packages/addons/service/multimedia/boblightd/source/bin/boblightd.service
index 04540b59f2..ff8696492d 100755
--- a/packages/addons/service/multimedia/boblightd/source/bin/boblightd.service
+++ b/packages/addons/service/multimedia/boblightd/source/bin/boblightd.service
@@ -41,7 +41,7 @@ export LD_LIBRARY_PATH="$ADDON_DIR/lib:$LD_LIBRARY_PATH"
 
 cp -R $ADDON_DIR/config/*.sample $ADDON_HOME > $LOG_FILE 2>&1
 
-if [ ! $(pidof boblightd) ]; then
+if [ ! "$(pidof boblightd)" ]; then
 	if [ -e $BOBLIGHT_CONFIG ]; then
 	
 		# Make sure the xserver has started up
@@ -53,7 +53,7 @@ if [ ! $(pidof boblightd) ]; then
 	fi
 fi
 
-if [ ! $(pidof boblight-X11) ]; then                                               
+if [ ! "$(pidof boblight-X11)" ]; then                                               
 	if [ -e $BOBLIGHT_X11 ]; then
 	
 	        # Make sure the xserver has started up
diff --git a/packages/addons/service/multimedia/hts-tvheadend/source/bin/tvheadend.start b/packages/addons/service/multimedia/hts-tvheadend/source/bin/tvheadend.start
index 1543bb0417..2028c5246f 100755
--- a/packages/addons/service/multimedia/hts-tvheadend/source/bin/tvheadend.start
+++ b/packages/addons/service/multimedia/hts-tvheadend/source/bin/tvheadend.start
@@ -46,7 +46,7 @@ fi
 TVHEADEND_ARG="-C -s -u root -g video -c $ADDON_HOME"
 
 mkdir -p $ADDON_HOME
-  if [ ! $(pidof $ADDON_BIN) ]; then
+  if [ ! "$(pidof $ADDON_BIN)" ]; then
     # start userspace DVB driver/addon
     for driver_dvb in $(find /storage/.xbmc/addons/driver.dvb.*/bin/userspace-driver.sh -type f 2>/dev/null); do
       driver_dvb_name=$(echo $driver_dvb | awk 'BEGIN {FS="/"} {printf("%s", $5)}')
diff --git a/packages/addons/service/multimedia/hts-tvheadend/source/bin/tvheadend.stop b/packages/addons/service/multimedia/hts-tvheadend/source/bin/tvheadend.stop
index de40831063..dc58e7de61 100755
--- a/packages/addons/service/multimedia/hts-tvheadend/source/bin/tvheadend.stop
+++ b/packages/addons/service/multimedia/hts-tvheadend/source/bin/tvheadend.stop
@@ -27,7 +27,7 @@ LOCKFILE="tvheadend.disabled"
 
 ADDON_BIN="tvheadend"
 
-if [ $(pidof $ADDON_BIN) ];then
+if [ "$(pidof $ADDON_BIN)" ];then
   mkdir -p "$LOCKDIR"
   touch "$LOCKDIR/$LOCKFILE"
   killall $ADDON_BIN
diff --git a/packages/addons/service/multimedia/hts-tvheadend/source/sleep.d/tvheadend.power b/packages/addons/service/multimedia/hts-tvheadend/source/sleep.d/tvheadend.power
index e2e778501f..1fc9b6f083 100755
--- a/packages/addons/service/multimedia/hts-tvheadend/source/sleep.d/tvheadend.power
+++ b/packages/addons/service/multimedia/hts-tvheadend/source/sleep.d/tvheadend.power
@@ -28,7 +28,7 @@ REMOVE_MODULES=`grep REMOVE_MODULES $ADDON_SETTINGS | awk '{print $3 }' | sed -e
 
 case "$1" in
   hibernate|suspend)
-    if [ $(pidof tvheadend) ];then
+    if [ "$(pidof tvheadend)" ];then
       progress "Shutting down HTS TVHeadend for suspending..."
       tvheadend.stop
       for module in $REMOVE_MODULES ; do
diff --git a/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start b/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start
index abff128bac..e78d2a6c84 100755
--- a/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start
+++ b/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start
@@ -60,7 +60,7 @@ fi
   done
 )
 
-if [ ! $(pidof vdr.bin) ];then
+if [ ! "$(pidof vdr.bin)" ];then
   # start userspace DVB driver/addon
   for driver_dvb in $(find /storage/.xbmc/addons/driver.dvb.*/bin/userspace-driver.sh -type f 2>/dev/null); do
     driver_dvb_name=$(echo $driver_dvb | awk 'BEGIN {FS="/"} {printf("%s", $5)}')
diff --git a/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.stop b/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.stop
index db3143fe8b..ede8bcacbb 100755
--- a/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.stop
+++ b/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.stop
@@ -25,7 +25,7 @@
 LOCKDIR="/var/lock/"
 LOCKFILE="vdr.disabled"
 
-if [ $(pidof vdr.bin) ];then
+if [ "$(pidof vdr.bin)" ];then
   mkdir -p "$LOCKDIR"
   touch "$LOCKDIR/$LOCKFILE"
   killall vdr.bin