diff --git a/packages/image/install b/packages/image/install
index 7f60b1e732..164fa506a5 100755
--- a/packages/image/install
+++ b/packages/image/install
@@ -35,7 +35,7 @@ case "$2" in
     $SCRIPTS/install uClibc
     $SCRIPTS/install gcc-final
     $SCRIPTS/install linux $2
-    $SCRIPTS/install busybox $2
+    $SCRIPTS/install busybox-system
     $SCRIPTS/install automountd
 
     echo $TARGET_ARCH > $INSTALL/etc/arch
diff --git a/packages/linux/build b/packages/linux/build
index e760f9170b..c59f6f662a 100755
--- a/packages/linux/build
+++ b/packages/linux/build
@@ -6,7 +6,7 @@ $SCRIPTS/build toolchain
 $SCRIPTS/build module-init-tools
 
 export INSTALL=$(kernel_path)
-$SCRIPTS/install busybox initramfs
+$SCRIPTS/install busybox-initramfs
 $SCRIPTS/install uClibc initramfs
 
 unset LDFLAGS
diff --git a/packages/linux/config/initramfs b/packages/linux/config/initramfs
index 33ec887a83..6dd297abd6 100644
--- a/packages/linux/config/initramfs
+++ b/packages/linux/config/initramfs
@@ -56,4 +56,4 @@ dir /flash 755 0 0
 dir /sysroot 755 0 0
 dir /storage 755 0 0
 
