diff --git a/packages/sysutils/busybox/init.d/02_make-directories b/packages/sysutils/busybox/init.d/02_make-directories
index 096e5b6f64..70c93b066b 100644
--- a/packages/sysutils/busybox/init.d/02_make-directories
+++ b/packages/sysutils/busybox/init.d/02_make-directories
@@ -38,11 +38,8 @@ progress "make variable directory structure"
   touch /var/run/utmp
     chmod 1777 /var/run/utmp
 
-progress "make runtime directory structure"
-  ln -sf /storage/.config/modprobe.d /run/modprobe.d
-
 progress "make logging directory structure"
-  if test "$DEBUG" = "yes"; then
+  if [ ! "$RUNLEVEL" = "installer" -a "$DEBUG" = "yes" ]; then
     mkdir -p $HOME/log
     ln -sf $HOME/log /var/log
   else
@@ -52,19 +49,24 @@ progress "make logging directory structure"
   touch /var/log/wtmp
     chmod 1777 /var/log/wtmp
 
-progress "make variable library directory structure"
-# others:
-  mkdir -p /var/lib/polkit-1
-    chmod 700 /var/lib/polkit-1
-  mkdir -p /var/lib/polkit-1/localauthority/10-vendor.d
-  mkdir -p /var/lib/polkit-1/localauthority/20-org.d
-  mkdir -p /var/lib/polkit-1/localauthority/30-site.d
-  mkdir -p /var/lib/polkit-1/localauthority/50-local.d
-  mkdir -p /var/lib/polkit-1/localauthority/90-mandatory.d
+if [ ! "$RUNLEVEL" = "installer" ]; then
+  progress "make runtime directory structure"
+    ln -sf /storage/.config/modprobe.d /run/modprobe.d
 
-  mkdir -p /var/lib/udisks
-  mkdir -p /var/lib/upower
+  progress "make variable library directory structure"
+  # others:
+    mkdir -p /var/lib/polkit-1
+      chmod 700 /var/lib/polkit-1
+    mkdir -p /var/lib/polkit-1/localauthority/10-vendor.d
+    mkdir -p /var/lib/polkit-1/localauthority/20-org.d
+    mkdir -p /var/lib/polkit-1/localauthority/30-site.d
+    mkdir -p /var/lib/polkit-1/localauthority/50-local.d
+    mkdir -p /var/lib/polkit-1/localauthority/90-mandatory.d
 
-progress "make caching directory structure"
-  mkdir -p $HOME/.cache/bluetooth
-  ln -sf $HOME/.cache/bluetooth /var/lib/bluetooth
+    mkdir -p /var/lib/udisks
+    mkdir -p /var/lib/upower
+
+  progress "make caching directory structure"
+    mkdir -p $HOME/.cache/bluetooth
+    ln -sf $HOME/.cache/bluetooth /var/lib/bluetooth
+fi
diff --git a/packages/sysutils/busybox/init.d/06_systemconfig b/packages/sysutils/busybox/init.d/06_systemconfig
index f0b0750dbe..5cbd4a6585 100644
--- a/packages/sysutils/busybox/init.d/06_systemconfig
+++ b/packages/sysutils/busybox/init.d/06_systemconfig
@@ -27,7 +27,7 @@ OPENELEC_SETTINGS="$HOME/.xbmc/userdata/addon_data/os.openelec.settings/settings
 
 if [ -f "$OPENELEC_SETTINGS" ]; then
     progress "creating system settings"
-    
+
     mkdir -p /var/config
     cat "$OPENELEC_SETTINGS" \
         | awk -F'["'\'']' '{gsub(/\&quot\;/, "\\\"", $4); gsub(/\&apos\;/, "\047", $4); gsub(/\&amp\;/, "\\&", $4); gsub(/\&lt\;/, "<", $4); gsub(/\&gt\;/, ">", $4); gsub(/\$/, "\\\$", $4); gsub(/`/, "\\`", $4); print $2"=\""$4"\"";}' \
diff --git a/packages/sysutils/busybox/init.d/10_cdrom b/packages/sysutils/busybox/init.d/10_cdrom
index 0b126ec933..e82393990d 100644
--- a/packages/sysutils/busybox/init.d/10_cdrom
+++ b/packages/sysutils/busybox/init.d/10_cdrom
@@ -21,7 +21,7 @@
 #
 # setup cdrom settings
 #
-# runlevels: openelec, installer, textmode
+# runlevels: openelec, textmode
 
 progress "Setup some CDROM settings"
   sysctl -w dev.cdrom.lock=0 > /dev/null 2>&1 &
diff --git a/packages/sysutils/busybox/init.d/23_syslogd b/packages/sysutils/busybox/init.d/23_syslogd
index 3eb91fe548..e89918dfce 100644
--- a/packages/sysutils/busybox/init.d/23_syslogd
+++ b/packages/sysutils/busybox/init.d/23_syslogd
@@ -21,7 +21,7 @@
 #
 # start syslog daemon
 #
-# runlevels: openelec, installer, textmode
+# runlevels: openelec, textmode
 
 (
   progress "Starting Syslog daemon"