diff --git a/srcpkgs/busybox-initramfs/files/dotconfig b/srcpkgs/busybox/files/dotconfig
similarity index 99%
rename from srcpkgs/busybox-initramfs/files/dotconfig
rename to srcpkgs/busybox/files/dotconfig
index 8e9a1ab092..af62a7d686 100644
--- a/srcpkgs/busybox-initramfs/files/dotconfig
+++ b/srcpkgs/busybox/files/dotconfig
@@ -77,7 +77,7 @@ CONFIG_NO_DEBUG_LIB=y
 #
 # Installation Options ("make install" behavior)
 #
-CONFIG_INSTALL_APPLET_SYMLINKS=y
+# CONFIG_INSTALL_APPLET_SYMLINKS is not set
 # CONFIG_INSTALL_APPLET_HARDLINKS is not set
 # CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS is not set
 # CONFIG_INSTALL_APPLET_DONT is not set
@@ -225,8 +225,8 @@ CONFIG_FEATURE_LS_RECURSIVE=y
 CONFIG_FEATURE_LS_SORTFILES=y
 CONFIG_FEATURE_LS_TIMESTAMPS=y
 CONFIG_FEATURE_LS_USERNAME=y
-# CONFIG_FEATURE_LS_COLOR is not set
-# CONFIG_FEATURE_LS_COLOR_IS_DEFAULT is not set
+CONFIG_FEATURE_LS_COLOR=y
+CONFIG_FEATURE_LS_COLOR_IS_DEFAULT=y
 # CONFIG_MD5SUM is not set
 CONFIG_MKDIR=y
 # CONFIG_FEATURE_MKDIR_LONG_OPTIONS is not set
@@ -586,7 +586,7 @@ CONFIG_FEATURE_UMOUNT_ALL=y
 #
 CONFIG_FEATURE_MOUNT_LOOP=y
 CONFIG_FEATURE_MOUNT_LOOP_CREATE=y
-# CONFIG_FEATURE_MTAB_SUPPORT is not set
+CONFIG_FEATURE_MTAB_SUPPORT=y
 CONFIG_VOLUMEID=y
 
 #
@@ -658,7 +658,7 @@ CONFIG_FEATURE_CROND_DIR=""
 # CONFIG_LAST is not set
 # CONFIG_FEATURE_LAST_SMALL is not set
 # CONFIG_FEATURE_LAST_FANCY is not set
-# CONFIG_LESS is not set
+CONFIG_LESS=y
 CONFIG_FEATURE_LESS_MAXLINES=0
 # CONFIG_FEATURE_LESS_BRACKETS is not set
 # CONFIG_FEATURE_LESS_FLAGS is not set
diff --git a/srcpkgs/busybox-initramfs/template b/srcpkgs/busybox/template
similarity index 64%
rename from srcpkgs/busybox-initramfs/template
rename to srcpkgs/busybox/template
index a87427f30b..7d23fdf624 100644
--- a/srcpkgs/busybox-initramfs/template
+++ b/srcpkgs/busybox/template
@@ -1,10 +1,9 @@
-# Build template for 'busybox-initramfs'.
-pkgname=busybox-initramfs
+# Build template for 'busybox'.
+pkgname=busybox
 version=1.18.2
-wrksrc=busybox-$version
 distfiles="http://www.busybox.net/downloads/busybox-$version.tar.bz2"
 build_style=custom-install
-short_desc="The Swiss Army Knife of Embedded Linux for initial ramdisks"
+short_desc="The Swiss Army Knife of Embedded Linux"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=aa7e1cec8cd9c7f4e56098b9e4bb2ab5d593d5a35f766ad9e6a312289bf57080
 long_desc="
@@ -14,20 +13,23 @@ long_desc="
  generally have fewer options than their full-featured GNU cousins; however,
  the options that are included provide the expected functionality and behave
  very much like their GNU counterparts. BusyBox provides a fairly complete
- environment for any small or embedded system.
-
- This package provides some required utilities for the initial ramdisks."
+ environment for any small or embedded system."
 
 base_chroot=yes
+replaces="busybox-initramfs>=0"
 Add_dependency run glibc
 
 do_build()
 {
-	cp -f ${FILESDIR}/dotconfig ${wrksrc}/.config
+	cp -f ${FILESDIR}/dotconfig .config
 	make ${makejobs}
 }
 
 do_install()
 {
-	make CONFIG_PREFIX=${DESTDIR}/usr/lib/${pkgname} install
+	# XXX How to disable the fucking applets symlinks??!!!
+	install -d ${DESTDIR}/bin
+	make CONFIG_PREFIX=${DESTDIR}/usr/lib/busybox install
+	mv ${DESTDIR}/usr/lib/busybox/bin/busybox ${DESTDIR}/bin
+	rm -rf ${DESTDIR}/usr
 }