-file /init initramfs/init.initramfs 755 0 0
+file /init initramfs/init 755 0 0
diff --git a/packages/sysutils/busybox-initramfs/build b/packages/sysutils/busybox-initramfs/build
new file mode 100755
index 0000000000..cc74e55f1a
--- /dev/null
+++ b/packages/sysutils/busybox-initramfs/build
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+. config/options
+
+$SCRIPTS/build toolchain
+$SCRIPTS/unpack busybox
+
+PKG_DIR=`find $PACKAGES -type d -name $1`
+
+if [ -f $PROJECT_DIR/$PROJECT/busybox/$1.conf ]; then
+  BUSYBOX_CFG_FILE=$PROJECT_DIR/$PROJECT/busybox/$1.conf
+else
+  BUSYBOX_CFG_FILE=$ROOT/$PKG_DIR/config/$1.conf
+fi
+
+cd $BUILD/busybox*
+
+# Build Busybox for initramfs
+  make distclean
+  cp $BUSYBOX_CFG_FILE .config
+  make oldconfig
+
+  ARCH=$TARGET_ARCH make install
diff --git a/packages/sysutils/busybox/config/busybox-initramfs.conf b/packages/sysutils/busybox-initramfs/config/busybox-initramfs.conf
similarity index 100%
rename from packages/sysutils/busybox/config/busybox-initramfs.conf
rename to packages/sysutils/busybox-initramfs/config/busybox-initramfs.conf
diff --git a/packages/sysutils/busybox-initramfs/install b/packages/sysutils/busybox-initramfs/install
new file mode 100755
index 0000000000..bbb121f61b
--- /dev/null
+++ b/packages/sysutils/busybox-initramfs/install
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+. config/options
+$SCRIPTS/unpack linux
+
+PKG_DIR=`find $PACKAGES -type d -name $1`
+
+  mkdir -p $INSTALL/initramfs
+  cp -PR $BUILD/busybox*/_install-initramfs/* $INSTALL/initramfs
+
+  cp $PKG_DIR/scripts/init $INSTALL/initramfs
diff --git a/packages/sysutils/busybox/scripts/init.initramfs b/packages/sysutils/busybox-initramfs/scripts/init
similarity index 100%
rename from packages/sysutils/busybox/scripts/init.initramfs
rename to packages/sysutils/busybox-initramfs/scripts/init
diff --git a/packages/sysutils/busybox/build b/packages/sysutils/busybox-system/build
similarity index 63%
rename from packages/sysutils/busybox/build
rename to packages/sysutils/busybox-system/build
index a451f28c86..727a426117 100755
--- a/packages/sysutils/busybox/build
+++ b/packages/sysutils/busybox-system/build
@@ -3,22 +3,17 @@
 . config/options
 
 $SCRIPTS/build toolchain
+$SCRIPTS/unpack busybox
 
 PKG_DIR=`find $PACKAGES -type d -name $1`
 
-if [ -f $PROJECT_DIR/$PROJECT/$1/$1.conf ]; then
-  BUSYBOX_CFG_FILE=$PROJECT_DIR/$PROJECT/$1/$1.conf
+if [ -f $PROJECT_DIR/$PROJECT/busybox/$1.conf ]; then
+  BUSYBOX_CFG_FILE=$PROJECT_DIR/$PROJECT/busybox/$1.conf
 else
   BUSYBOX_CFG_FILE=$ROOT/$PKG_DIR/config/$1.conf
 fi
 
-cd $PKG_BUILD
-# Build Busybox for initramfs
-  make distclean
-  cp $ROOT/$PKG_DIR/config/$1-initramfs.conf .config
-  make oldconfig
-
-  ARCH=$TARGET_ARCH make install
+cd $BUILD/busybox*
 
 # Build Busybox for system
   make distclean
diff --git a/packages/sysutils/busybox/conf.d/home b/packages/sysutils/busybox-system/conf.d/home
similarity index 100%
rename from packages/sysutils/busybox/conf.d/home
rename to packages/sysutils/busybox-system/conf.d/home
diff --git a/packages/sysutils/busybox/conf.d/language b/packages/sysutils/busybox-system/conf.d/language
similarity index 100%
rename from packages/sysutils/busybox/conf.d/language
rename to packages/sysutils/busybox-system/conf.d/language
diff --git a/packages/sysutils/busybox/conf.d/path b/packages/sysutils/busybox-system/conf.d/path
similarity index 100%
rename from packages/sysutils/busybox/conf.d/path
rename to packages/sysutils/busybox-system/conf.d/path
diff --git a/packages/sysutils/busybox/conf.d/shell b/packages/sysutils/busybox-system/conf.d/shell
similarity index 100%
rename from packages/sysutils/busybox/conf.d/shell
rename to packages/sysutils/busybox-system/conf.d/shell
diff --git a/packages/sysutils/busybox/config/busybox.conf b/packages/sysutils/busybox-system/config/busybox-system.conf
similarity index 99%
rename from packages/sysutils/busybox/config/busybox.conf
rename to packages/sysutils/busybox-system/config/busybox-system.conf
index d5e4e493b5..b0050b5e16 100644
--- a/packages/sysutils/busybox/config/busybox.conf
+++ b/packages/sysutils/busybox-system/config/busybox-system.conf
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Busybox version: 1.15.1
-# Sun Sep 20 05:27:58 2009
+# Sun Sep 20 22:22:39 2009
 #
 CONFIG_HAVE_DOT_CONFIG=y
 
@@ -416,8 +416,8 @@ CONFIG_FEATURE_NOLOGIN=y
 CONFIG_FEATURE_SECURETTY=y
 CONFIG_PASSWD=y
 # CONFIG_FEATURE_PASSWD_WEAK_CHECK is not set
-# CONFIG_CRYPTPW is not set
-# CONFIG_CHPASSWD is not set
+CONFIG_CRYPTPW=y
+CONFIG_CHPASSWD=y
 CONFIG_SU=y
 CONFIG_FEATURE_SU_SYSLOG=y
 CONFIG_FEATURE_SU_CHECKS_SHELLS=y
diff --git a/packages/sysutils/busybox/config/device_table.conf b/packages/sysutils/busybox-system/config/device_table.conf
similarity index 100%
rename from packages/sysutils/busybox/config/device_table.conf
rename to packages/sysutils/busybox-system/config/device_table.conf
diff --git a/packages/sysutils/busybox/config/mdev.conf b/packages/sysutils/busybox-system/config/mdev.conf
similarity index 100%
rename from packages/sysutils/busybox/config/mdev.conf
rename to packages/sysutils/busybox-system/config/mdev.conf
diff --git a/packages/sysutils/busybox/config/sysconfig b/packages/sysutils/busybox-system/config/sysconfig
similarity index 100%
rename from packages/sysutils/busybox/config/sysconfig
rename to packages/sysutils/busybox-system/config/sysconfig
diff --git a/packages/sysutils/busybox/init.d/13_syslogd b/packages/sysutils/busybox-system/init.d/13_syslogd
similarity index 100%
rename from packages/sysutils/busybox/init.d/13_syslogd
rename to packages/sysutils/busybox-system/init.d/13_syslogd
diff --git a/packages/sysutils/busybox/init.d/25_acpid b/packages/sysutils/busybox-system/init.d/25_acpid
similarity index 100%
rename from packages/sysutils/busybox/init.d/25_acpid
rename to packages/sysutils/busybox-system/init.d/25_acpid
diff --git a/packages/sysutils/busybox/init.d/53_httpd b/packages/sysutils/busybox-system/init.d/53_httpd
similarity index 100%
rename from packages/sysutils/busybox/init.d/53_httpd
rename to packages/sysutils/busybox-system/init.d/53_httpd
diff --git a/packages/sysutils/busybox/init.d/54_crond b/packages/sysutils/busybox-system/init.d/54_crond
similarity index 100%
rename from packages/sysutils/busybox/init.d/54_crond
rename to packages/sysutils/busybox-system/init.d/54_crond
diff --git a/packages/sysutils/busybox/init.d/80_debug b/packages/sysutils/busybox-system/init.d/80_debug
similarity index 100%
rename from packages/sysutils/busybox/init.d/80_debug
rename to packages/sysutils/busybox-system/init.d/80_debug
diff --git a/packages/sysutils/busybox/init.d/99_shutdown b/packages/sysutils/busybox-system/init.d/99_shutdown
similarity index 100%
rename from packages/sysutils/busybox/init.d/99_shutdown
rename to packages/sysutils/busybox-system/init.d/99_shutdown
diff --git a/packages/sysutils/busybox/install b/packages/sysutils/busybox-system/install
similarity index 53%
rename from packages/sysutils/busybox/install
rename to packages/sysutils/busybox-system/install
index de784feb9e..6253000d53 100755
--- a/packages/sysutils/busybox/install
+++ b/packages/sysutils/busybox-system/install
@@ -1,30 +1,22 @@
 #!/bin/sh
 
 . config/options
-$SCRIPTS/unpack linux
+
+$SCRIPTS/build busybox-hosttools
 
 PKG_DIR=`find $PACKAGES -type d -name $1`
 
-if [ "$2" = initramfs ]; then
-  mkdir -p $INSTALL/$2
-  cp -PR $PKG_BUILD/_install-$2/* $INSTALL/$2
+ROOT_PWD="`$ROOT/$TOOLCHAIN/bin/mkpasswd $ROOT_PASSWORD`"
 
-  cp $PKG_DIR/scripts/init.$2 $INSTALL/$2
-fi
-
-if [ "$2" = system ]; then
-
-  add_user root passwort 0 0 "Root User" "/storage" "/bin/sh"
+  add_user root "$ROOT_PWD" 0 0 "Root User" "/storage" "/bin/sh"
   add_group root 0
 
-  cp -PR $PKG_BUILD/_install-$2/* $INSTALL
+  cp -PR $BUILD/busybox*/_install-system/* $INSTALL
 
   mkdir -p $INSTALL/bin
   ln -sf /bin/sh $INSTALL/bin/bash
 
   mkdir -p $INSTALL/etc
-#  cp $PKG_DIR/config/passwd $INSTALL/etc
-#  cp $PKG_DIR/config/group $INSTALL/etc
   cp $PKG_DIR/config/sysconfig $INSTALL/etc
   echo $ISSUE >  $INSTALL/etc/issue
 
@@ -32,10 +24,8 @@ if [ "$2" = system ]; then
   cp $PKG_DIR/scripts/udhcp.script $INSTALL/usr/share/udhcpc/default.script
 
   mkdir -p $INSTALL/sbin
-  cp $PKG_DIR/scripts/init.system $INSTALL/sbin/init.system
+  cp $PKG_DIR/scripts/init $INSTALL/sbin/init.system
 
   # acpid specific
   mkdir -p $INSTALL/etc/acpi/PWRF
   cp $PKG_DIR/scripts/acpi_powerbtn $INSTALL/etc/acpi/PWRF/00000080
-
-fi
diff --git a/packages/sysutils/busybox/scripts/acpi_powerbtn b/packages/sysutils/busybox-system/scripts/acpi_powerbtn
similarity index 100%
rename from packages/sysutils/busybox/scripts/acpi_powerbtn
rename to packages/sysutils/busybox-system/scripts/acpi_powerbtn
diff --git a/packages/sysutils/busybox/scripts/init.system b/packages/sysutils/busybox-system/scripts/init
similarity index 100%
rename from packages/sysutils/busybox/scripts/init.system
rename to packages/sysutils/busybox-system/scripts/init
diff --git a/packages/sysutils/busybox/scripts/udhcp.script b/packages/sysutils/busybox-system/scripts/udhcp.script
similarity index 100%
rename from packages/sysutils/busybox/scripts/udhcp.script
rename to packages/sysutils/busybox-system/scripts/udhcp.script