Upgrade to busybox-1.4.1

git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@7040 33e552b5-05e3-0310-8538-816dae2090ed

23 files changed, 1793 insertions, 1166 deletions

diff --git a/config/busybox-1.1.3/Config.in b/config/busybox-1.4.1/Config.in
index f0114cbf4..79b81a30a 100644
--- a/config/busybox-1.1.3/Config.in
+++ b/config/busybox-1.4.1/Config.in
@@ -15,9 +15,34 @@ menu "Busybox Settings"
 menu "General Configuration"
   depends on BUSYBOX
 
+config BB_NITPICK
+	bool "See lots more (probably unnecessary) configuration options."
+	default n
+	help
+	  Some BusyBox applets have more configuration options than anyone
+	  will ever care about.  To avoid drowining people in complexity, most
+	  of the applet features that can be set to a sane default value are
+	  hidden, unless you hit the above switch.
+
+	  This is better than to telling people to edit the busybox source
+	  code, but not by much.
+
+	  See http://en.wikipedia.org/wiki/Fibber_McGee_and_Molly#The_Closet
+
+	  You have been warned.
+
+config BB_DESKTOP
+	bool "Enable options for full-blown desktop systems"
+	default n
+	help
+	  Enable options and features which are not essential.
+	  Select this only if you plan to use busybox on full-blown
+	  desktop machine with common Linux distro, not on an embedded box.
+
 choice
 	prompt "Buffer allocation policy"
-	default BB_CONFIG_FEATURE_BUFFERS_USE_MALLOC
+	default BB_FEATURE_BUFFERS_USE_MALLOC
+	depends on BB_NITPICK
 	help
 	  There are 3 ways BusyBox can handle buffer allocations:
 	  - Use malloc. This costs code size for the call to xmalloc.
@@ -28,27 +53,51 @@ choice
 	    behavior was the only one available for BusyBox versions 0.48 and
 	    earlier.
 
-config BB_CONFIG_FEATURE_BUFFERS_USE_MALLOC
+config BB_FEATURE_BUFFERS_USE_MALLOC
 	bool "Allocate with Malloc"
 
-config BB_CONFIG_FEATURE_BUFFERS_GO_ON_STACK
+config BB_FEATURE_BUFFERS_GO_ON_STACK
 	bool "Allocate on the Stack"
 
-config BB_CONFIG_FEATURE_BUFFERS_GO_IN_BSS
+config BB_FEATURE_BUFFERS_GO_IN_BSS
 	bool "Allocate in the .bss section"
 
 endchoice
 
-config BB_CONFIG_FEATURE_VERBOSE_USAGE
+config BB_SHOW_USAGE
+	bool "Show terse applet usage messages"
+	default y
+	help
+	  All BusyBox applets will show help messages when invoked with
+	  wrong arguments. You can turn off printing these terse usage
+	  messages if you say no here.
+	  This will save you up to 7k.
+
+config BB_FEATURE_VERBOSE_USAGE
 	bool "Show verbose applet usage messages"
 	default n
+	select BB_SHOW_USAGE
 	help
 	  All BusyBox applets will show more verbose help messages when
 	  busybox is invoked with --help.  This will add a lot of text to the
 	  busybox binary.  In the default configuration, this will add about
 	  13k, but it can add much more depending on your configuration.
 
-config BB_CONFIG_FEATURE_INSTALLER
+config BB_FEATURE_COMPRESS_USAGE
+	bool "Store applet usage messages in compressed form"
+	default y
+	depends on BB_SHOW_USAGE
+	help
+	  Store usage messages in compressed form, uncompress them on-the-fly
+	  when <applet> --help is called.
+
+	  If you have a really tiny busybox with few applets enabled (and
+	  bunzip2 isn't one of them), the overhead of the decompressor might
+	  be noticeable.  Also, if you run executables directly from ROM
+	  and have very little memory, this might not be a win.  Otherwise,
+	  you probably want this.
+
+config BB_FEATURE_INSTALLER
 	bool "Support --install [-s] to install applet links at runtime"
 	default n
 	help
@@ -57,32 +106,34 @@ config BB_CONFIG_FEATURE_INSTALLER
 	  applets that are compiled into busybox.  This feature requires the
 	  /proc filesystem.
 
-config BB_CONFIG_LOCALE_SUPPORT
+config BB_LOCALE_SUPPORT
 	bool "Enable locale support (system needs locale for this to work)"
 	default n
 	help
 	  Enable this if your system has locale support and you would like
 	  busybox to support locale settings.
 
-config BB_CONFIG_FEATURE_DEVFS
-	bool "Support for devfs"
-	default n
+config BB_GETOPT_LONG
+	bool "Enable support for --long-options"
+	default y
 	help
-	  Enable if you want BusyBox to work with devfs.
+	  Enable this if you want busybox applets to use the gnu --long-option
+	  style, in addition to single character -a -b -c style options.
 
-config BB_CONFIG_FEATURE_DEVPTS
+config BB_FEATURE_DEVPTS
 	bool "Use the devpts filesystem for Unix98 PTYs"
-	default y if BB_CONFIG_FEATURE_DEVFS
+	default y
 	help
 	  Enable if you want BusyBox to use Unix98 PTY support. If enabled,
 	  busybox will use /dev/ptmx for the master side of the pseudoterminal
 	  and /dev/pts/<number> for the slave side.  Otherwise, BSD style
 	  /dev/ttyp<number> will be used. To use this option, you should have
-	  devpts or devfs mounted.
+	  devpts mounted.
 
-config BB_CONFIG_FEATURE_CLEAN_UP
+config BB_FEATURE_CLEAN_UP
 	bool "Clean up all memory before exiting (usually not needed)"
 	default n
+	depends on BB_NITPICK
 	help
 	  As a size optimization, busybox normally exits without explicitly
 	  freeing dynamically allocated memory or closing files.  This saves
@@ -92,19 +143,36 @@ config BB_CONFIG_FEATURE_CLEAN_UP
 	  Don't enable this unless you have a really good reason to clean
 	  things up manually.
 
-config BB_CONFIG_FEATURE_SUID
+config BB_FEATURE_SUID
 	bool "Support for SUID/SGID handling"
 	default n
 	help
-	  Support SUID and SGID binaries.
+	  With this option you can install the busybox binary belonging
+	  to root with the suid bit set, and it'll and it'll automatically drop
+	  priviledges for applets that don't need root access.
+
+	  If you're really paranoid and don't want to do this, build two
+	  busybox binaries with different applets in them (and the appropriate
+	  symlinks pointing to each binary), and only set the suid bit on the
+	  one that needs it.  The applets currently marked to need the suid bit
+	  are login, passwd, su, ping, traceroute, crontab, dnsd, ipcrm, ipcs,
+	  and vlock.
+
+config BB_FEATURE_SYSLOG
+	bool "Support for syslog"
+	default n
+	help
+	  This option is auto-selected when you select any applet which may
+	  send its output to syslog. You do not need to select it manually.
 
-config BB_CONFIG_FEATURE_SUID_CONFIG
+config BB_FEATURE_SUID_CONFIG
 	bool "Runtime SUID/SGID configuration via /etc/busybox.conf"
-	default n if BB_CONFIG_FEATURE_SUID
-	depends on BB_CONFIG_FEATURE_SUID
+	default n if BB_FEATURE_SUID
+	depends on BB_FEATURE_SUID
 	help
-	  Allow the SUID / SGID state of an applet to be determined runtime by
-	  checking /etc/busybox.conf.  The format of this file is as follows:
+	  Allow the SUID / SGID state of an applet to be determined at runtime
+	  by checking /etc/busybox.conf.  (This is sort of a poor man's sudo.)
+	  The format of this file is as follows:
 
 	  <applet> = [Ssx-][Ssx-][x-] (<username>|<uid>).(<groupname>|<gid>)
 
@@ -129,35 +197,58 @@ config BB_CONFIG_FEATURE_SUID_CONFIG
 	  Robert 'sandman' Griebl has more information here:
 	  <url: http://www.softforge.de/bb/suid.html >.
 
-config BB_CONFIG_FEATURE_SUID_CONFIG_QUIET
+config BB_FEATURE_SUID_CONFIG_QUIET
 	bool "Suppress warning message if /etc/busybox.conf is not readable"
-	default n
-	depends on BB_CONFIG_FEATURE_SUID_CONFIG
+	default y
+	depends on BB_FEATURE_SUID_CONFIG
 	help
 	  /etc/busybox.conf should be readable by the user needing the SUID, check
 	  this option to avoid users to be notified about missing permissions.
 
-config BB_CONFIG_SELINUX
+config BB_FEATURE_HAVE_RPC
+	bool "RPC support"
+	default y
+	help
+	  Select this if you have rpc support.
+	  This automatically turns off all configuration options that rely
+	  on RPC.
+
+config BB_SELINUX
 	bool "Support NSA Security Enhanced Linux"
 	default n
 	help
-	  Enable support for SE Linux in applets ls, ps, and id.  Also provide
-	  the option of compiling in SE Linux applets.
+	  Enable support for SELinux in applets ls, ps, and id.  Also provide
+	  the option of compiling in SELinux applets.
 
-	  If you do not have a complete SE Linux Full Userland installed, this
-	  stuff will not compile.  Go visit
+	  If you do not have a complete SELinux userland installed, this stuff
+	  will not compile. Go visit
 		http://www.nsa.gov/selinux/index.html
-	  to download the necessary stuff to allow busybox to compile with this
-	  option enabled.
+	  to download the necessary stuff to allow busybox to compile with
+	  this option enabled. Specifially, libselinux 1.28 or better is
+	  directly required by busybox. If the installation is located in a
+	  non-standard directory, provide it by invoking make as follows:
+		CFLAGS=-I<libselinux-include-path> \
+		LDFLAGS=-L<libselinux-lib-path> \
+		make
 
 	  Most people will leave this set to 'N'.
 
+config BB_BUSYBOX_EXEC_PATH
+	string "Path to BusyBox executable"
+	default "/proc/self/exe"
+	help
+	  When Busybox applets need to run other busybox applets, BusyBox
+	  sometimes needs to exec() itself.  When the /proc filesystem is
+	  mounted, /proc/self/exe always points to the currently running
+	  executable.  If you haven't got /proc, set this to wherever you
+	  want to run BusyBox from.
+
 endmenu
 
 menu 'Build Options'
   depends on BUSYBOX
 
-config BB_CONFIG_STATIC
+config BB_STATIC
 	bool "Build BusyBox as a static binary (no shared libs)"
 	default n
 	help
@@ -171,25 +262,22 @@ config BB_CONFIG_STATIC
 
 	  Most people will leave this set to 'N'.
 
-# The busybox shared library feature is there so make standalone can produce
-# smaller applets.  Since make standalone isn't in yet, there's nothing using
-# this yet, and so it's disabled.
-config BB_CONFIG_DISABLE_SHARED
-	bool
-	default n
-
-config BB_CONFIG_BUILD_LIBBUSYBOX
+config BB_BUILD_LIBBUSYBOX
 	bool "Build shared libbusybox"
 	default n
-	depends on BB_CONFIG_DISABLE_SHARED
 	help
 	  Build a shared library libbusybox.so which contains all
 	  libraries used inside busybox.
 
-config BB_CONFIG_FEATURE_FULL_LIBBUSYBOX
+	  This is an experimental feature intended to support the upcoming
+	  "make standalone" mode.  Enabling it against the one big busybox
+	  binary serves no purpose (and increases the size).  You should
+	  almost certainly say "no" to this right now.
+
+config BB_FEATURE_FULL_LIBBUSYBOX
 	bool "Feature-complete libbusybox"
-	default n if !BB_CONFIG_FEATURE_SHARED_BUSYBOX
-	depends on BB_CONFIG_BUILD_LIBBUSYBOX
+	default n if !BB_FEATURE_SHARED_BUSYBOX
+	depends on BB_BUILD_LIBBUSYBOX
 	help
 	  Build a libbusybox with the complete feature-set, disregarding
 	  the actually selected config.
@@ -205,15 +293,15 @@ config BB_CONFIG_FEATURE_FULL_LIBBUSYBOX
 
 	  Say 'N' if in doubt.
 
-config BB_CONFIG_FEATURE_SHARED_BUSYBOX
+config BB_FEATURE_SHARED_BUSYBOX
 	bool "Use shared libbusybox for busybox"
-	default y if BB_CONFIG_BUILD_LIBBUSYBOX
-	depends on !BB_CONFIG_STATIC && BB_CONFIG_BUILD_LIBBUSYBOX
+	default y if BB_BUILD_LIBBUSYBOX
+	depends on !BB_STATIC && BB_BUILD_LIBBUSYBOX
 	help
 	  Use libbusybox.so also for busybox itself.
 	  You need to have a working dynamic linker to use this variant.
 
-config BB_CONFIG_LFS
+config BB_LFS
 	bool "Build with Large File Support (for accessing files > 2 GB)"
 	default n
 	select BB_FDISK_SUPPORT_LARGE_DISKS
@@ -225,34 +313,7 @@ config BB_CONFIG_LFS
 	  cp, mount, tar, and many others.  If you want to access files larger
 	  than 2 Gigabytes, enable this option.  Otherwise, leave it set to 'N'.
 
-config BB_USING_CROSS_COMPILER
-	bool "Do you want to build BusyBox with a Cross Compiler?"
-	default n
-	help
-	  Do you want to build BusyBox with a Cross Compiler?  If so,
-	  then enable this option.  Otherwise leave it set to 'N'.
-
-config BB_CROSS_COMPILER_PREFIX
-	string "Cross Compiler prefix"
-	default "/usr/i386-linux-uclibc/bin/i386-uclibc-"
-	depends on BB_USING_CROSS_COMPILER
-	help
-	  If you want to build BusyBox with a cross compiler, then you
-	  will need to set this to the cross-compiler prefix.  For example,
-	  if my cross-compiler is /usr/iBB_386-linux-uclibc/bin/iBB_386-uclibc-gcc
-	  then I would enter '/usr/i386-linux-uclibc/bin/i386-uclibc-' here,
-	  which will ensure the correct compiler is used.
-
-config BB_EXTRA_CFLAGS_OPTIONS
-	string "Any extra CFLAGS options for the compiler?"
-	default ""
-	help
-	  Do you want to pass any extra CFLAGS options to the compiler as
-	  you build BusyBox? If so, this is the option for you...  For example,
-	  if you want to add some simple compiler switches (like -march=iBB_686),
-	  or check for warnings using -Werror, just those options here.
-
-config BB_CONFIG_BUILD_AT_ONCE
+config BB_BUILD_AT_ONCE
 	bool "Compile all sources at once"
 	default n
 	help
@@ -276,22 +337,32 @@ endmenu
 menu 'Debugging Options'
   depends on BUSYBOX
 
-config BB_CONFIG_DEBUG
-	bool "Build BusyBox with Debugging symbols"
+config BB_DEBUG
+	bool "Build BusyBox with extra Debugging symbols"
 	default n
 	help
-	  Say Y here if you wish to compile BusyBox with debugging symbols.
-	  This will allow you to use a debugger to examine BusyBox internals
-	  while applets are running.  This increases the size of the binary
-	  considerably and should only be used when doing development.
-	  If you are doing development and want to debug BusyBox, answer Y.
+	  Say Y here if you wish to examine BusyBox internals while applets are
+	  running.  This increases the size of the binary considerably, and
+	  should only be used when doing development.  If you are doing
+	  development and want to debug BusyBox, answer Y.
 
 	  Most people should answer N.
 
+config BB_DEBUG_PESSIMIZE
+	bool "Disable compiler optimizations."
+	default n
+	depends on BB_DEBUG
+	help
+	  The compiler's optimization of source code can eliminate and reorder
+	  code, resulting in an executable that's hard to understand when
+	  stepping through it with a debugger.  This switches it off, resulting
+	  in a much bigger executable that more closely matches the source
+	  code.
+
 choice
 	prompt "Additional debugging library"
-	default BB_CONFIG_NO_DEBUG_LIB
-	depends on BB_CONFIG_DEBUG
+	default BB_NO_DEBUG_LIB
+	depends on BB_DEBUG
 	help
 	  Using an additional debugging library will make BusyBox become
 	  considerable larger and will cause it to run more slowly.  You
@@ -319,32 +390,32 @@ choice
 	  you are hunting a hard to find memory problem.
 
 
-config BB_CONFIG_NO_DEBUG_LIB
+config BB_NO_DEBUG_LIB
 	bool "None"
 
-config BB_CONFIG_DMALLOC
+config BB_DMALLOC
 	bool "Dmalloc"
 
-config BB_CONFIG_EFENCE
+config BB_EFENCE
 	bool "Electric-fence"
 
 endchoice
 
-config BB_CONFIG_DEBUG_YANK_SUSv2
-	bool "Disable obsolete features removed before SUSv3?"
+config BB_INCLUDE_SUSv2
+	bool "Enable obsolete features removed before SUSv3?"
 	default y
 	help
-	  This option will disable backwards compatability with SuSv2,
+	  This option will enable backwards compatibility with SuSv2,
 	  specifically, old-style numeric options ('command -1 <file>')
-	  will not be supported in head, tail, and fold.  (Note: should
-	  yank from renice too.)
+	  will be supported in head, tail, and fold.  (Note: should
+	  affect renice too.)
 
 endmenu
 
 menu 'Installation Options'
   depends on BUSYBOX
 
-config BB_CONFIG_INSTALL_NO_USR
+config BB_INSTALL_NO_USR
 	bool "Don't use /usr"
 	default n
 	help
@@ -353,29 +424,29 @@ config BB_CONFIG_INSTALL_NO_USR
 
 choice
        prompt "Applets links"
-       default BB_CONFIG_INSTALL_APPLET_SYMLINKS
+       default BB_INSTALL_APPLET_SYMLINKS
        help
          Choose how you install applets links.
 
-config BB_CONFIG_INSTALL_APPLET_SYMLINKS
+config BB_INSTALL_APPLET_SYMLINKS
        bool "as soft-links"
        help
          Install applets as soft-links to the busybox binary. This needs some
          free inodes on the filesystem, but might help with filesystem
          generators that can't cope with hard-links.
 
-config BB_CONFIG_INSTALL_APPLET_HARDLINKS
+config BB_INSTALL_APPLET_HARDLINKS
        bool "as hard-links"
        help
          Install applets as hard-links to the busybox binary. This might count
          on a filesystem with few inodes.
 
-config BB_CONFIG_INSTALL_APPLET_DONT
+config BB_INSTALL_APPLET_DONT
        bool
        prompt "not installed"
-       depends on BB_CONFIG_FEATURE_INSTALLER || BB_CONFIG_FEATURE_SH_STANDALONE_SHELL
+       depends on BB_FEATURE_INSTALLER || BB_FEATURE_SH_STANDALONE_SHELL
        help
-         Do not install applets links. Usefull when using the -install feature
+         Do not install applet links. Useful when using the -install feature
          or a standalone shell for rescue pruposes.
 
 endchoice
@@ -388,25 +459,26 @@ config BB_PREFIX
 
 endmenu
 
-source config/busybox-1.1.3/libbb/Config.in
+source config/busybox-1.4.1/libbb/Config.in
 
 endmenu
 
 comment "Applets"
 
-source config/busybox-1.1.3/archival/Config.in
-source config/busybox-1.1.3/coreutils/Config.in
-source config/busybox-1.1.3/console-tools/Config.in
-source config/busybox-1.1.3/debianutils/Config.in
-source config/busybox-1.1.3/editors/Config.in
-source config/busybox-1.1.3/findutils/Config.in
-source config/busybox-1.1.3/init/Config.in
-source config/busybox-1.1.3/loginutils/Config.in
-source config/busybox-1.1.3/e2fsprogs/Config.in
-source config/busybox-1.1.3/modutils/Config.in
-source config/busybox-1.1.3/util-linux/Config.in
-source config/busybox-1.1.3/miscutils/Config.in
-source config/busybox-1.1.3/networking/Config.in
-source config/busybox-1.1.3/procps/Config.in
-source config/busybox-1.1.3/shell/Config.in
-source config/busybox-1.1.3/sysklogd/Config.in
+source config/busybox-1.4.1/archival/Config.in
+source config/busybox-1.4.1/coreutils/Config.in
+source config/busybox-1.4.1/console-tools/Config.in
+source config/busybox-1.4.1/debianutils/Config.in
+source config/busybox-1.4.1/editors/Config.in
+source config/busybox-1.4.1/findutils/Config.in
+source config/busybox-1.4.1/init/Config.in
+source config/busybox-1.4.1/loginutils/Config.in
+source config/busybox-1.4.1/e2fsprogs/Config.in
+source config/busybox-1.4.1/modutils/Config.in
+source config/busybox-1.4.1/util-linux/Config.in
+source config/busybox-1.4.1/miscutils/Config.in
+source config/busybox-1.4.1/networking/Config.in
+source config/busybox-1.4.1/procps/Config.in
+source config/busybox-1.4.1/shell/Config.in
+source config/busybox-1.4.1/sysklogd/Config.in
+source config/busybox-1.4.1/runit/Config.in
diff --git a/config/busybox-1.1.3/Extract b/config/busybox-1.4.1/Extract
index 1c042546a..1c042546a 100755..100644
--- a/config/busybox-1.1.3/Extract
+++ b/config/busybox-1.4.1/Extract
diff --git a/config/busybox-1.1.3/Remove b/config/busybox-1.4.1/Remove
index d7740740d..d7740740d 100755..100644
--- a/config/busybox-1.1.3/Remove
+++ b/config/busybox-1.4.1/Remove
diff --git a/config/busybox-1.1.3/archival/Config.in b/config/busybox-1.4.1/archival/Config.in
index b1022d9ef..e94feb8f8 100644
--- a/config/busybox-1.1.3/archival/Config.in
+++ b/config/busybox-1.4.1/archival/Config.in
@@ -6,7 +6,7 @@
 menu "Archival Utilities"
   depends on BUSYBOX
 
-config BB_CONFIG_AR
+config BB_AR
 	bool "ar"
 	default n
 	help
@@ -29,17 +29,17 @@ config BB_CONFIG_AR
 	  Unless you have a specific application which requires ar, you should
 	  probably say N here.
 
-config BB_CONFIG_FEATURE_AR_LONG_FILENAMES
-	bool "  Enable support for long filenames (not need for debs)"
+config BB_FEATURE_AR_LONG_FILENAMES
+	bool "Enable support for long filenames (not need for debs)"
 	default n
-	depends on BB_CONFIG_AR
+	depends on BB_AR
 	help
 	  By default the ar format can only store the first 15 characters of the
 	  filename, this option removes that limitation.
 	  It supports the GNU ar long filename method which moves multiple long
 	  filenames into a the data section of a new ar entry.
 
-config BB_CONFIG_BUNZIP2
+config BB_BUNZIP2
 	bool "bunzip2"
 	default n
 	help
@@ -55,7 +55,7 @@ config BB_CONFIG_BUNZIP2
 	  Unless you have a specific application which requires bunzip2, you
 	  should probably say N here.
 
-config BB_CONFIG_CPIO
+config BB_CPIO
 	bool "cpio"
 	default n
 	help
@@ -69,7 +69,7 @@ config BB_CONFIG_CPIO
 	  Unless you have a specific application which requires cpio, you should
 	  probably say N here.
 
-config BB_CONFIG_DPKG
+config BB_DPKG
 	bool "dpkg"
 	default n
 	help
@@ -78,7 +78,7 @@ config BB_CONFIG_DPKG
 	  This implementation of dpkg has a number of limitations, you should use the
 	  official dpkg if possible.
 
-config BB_CONFIG_DPKG_DEB
+config BB_DPKG_DEB
 	bool "dpkg_deb"
 	default n
 	help
@@ -89,16 +89,16 @@ config BB_CONFIG_DPKG_DEB
 	  Unless you have a specific application which requires dpkg-deb, you should
 	  probably say N here.
 
-config BB_CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY
-	bool "  extract only (-x)"
+config BB_FEATURE_DPKG_DEB_EXTRACT_ONLY
+	bool "extract only (-x)"
 	default n
-	depends on BB_CONFIG_DPKG_DEB
+	depends on BB_DPKG_DEB
 	help
 	  This reduces dpkg-deb to the equivalent of "ar -p <deb> data.tar.gz | tar -zx".
 	  However it saves space as none of the extra dpkg-deb, ar or tar options are
 	  needed, they are linked to internally.
 
-config BB_CONFIG_GUNZIP
+config BB_GUNZIP
 	bool "gunzip"
 	default n
 	help
@@ -106,35 +106,35 @@ config BB_CONFIG_GUNZIP
 	  You can use the `-t' option to test the integrity of
 	  an archive, without decompressing it.
 
-config BB_CONFIG_FEATURE_GUNZIP_UNCOMPRESS
-	bool "  Uncompress support"
+config BB_FEATURE_GUNZIP_UNCOMPRESS
+	bool "Uncompress support"
 	default n
-	depends on BB_CONFIG_GUNZIP
+	depends on BB_GUNZIP
 	help
 	  Enable if you want gunzip to have the ability to decompress
 	  archives created by the program compress (not much
 	  used anymore).
 
-config BB_CONFIG_GZIP
+config BB_GZIP
 	bool "gzip"
 	default n
 	help
 	  gzip is used to compress files.
 	  It's probably the most widely used UNIX compression program.
 
-config BB_CONFIG_RPM2CPIO
+config BB_RPM2CPIO
 	bool "rpm2cpio"
 	default n
 	help
 	  Converts an RPM file into a CPIO archive.
 
-config BB_CONFIG_RPM
+config BB_RPM
 	bool "rpm"
 	default n
 	help
-	  Mini RPM applet - queries and extracts
+	  Mini RPM applet - queries and extracts RPM packages.
 
-config BB_CONFIG_TAR
+config BB_TAR
 	bool "tar"
 	default n
 	help
@@ -142,86 +142,86 @@ config BB_CONFIG_TAR
 	  create compressed archives. It's probably the most widely used
 	  UNIX archive program.
 
-config BB_CONFIG_FEATURE_TAR_CREATE
-	bool "  Enable archive creation"
+config BB_FEATURE_TAR_CREATE
+	bool "Enable archive creation"
 	default y
-	depends on BB_CONFIG_TAR
+	depends on BB_TAR
 	help
 	  If you enable this option you'll be able to create
 	  tar archives using the `-c' option.
 
-config BB_CONFIG_FEATURE_TAR_BZIP2
-	bool "  Enable -j option to handle .tar.bz2 files"
+config BB_FEATURE_TAR_BZIP2
+	bool "Enable -j option to handle .tar.bz2 files"
 	default n
-	depends on BB_CONFIG_TAR
+	depends on BB_TAR
 	help
 	  If you enable this option you'll be able to extract
 	  archives compressed with bzip2.
 
-config BB_CONFIG_FEATURE_TAR_LZMA
-	bool "  Enable -a option to handle .tar.lzma files"
+config BB_FEATURE_TAR_LZMA
+	bool "Enable -a option to handle .tar.lzma files"
 	default n
-	depends on BB_CONFIG_TAR
+	depends on BB_TAR
 	help
 	  If you enable this option you'll be able to extract
 	  archives compressed with lzma.
 
-config BB_CONFIG_FEATURE_TAR_FROM
-	bool "  Enable -X (exclude from) and -T (include from) options)"
+config BB_FEATURE_TAR_FROM
+	bool "Enable -X (exclude from) and -T (include from) options)"
 	default n
-	depends on BB_CONFIG_TAR
+	depends on BB_TAR
 	help
 	  If you enable this option you'll be able to specify
 	  a list of files to include or exclude from an archive.
 
-config BB_CONFIG_FEATURE_TAR_GZIP
-	bool "  Enable -z option"
+config BB_FEATURE_TAR_GZIP
+	bool "Enable -z option"
 	default y
-	depends on BB_CONFIG_TAR
+	depends on BB_TAR
 	help
 	  If you enable this option tar will be able to call gzip,
 	  when creating or extracting tar gziped archives.
 
-config BB_CONFIG_FEATURE_TAR_COMPRESS
-	bool "  Enable -Z option"
+config BB_FEATURE_TAR_COMPRESS
+	bool "Enable -Z option"
 	default n
-	depends on BB_CONFIG_TAR
+	depends on BB_TAR
 	help
 	  If you enable this option tar will be able to call uncompress,
 	  when extracting .tar.Z archives.
 
-config BB_CONFIG_FEATURE_TAR_OLDGNU_COMPATABILITY
-	bool "  Enable support for old tar header format"
+config BB_FEATURE_TAR_OLDGNU_COMPATIBILITY
+	bool "Enable support for old tar header format"
 	default N
-	depends on BB_CONFIG_TAR
+	depends on BB_TAR
 	help
 	  This option is required to unpack archives created in
 	  the old GNU format; help to kill this old format by
 	  repacking your ancient archives with the new format.
 
-config BB_CONFIG_FEATURE_TAR_GNU_EXTENSIONS
-	bool "  Enable support for some GNU tar extensions"
+config BB_FEATURE_TAR_GNU_EXTENSIONS
+	bool "Enable support for some GNU tar extensions"
 	default y
-	depends on BB_CONFIG_TAR
+	depends on BB_TAR
 	help
 	  With this option busybox supports GNU long filenames and
 	  linknames.
 
-config BB_CONFIG_FEATURE_TAR_LONG_OPTIONS
-	bool "  Enable long options"
+config BB_FEATURE_TAR_LONG_OPTIONS
+	bool "Enable long options"
 	default n
-	depends on BB_CONFIG_TAR
+	depends on BB_TAR && BB_GETOPT_LONG
 	help
 		Enable use of long options, increases size by about 400 Bytes
 
-config BB_CONFIG_UNCOMPRESS
+config BB_UNCOMPRESS
 	bool "uncompress"
 	default n
 	help
 	  uncompress is used to decompress archives created by compress.
 	  Not much used anymore, replaced by gzip/gunzip.
 
-config BB_CONFIG_UNLZMA
+config BB_UNLZMA
 	bool "unlzma"
 	default n
 	help
@@ -236,15 +236,15 @@ config BB_CONFIG_UNLZMA
 	  Unless you have a specific application which requires unlzma, you
 	  should probably say N here.
 
-config BB_CONFIG_FEATURE_LZMA_FAST
-	bool "  Optimze unlzma for speed"
+config BB_FEATURE_LZMA_FAST
+	bool "Optimze unlzma for speed"
 	default n
-	depends on BB_CONFIG_UNLZMA
+	depends on BB_UNLZMA
 	help
-	  This option reduce decompression time by about 33% at the cost of
+	  This option reduces decompression time by about 33% at the cost of
 	  a 2K bigger binary.
 
-config BB_CONFIG_UNZIP
+config BB_UNZIP
 	bool "unzip"
 	default n
 	help
@@ -255,31 +255,31 @@ config BB_CONFIG_UNZIP
 	  directory of your choice.
 
 comment "Common options for cpio and tar"
-	depends on BB_CONFIG_CPIO || BB_CONFIG_TAR
+	depends on BB_CPIO || BB_TAR
 
-config BB_CONFIG_FEATURE_UNARCHIVE_TAPE
-	bool "  Enable tape drive support"
+config BB_FEATURE_UNARCHIVE_TAPE
+	bool "Enable tape drive support"
 	default n
-	depends on BB_CONFIG_CPIO || BB_CONFIG_TAR
+	depends on BB_CPIO || BB_TAR
 	help
 	  I don't think this is needed anymore.
 
 comment "Common options for dpkg and dpkg_deb"
-	depends on BB_CONFIG_DPKG || BB_CONFIG_DPKG_DEB
+	depends on BB_DPKG || BB_DPKG_DEB
 
-config BB_CONFIG_FEATURE_DEB_TAR_GZ
-	bool "  gzip debian packages (normal)"
-	default y if BB_CONFIG_DPKG || BB_CONFIG_DPKG_DEB
-	depends on BB_CONFIG_DPKG || BB_CONFIG_DPKG_DEB
+config BB_FEATURE_DEB_TAR_GZ
+	bool "gzip debian packages (normal)"
+	default y if BB_DPKG || BB_DPKG_DEB
+	depends on BB_DPKG || BB_DPKG_DEB
 	help
 	  This is the default compression method inside the debian ar file.
 
 	  If you want compatibility with standard .deb's you should say yes here.
 
-config BB_CONFIG_FEATURE_DEB_TAR_BZ2
-	bool "  bzip2 debian packages"
+config BB_FEATURE_DEB_TAR_BZ2
+	bool "bzip2 debian packages"
 	default n
-	depends on BB_CONFIG_DPKG || BB_CONFIG_DPKG_DEB
+	depends on BB_DPKG || BB_DPKG_DEB
 	help
 	  This allows dpkg and dpkg-deb to extract deb's that are compressed internally
 	  with bzip2 instead of gzip.
@@ -287,15 +287,15 @@ config BB_CONFIG_FEATURE_DEB_TAR_BZ2
 	  You only want this if you are creating your own custom debian packages that
 	  use an internal control.tar.bz2 or data.tar.bz2.
 
-config BB_CONFIG_FEATURE_DEB_TAR_LZMA
-	bool "  lzma debian packages"
+config BB_FEATURE_DEB_TAR_LZMA
+	bool "lzma debian packages"
 	default n
-	depends on BB_CONFIG_DPKG || BB_CONFIG_DPKG_DEB
+	depends on BB_DPKG || BB_DPKG_DEB
 	help
 	  This allows dpkg and dpkg-deb to extract deb's that are compressed
-          internally with lzma instead of gzip.
+	  internally with lzma instead of gzip.
 
 	  You only want this if you are creating your own custom debian
-          packages that use an internal control.tar.lzma or data.tar.lzma.
+	  packages that use an internal control.tar.lzma or data.tar.lzma.
 
 endmenu
diff --git a/config/busybox-1.1.3/console-tools/Config.in b/config/busybox-1.4.1/console-tools/Config.in
index 79169b6f2..3e2ac3b3d 100644
--- a/config/busybox-1.1.3/console-tools/Config.in
+++ b/config/busybox-1.4.1/console-tools/Config.in
@@ -6,71 +6,101 @@
 menu "Console Utilities"
   depends on BUSYBOX
 
-config BB_CONFIG_CHVT
+config BB_CHVT
 	bool "chvt"
 	default n
 	help
 	  This program is used to change to another terminal.
 	  Example: chvt 4 (change to terminal /dev/tty4)
 
-config BB_CONFIG_CLEAR
+config BB_CLEAR
 	bool "clear"
 	default n
 	help
 	  This program clears the terminal screen.
 
-config BB_CONFIG_DEALLOCVT
+config BB_DEALLOCVT
 	bool "deallocvt"
 	default n
 	help
 	  This program deallocates unused virtual consoles.
 
-config BB_CONFIG_DUMPKMAP
+config BB_DUMPKMAP
 	bool "dumpkmap"
 	default n
 	help
 	  This program dumps the kernel's keyboard translation table to
 	  stdout, in binary format. You can then use loadkmap to load it.
 
-config BB_CONFIG_LOADFONT
+config BB_LOADFONT
 	bool "loadfont"
 	default n
 	help
 	  This program loads a console font from standard input.
 
-config BB_CONFIG_LOADKMAP
+config BB_LOADKMAP
 	bool "loadkmap"
 	default n
 	help
 	  This program loads a keyboard translation table from
 	  standard input.
 
-config BB_CONFIG_OPENVT
+config BB_OPENVT
 	bool "openvt"
 	default n
 	help
 	  This program is used to start a command on an unused
 	  virtual terminal.
 
-config BB_CONFIG_RESET
+config BB_RESET
 	bool "reset"
 	default n
 	help
 	  This program is used to reset the terminal screen, if it
 	  gets messed up.
 
-config BB_CONFIG_SETCONSOLE
+config BB_RESIZE
+	bool "resize"
+	default n
+	help
+	  This program is used to (re)set the width and height of your current
+	  terminal.
+
+config BB_FEATURE_RESIZE_PRINT
+	bool "print environment variables"
+	default n
+	depends on BB_RESIZE
+	help
+	  Prints the newly set size (number of columns and rows) of
+	  the terminal.
+	  E.g.:
+	  COLUMNS=80;LINES=44;export COLUMNS LINES;
+
+config BB_SETCONSOLE
 	bool "setconsole"
 	default n
 	help
 	  This program redirects the system console to another device,
 	  like the current tty while logged in via telnet.
 
-config BB_CONFIG_SETKEYCODES
+config BB_FEATURE_SETCONSOLE_LONG_OPTIONS
+	bool "Enable long options"
+	default n
+	depends on BB_SET_CONSOLE && BB_GETOPT_LONG
+	help
+	  Support long options for the setconsole applet.
+
+config BB_SETKEYCODES
 	bool "setkeycodes"
 	default n
 	help
 	  This program loads entries into the kernel's scancode-to-keycode
 	  map, allowing unusual keyboards to generate usable keycodes.
 
+config BB_SETLOGCONS
+	bool "setlogcons"
+	default n
+	help
+	  This program redirects the output console of kernel messages.
+
 endmenu
diff --git a/config/busybox-1.1.3/coreutils/Config.in b/config/busybox-1.4.1/coreutils/Config.in
index ab4b4cf5f..c93533df2 100644
--- a/config/busybox-1.1.3/coreutils/Config.in
+++ b/config/busybox-1.4.1/coreutils/Config.in
@@ -6,7 +6,7 @@
 menu "Coreutils"
   depends on BUSYBOX
 
-config BB_CONFIG_BASENAME
+config BB_BASENAME
 	bool "basename"
 	default n
 	help
@@ -14,88 +14,101 @@ config BB_CONFIG_BASENAME
 	  leaving just the filename itself.  Enable this option if you wish
 	  to enable the 'basename' utility.
 
-config BB_CONFIG_CAL
+config BB_CAL
 	bool "cal"
 	default n
 	help
 	  cal is used to display a monthly calender.
 
-config BB_CONFIG_CAT
+config BB_CAT
 	bool "cat"
 	default n
 	help
 	  cat is used to concatenate files and print them to the standard
 	  output.  Enable this option if you wish to enable the 'cat' utility.
 
-config BB_CONFIG_CHGRP
+config BB_CATV
+	bool "catv"
+	default n
+	help
+	  Display nonprinting characters as escape sequences (like some
+	  implementations' cat -v option).
+
+config BB_CHGRP
 	bool "chgrp"
 	default n
 	help
 	  chgrp is used to change the group ownership of files.
 
-config BB_CONFIG_CHMOD
+config BB_CHMOD
 	bool "chmod"
 	default n
 	help
 	  chmod is used to change the access permission of files.
 
-config BB_CONFIG_CHOWN
+config BB_CHOWN
 	bool "chown"
 	default n
 	help
 	  chown is used to change the user and/or group ownership
 	  of files.
 
-config BB_CONFIG_CHROOT
+config BB_CHROOT
 	bool "chroot"
 	default n
 	help
 	  chroot is used to change the root directory and run a command.
 	  The default command is `/bin/sh'.
 
-config BB_CONFIG_CMP
+config BB_CKSUM
+	bool "cksum"
+	default n
+	help
+	  cksum is used to calculate the CRC32 checksum of a file.
+
+config BB_CMP
 	bool "cmp"
 	default n
 	help
 	  cmp is used to compare two files and returns the result
 	  to standard output.
 
-config BB_CONFIG_COMM
+config BB_COMM
 	bool "comm"
 	default n
 	help
 	  comm is used to compare two files line by line and return
 	  a three-column output.
 
-config BB_CONFIG_CP
+config BB_CP
 	bool "cp"
 	default n
 	help
 	  cp is used to copy files and directories.
 
-config BB_CONFIG_CUT
+config BB_CUT
 	bool "cut"
 	default n
 	help
 	  cut is used to print selected parts of lines from
 	  each file to stdout.
 
-config BB_CONFIG_DATE
+config BB_DATE
 	bool "date"
 	default n
 	help
 	  date is used to set the system date or display the
 	  current time in the given format.
 
-config BB_CONFIG_FEATURE_DATE_ISOFMT
-	bool "  Enable ISO date format output (-I)"
+config BB_FEATURE_DATE_ISOFMT
+	bool "Enable ISO date format output (-I)"
 	default y
-	depends on BB_CONFIG_DATE
+	depends on BB_DATE
 	help
 	  Enable option (-I) to output an ISO-8601 compliant
 	  date/time string.
 
-config BB_CONFIG_DD
+config BB_DD
 	bool "dd"
 	default n
 	help
@@ -103,61 +116,116 @@ config BB_CONFIG_DD
 	  by default) using specific input and output blocksizes,
 	  while optionally performing conversions on it.
 
-config BB_CONFIG_DF
+config BB_FEATURE_DD_SIGNAL_HANDLING
+	bool "Enable DD signal handling for status reporting"
+	default y
+	depends on BB_DD
+	help
+	  sending a SIGUSR1 signal to a running `dd' process makes it
+	  print to standard error the number of records read and written
+	  so far, then to resume copying.
+
+	  $ dd if=/dev/zero of=/dev/null& pid=$! $ kill -USR1 $pid; sleep 1; kill $pid
+	  10899206+0 records in 10899206+0 records out
+
+config BB_FEATURE_DD_IBS_OBS
+	bool "Enable ibs, obs and conv options"
+	default n
+	depends on BB_DD
+	help
+	  Enables support for writing a certain number of bytes in and out,
+	  at a time, and performing conversions on the data stream.
+
+config BB_DF
 	bool "df"
 	default n
 	help
 	  df reports the amount of disk space used and available
 	  on filesystems.
 
-config BB_CONFIG_DIRNAME
+config BB_DIFF
+	bool "diff"
+	default n
+	help
+	  diff compares two files or directories and outputs the
+	  differences between them in a form that can be given to
+	  the patch command.
+
+config BB_FEATURE_DIFF_BINARY
+	bool "Enable checks for binary files"
+	default y
+	depends on BB_DIFF
+	help
+	  This option enables support for checking for binary files
+	  before a comparison is carried out.
+
+config BB_FEATURE_DIFF_DIR
+	bool "Enable directory support"
+	default y
+	depends on BB_DIFF
+	help
+	  This option enables support for directory and subdirectory
+	  comparison.
+
+config BB_FEATURE_DIFF_MINIMAL
+	bool "Enable -d option to find smaller sets of changes"
+	default n
+	depends on BB_DIFF
+	help
+	  Enabling this option allows the use of -d to make diff
+	  try hard to find the smallest possible set of changes.
+
+config BB_DIRNAME
 	bool "dirname"
 	default n
 	help
 	  dirname is used to strip a non-directory suffix from
 	  a file name.
 
-config BB_CONFIG_DOS2UNIX
+config BB_DOS2UNIX
 	bool "dos2unix/unix2dos"
 	default n
 	help
 	  dos2unix is used to convert a text file from DOS format to
 	  UNIX format, and vice versa.
 
-config BB_CONFIG_UNIX2DOS
+config BB_UNIX2DOS
 	bool
 	default y
-	depends on BB_CONFIG_DOS2UNIX
+	depends on BB_DOS2UNIX
+	help
+	  unix2dos is used to convert a text file from UNIX format to
+	  DOS format, and vice versa.
 
-config BB_CONFIG_DU
+config BB_DU
 	bool "du (default blocksize of 512 bytes)"
 	default n
 	help
 	  du is used to report the amount of disk space used
 	  for specified files.
 
-config BB_CONFIG_FEATURE_DU_DEFALT_BLOCKSIZE_1K
-	bool "  Use a default blocksize of 1024 bytes (1K)"
+config BB_FEATURE_DU_DEFAULT_BLOCKSIZE_1K
+	bool "Use a default blocksize of 1024 bytes (1K)"
 	default y
-	depends on BB_CONFIG_DU
+	depends on BB_DU
 	help
 	  Use a blocksize of (1K) instead of the default 512b.
 
-config BB_CONFIG_ECHO
+config BB_ECHO
 	bool "echo (basic SuSv3 version taking no options)"
 	default n
 	help
 	  echo is used to print a specified string to stdout.
 
 # this entry also appears in shell/Config.in, next to the echo builtin
-config BB_CONFIG_FEATURE_FANCY_ECHO
-	bool "  Enable echo options (-n and -e)"
+config BB_FEATURE_FANCY_ECHO
+	bool "Enable echo options (-n and -e)"
 	default y
-	depends on BB_CONFIG_ECHO
+	depends on BB_ECHO
 	help
 	  This adds options (-n and -e) to echo.
 
-config BB_CONFIG_ENV
+config BB_ENV
 	bool "env"
 	default n
 	help
@@ -165,144 +233,158 @@ config BB_CONFIG_ENV
 	  a command; without options it displays the current
 	  environment.
 
-config BB_CONFIG_EXPR
+config BB_FEATURE_ENV_LONG_OPTIONS
+	bool "Enable long options"
+	default n
+	depends on BB_ENV && BB_GETOPT_LONG
+	help
+	  Support long options for the env applet.
+
+config BB_EXPR
 	bool "expr"
 	default n
 	help
 	  expr is used to calculate numbers and print the result
 	  to standard output.
 
-config BB_CONFIG_EXPR_MATH_SUPPORT_64
-	bool "    Extend Posix numbers support to 64 bit"
+config BB_EXPR_MATH_SUPPORT_64
+	bool "Extend Posix numbers support to 64 bit"
 	default n
-	depends on BB_CONFIG_EXPR
+	depends on BB_EXPR
 	help
 	  Enable 64-bit math support in the expr applet.  This will make
 	  the applet slightly larger, but will allow computation with very
 	  large numbers.
 
-config BB_CONFIG_FALSE
+config BB_FALSE
 	bool "false"
 	default n
 	help
 	  false returns an exit code of FALSE (1).
 
-config BB_CONFIG_FOLD
+config BB_FOLD
 	bool "fold"
 	default n
 	help
 	  Wrap text to fit a specific width.
 
-config BB_CONFIG_HEAD
+config BB_HEAD
 	bool "head"
 	default n
 	help
 	  head is used to print the first specified number of lines
 	  from files.
 
-config BB_CONFIG_FEATURE_FANCY_HEAD
-	bool "  Enable head options (-c, -q, and -v)"
+config BB_FEATURE_FANCY_HEAD
+	bool "Enable head options (-c, -q, and -v)"
 	default n
-	depends on BB_CONFIG_HEAD
+	depends on BB_HEAD
 	help
 	  This enables the head options (-c, -q, and -v).
 
-config BB_CONFIG_HOSTID
+config BB_HOSTID
 	bool "hostid"
 	default n
 	help
 	  hostid prints the numeric identifier (in hexadecimal) for
 	  the current host.
 
-config BB_CONFIG_ID
+config BB_ID
 	bool "id"
 	default n
 	help
 	  id displays the current user and group ID names.
 
-config BB_CONFIG_INSTALL
+config BB_INSTALL
 	bool "install"
 	default n
 	help
 	  Copy files and set attributes.
 
-config BB_CONFIG_LENGTH
+config BB_FEATURE_INSTALL_LONG_OPTIONS
+	bool "Enable long options"
+	default n
+	depends on BB_INSTALL && BB_GETOPT_LONG
+	help
+	  Support long options for the install applet.
+
+config BB_LENGTH
 	bool "length"
 	default n
 	help
 	  length is used to print out the length of a specified string.
 
-config BB_CONFIG_LN
+config BB_LN
 	bool "ln"
 	default n
 	help
 	  ln is used to create hard or soft links between files.
 
-config BB_CONFIG_LOGNAME
+config BB_LOGNAME
 	bool "logname"
 	default n
 	help
 	  logname is used to print the current user's login name.
 
-config BB_CONFIG_LS
+config BB_LS
 	bool "ls"
 	default n
 	help
 	  ls is used to list the contents of directories.
 
-config BB_CONFIG_FEATURE_LS_FILETYPES
-	bool "  Enable filetyping options (-p and -F)"
+config BB_FEATURE_LS_FILETYPES
+	bool "Enable filetyping options (-p and -F)"
 	default y
-	depends on BB_CONFIG_LS
+	depends on BB_LS
 	help
 	  Enable the ls options (-p and -F).
 
-config BB_CONFIG_FEATURE_LS_FOLLOWLINKS
-	bool "  Enable symlinks dereferencing (-L)"
+config BB_FEATURE_LS_FOLLOWLINKS
+	bool "Enable symlinks dereferencing (-L)"
 	default y
-	depends on BB_CONFIG_LS
+	depends on BB_LS
 	help
 	  Enable the ls option (-L).
 
-config BB_CONFIG_FEATURE_LS_RECURSIVE
-	bool "  Enable recursion (-R)"
+config BB_FEATURE_LS_RECURSIVE
+	bool "Enable recursion (-R)"
 	default y
-	depends on BB_CONFIG_LS
+	depends on BB_LS
 	help
 	  Enable the ls option (-R).
 
-config BB_CONFIG_FEATURE_LS_SORTFILES
-	bool "  Sort the file names"
+config BB_FEATURE_LS_SORTFILES
+	bool "Sort the file names"
 	default y
-	depends on BB_CONFIG_LS
+	depends on BB_LS
 	help
 	  Allow ls to sort file names alphabetically.
 
-config BB_CONFIG_FEATURE_LS_TIMESTAMPS
-	bool "  Show file timestamps"
+config BB_FEATURE_LS_TIMESTAMPS
+	bool "Show file timestamps"
 	default y
-	depends on BB_CONFIG_LS
+	depends on BB_LS
 	help
 	  Allow ls to display timestamps for files.
 
-config BB_CONFIG_FEATURE_LS_USERNAME
-	bool "  Show username/groupnames"
+config BB_FEATURE_LS_USERNAME
+	bool "Show username/groupnames"
 	default y
-	depends on BB_CONFIG_LS
+	depends on BB_LS
 	help
 	  Allow ls to display username/groupname for files.
 
-config BB_CONFIG_FEATURE_LS_COLOR
-	bool "  Allow use of color to identify file types"
+config BB_FEATURE_LS_COLOR
+	bool "Allow use of color to identify file types"
 	default y
-	depends on BB_CONFIG_LS
+	depends on BB_LS && BB_GETOPT_LONG
 	help
 	  This enables the --color option to ls.
 
-config BB_CONFIG_FEATURE_LS_COLOR_IS_DEFAULT
-	bool "  Produce colored ls output by default"
+config BB_FEATURE_LS_COLOR_IS_DEFAULT
+	bool "Produce colored ls output by default"
 	default n
-	depends on BB_CONFIG_FEATURE_LS_COLOR
+	depends on BB_FEATURE_LS_COLOR
 	help
 	  Saying yes here will turn coloring on by default,
 	  even if no "--color" option is given to the ls command.
@@ -310,129 +392,143 @@ config BB_CONFIG_FEATURE_LS_COLOR_IS_DEFAULT
 	  configurable, and the output may not be legible on
 	  many output screens.
 
-config BB_CONFIG_MD5SUM
+config BB_MD5SUM
 	bool "md5sum"
 	default n
 	help
 	  md5sum is used to print or check MD5 checksums.
 
-config BB_CONFIG_MKDIR
+config BB_MKDIR
 	bool "mkdir"
 	default n
 	help
 	  mkdir is used to create directories with the specified names.
 
-config BB_CONFIG_MKFIFO
+config BB_FEATURE_MKDIR_LONG_OPTIONS
+	bool "Enable long options"
+	default n
+	depends on BB_MKDIR && BB_GETOPT_LONG
+	help
+	  Support long options for the mkdir applet.
+
+config BB_MKFIFO
 	bool "mkfifo"
 	default n
 	help
 	  mkfifo is used to create FIFOs (named pipes).
 	  The `mknod' program can also create FIFOs.
 
-config BB_CONFIG_MKNOD
+config BB_MKNOD
 	bool "mknod"
 	default n
 	help
 	  mknod is used to create FIFOs or block/character special
 	  files with the specified names.
 
-config BB_CONFIG_MV
+config BB_MV
 	bool "mv"
 	default n
 	help
 	  mv is used to move or rename files or directories.
 
-config BB_CONFIG_NICE
+config BB_FEATURE_MV_LONG_OPTIONS
+	bool "Enable long options"
+	default n
+	depends on BB_MV && BB_GETOPT_LONG
+	help
+	  Support long options for the mv applet.
+
+config BB_NICE
 	bool "nice"
 	default n
 	help
 	  nice runs a program with modified scheduling priority.
 
-config BB_CONFIG_NOHUP
+config BB_NOHUP
 	bool "nohup"
 	default n
 	help
 	  run a command immune to hangups, with output to a non-tty.
 
-config BB_CONFIG_OD
+config BB_OD
 	bool "od"
 	default n
 	help
 	  od is used to dump binary files in octal and other formats.
 
-config BB_CONFIG_PRINTENV
+config BB_PRINTENV
 	bool "printenv"
 	default n
 	help
 	  printenv is used to print all or part of environment.
 
-config BB_CONFIG_PRINTF
+config BB_PRINTF
 	bool "printf"
 	default n
 	help
 	  printf is used to format and print specified strings.
 	  It's similar to `echo' except it has more options.
 
-config BB_CONFIG_PWD
+config BB_PWD
 	bool "pwd"
 	default n
 	help
 	  pwd is used to print the current directory.
 
-config BB_CONFIG_REALPATH
+config BB_REALPATH
 	bool "realpath"
 	default n
 	help
 	  Return the canonicalized absolute pathname.
 	  This isn't provided by GNU shellutils, but where else does it belong.
 
-config BB_CONFIG_RM
+config BB_RM
 	bool "rm"
 	default n
 	help
 	  rm is used to remove files or directories.
 
-config BB_CONFIG_RMDIR
+config BB_RMDIR
 	bool "rmdir"
 	default n
 	help
 	  rmdir is used to remove empty directories.
 
-config BB_CONFIG_SEQ
+config BB_SEQ
 	bool "seq"
 	default n
 	help
 	  print a sequence of numbers
 
-config BB_CONFIG_SHA1SUM
+config BB_SHA1SUM
 	bool "sha1sum"
 	default n
 	help
 	  Compute and check SHA1 message digest
 
-config BB_CONFIG_SLEEP
+config BB_SLEEP
 	bool "sleep (single integer arg with no suffix)"
 	default n
 	help
 	  sleep is used to pause for a specified number of seconds,
 
-config BB_CONFIG_FEATURE_FANCY_SLEEP
-	bool "  Enable multiple integer args and optional time suffixes"
+config BB_FEATURE_FANCY_SLEEP
+	bool "Enable multiple integer args and optional time suffixes"
 	default n
-	depends on BB_CONFIG_SLEEP
+	depends on BB_SLEEP
 	help
 	  Allow sleep to pause for specified minutes, hours, and days.
 
-config BB_CONFIG_SORT
+config BB_SORT
 	bool "sort"
 	default n
 	help
 	  sort is used to sort lines of text in specified files.
 
-config BB_CONFIG_FEATURE_SORT_BIG
-	bool "  full SuSv3 compliant sort (Support -ktcsbdfiozgM)"
+config BB_FEATURE_SORT_BIG
+	bool "full SuSv3 compliant sort (Support -ktcsbdfiozgM)"
 	default y
-	depends on BB_CONFIG_SORT
+	depends on BB_SORT
 	help
 	  Without this, sort only supports  -r, -u, and an integer version
 	  of -n.  Selecting this adds sort keys, floating point support, and
@@ -441,109 +537,109 @@ config BB_CONFIG_FEATURE_SORT_BIG
 	  The SuSv3 sort standard is available at:
 	  http://www.opengroup.org/onlinepubs/007904975/utilities/sort.html
 
-config BB_CONFIG_STAT
+config BB_STAT
 	bool "stat"
 	default n
 	help
 	  display file or filesystem status.
 
-config BB_CONFIG_FEATURE_STAT_FORMAT
-	bool "  Enable custom formats (-c)"
+config BB_FEATURE_STAT_FORMAT
+	bool "Enable custom formats (-c)"
 	default n
-	depends on BB_CONFIG_STAT
+	depends on BB_STAT
 	help
 	  Without this, stat will not support the '-c format' option where
 	  users can pass a custom format string for output.  This adds about
 	  7k to a nonstatic build on amd64.
 
-config BB_CONFIG_STTY
+config BB_STTY
 	bool "stty"
 	default n
 	help
 	  stty is used to change and print terminal line settings.
 
-config BB_CONFIG_SUM
+config BB_SUM
 	bool "sum"
 	default n
 	help
 	  checksum and count the blocks in a file
 
-config BB_CONFIG_SYNC
+config BB_SYNC
 	bool "sync"
 	default n
 	help
 	  sync is used to flush filesystem buffers.
 
-config BB_CONFIG_TAIL
+config BB_TAIL
 	bool "tail"
 	default n
 	help
 	  tail is used to print the last specified number of lines
 	  from files.
 
-config BB_CONFIG_FEATURE_FANCY_TAIL
-	bool "  Enable extra tail options (-q, -s, and -v)"
+config BB_FEATURE_FANCY_TAIL
+	bool "Enable extra tail options (-q, -s, and -v)"
 	default y
-	depends on BB_CONFIG_TAIL
+	depends on BB_TAIL
 	help
 	  The options (-q, -s, and -v) are provided by GNU tail, but
 	  are not specific in the SUSv3 standard.
 
-config BB_CONFIG_TEE
+config BB_TEE
 	bool "tee"
 	default n
 	help
 	  tee is used to read from standard input and write
 	  to standard output and files.
 
-config BB_CONFIG_FEATURE_TEE_USE_BLOCK_IO
-	bool "  Enable block i/o (larger/faster) instead of byte i/o."
+config BB_FEATURE_TEE_USE_BLOCK_IO
+	bool "Enable block i/o (larger/faster) instead of byte i/o."
 	default n
-	depends on BB_CONFIG_TEE
+	depends on BB_TEE
 	help
 	  Enable this option for a faster tee, at expense of size.
 
-config BB_CONFIG_TEST
+config BB_TEST
 	bool "test"
 	default n
 	help
 	  test is used to check file types and compare values,
-	  returning an appropriate exit code. The shells (ash
-	  and bash) have test builtin.
+	  returning an appropriate exit code.  The bash shell
+	  has test built in, ash can build it in optionally.
 
-config BB_CONFIG_FEATURE_TEST_64
-	bool "  Extend test to 64 bit"
+config BB_FEATURE_TEST_64
+	bool "Extend test to 64 bit"
 	default n
-	depends on BB_CONFIG_TEST
+	depends on BB_TEST
 	help
 	  Enable 64-bit support in test.
 
-config BB_CONFIG_TOUCH
+config BB_TOUCH
 	bool "touch"
 	default n
 	help
 	  touch is used to create or change the access and/or
 	  modification timestamp of specified files.
 
-config BB_CONFIG_TR
+config BB_TR
 	bool "tr"
 	default n
 	help
 	  tr is used to squeeze, and/or delete characters from standard
 	  input, writing to standard output.
 
-config BB_CONFIG_FEATURE_TR_CLASSES
-	bool "  Enable character classes (such as [:upper:])"
+config BB_FEATURE_TR_CLASSES
+	bool "Enable character classes (such as [:upper:])"
 	default n
-	depends on BB_CONFIG_TR
+	depends on BB_TR
 	help
 	  Enable character classes, enabling commands such as:
 	  tr [:upper:] [:lower:] to convert input into lowercase.
 
-config BB_CONFIG_FEATURE_TR_EQUIV
-	bool "  Enable equivalence classes"
+config BB_FEATURE_TR_EQUIV
+	bool "Enable equivalence classes"
 	default n
-	depends on BB_CONFIG_TR
+	depends on BB_TR
 	help
 	  Enable equivalence classes, which essentially add the enclosed
 	  character to the current set. For instance, tr [=a=] xyz would
@@ -551,79 +647,86 @@ config BB_CONFIG_FEATURE_TR_EQUIV
 	  useful for cases when no other way of expressing a character
 	  is possible.
 
-config BB_CONFIG_TRUE
+config BB_TRUE
 	bool "true"
 	default n
 	help
 	  true returns an exit code of TRUE (0).
 
-config BB_CONFIG_TTY
+config BB_TTY
 	bool "tty"
 	default n
 	help
 	  tty is used to print the name of the current terminal to
 	  standard output.
 
-config BB_CONFIG_UNAME
+config BB_UNAME
 	bool "uname"
 	default n
 	help
 	  uname is used to print system information.
 
-config BB_CONFIG_UNIQ
+config BB_UNIQ
 	bool "uniq"
 	default n
 	help
 	  uniq is used to remove duplicate lines from a sorted file.
 
-config BB_CONFIG_USLEEP
+config BB_USLEEP
 	bool "usleep"
 	default n
 	help
 	  usleep is used to pause for a specified number of microseconds.
 
-config BB_CONFIG_UUDECODE
+config BB_UUDECODE
 	bool "uudecode"
 	default n
 	help
 	  uudecode is used to decode a uuencoded file.
 
-config BB_CONFIG_UUENCODE
+config BB_UUENCODE
 	bool "uuencode"
 	default n
 	help
 	  uuencode is used to uuencode a file.
 
-config BB_CONFIG_WATCH
+config BB_WATCH
 	bool "watch"
 	default n
-	select BB_CONFIG_DATE
+	select BB_DATE
 	help
 	  watch is used to execute a program periodically, showing
 	  output to the screen.
 
-config BB_CONFIG_WC
+config BB_WC
 	bool "wc"
 	default n
 	help
 	  wc is used to print the number of bytes, words, and lines,
 	  in specified files.
 
-config BB_CONFIG_WHO
+config BB_FEATURE_WC_LARGE
+	bool "Support very large files in wc"
+	default n
+	depends on BB_WC
+	help
+	  Use "unsigned long long" in wc for count variables
+
+config BB_WHO
 	bool "who"
 	default n
-	select BB_CONFIG_FEATURE_UTMP
+	select BB_FEATURE_UTMP
 	help
 	  who is used to show who is logged on.
 
-config BB_CONFIG_WHOAMI
+config BB_WHOAMI
 	bool "whoami"
 	default n
 	help
 	  whoami is used to print the username of the current
 	  user id (same as id -un).
 
-config BB_CONFIG_YES
+config BB_YES
 	bool "yes"
 	default n
 	help
@@ -631,46 +734,46 @@ config BB_CONFIG_YES
 	  the default string `y'.
 
 comment "Common options for cp and mv"
-	depends on BB_CONFIG_CP || BB_CONFIG_MV
+	depends on BB_CP || BB_MV
 
-config BB_CONFIG_FEATURE_PRESERVE_HARDLINKS
-	bool "  Preserve hard links"
+config BB_FEATURE_PRESERVE_HARDLINKS
+	bool "Preserve hard links"
 	default n
-	depends on BB_CONFIG_CP || BB_CONFIG_MV
+	depends on BB_CP || BB_MV
 	help
 	  Allow cp and mv to preserve hard links.
 
 comment "Common options for ls, more and telnet"
-	depends on BB_CONFIG_LS || BB_CONFIG_MORE || BB_CONFIG_TELNET
+	depends on BB_LS || BB_MORE || BB_TELNET
 
-config BB_CONFIG_FEATURE_AUTOWIDTH
-	bool "  Calculate terminal & column widths"
+config BB_FEATURE_AUTOWIDTH
+	bool "Calculate terminal & column widths"
 	default y
-	depends on BB_CONFIG_LS || BB_CONFIG_MORE || BB_CONFIG_TELNET
+	depends on BB_LS || BB_MORE || BB_TELNET
 	help
 	  This option allows utilities such as 'ls', 'more' and 'telnet'
-	  to determine the width of the screen, which can allow them to 
+	  to determine the width of the screen, which can allow them to
 	  display additional text or avoid wrapping text onto the next line.
-	  If you leave this disabled, your utilities will be especially 
+	  If you leave this disabled, your utilities will be especially
 	  primitive and will be unable to determine the current screen width.
 
 comment "Common options for df, du, ls"
-	depends on BB_CONFIG_DF || BB_CONFIG_DU || BB_CONFIG_LS
+	depends on BB_DF || BB_DU || BB_LS
 
-config BB_CONFIG_FEATURE_HUMAN_READABLE
-	bool "  Support for human readable output (example 13k, 23M, 235G)"
+config BB_FEATURE_HUMAN_READABLE
+	bool "Support for human readable output (example 13k, 23M, 235G)"
 	default n
-	depends on BB_CONFIG_DF || BB_CONFIG_DU || BB_CONFIG_LS
+	depends on BB_DF || BB_DU || BB_LS
 	help
 	  Allow df, du, and ls to have human readable output.
 
 comment "Common options for md5sum, sha1sum"
-	depends on BB_CONFIG_MD5SUM || BB_CONFIG_SHA1SUM
+	depends on BB_MD5SUM || BB_SHA1SUM
 
-config BB_CONFIG_FEATURE_MD5_SHA1_SUM_CHECK
-	bool "  Enable -c, -s and -w options"
+config BB_FEATURE_MD5_SHA1_SUM_CHECK
+	bool "Enable -c, -s and -w options"
 	default n
-	depends on BB_CONFIG_MD5SUM || BB_CONFIG_SHA1SUM
+	depends on BB_MD5SUM || BB_SHA1SUM
 	help
 	  Enabling the -c options allows files to be checked
 	  against pre-calculated hash values.
diff --git a/config/busybox-1.1.3/debianutils/Config.in b/config/busybox-1.4.1/debianutils/Config.in
index d20e3138d..609205ced 100644
--- a/config/busybox-1.1.3/debianutils/Config.in
+++ b/config/busybox-1.4.1/debianutils/Config.in
@@ -6,33 +6,33 @@
 menu "Debian Utilities"
   depends on BUSYBOX
 
-config BB_CONFIG_MKTEMP
+config BB_MKTEMP
 	bool "mktemp"
 	default n
 	help
 	  mktemp is used to create unique temporary files
 
-config BB_CONFIG_PIPE_PROGRESS
+config BB_PIPE_PROGRESS
 	bool "pipe_progress"
 	default n
 	help
 	  Display a dot to indicate pipe activity.
 
-config BB_CONFIG_READLINK
+config BB_READLINK
 	bool "readlink"
 	default n
 	help
 	  This program reads a symbolic link and returns the name
 	  of the file it points to
 
-config BB_CONFIG_FEATURE_READLINK_FOLLOW
-	bool "  Enable canonicalization by following all symlinks (-f)"
+config BB_FEATURE_READLINK_FOLLOW
+	bool "Enable canonicalization by following all symlinks (-f)"
 	default n
-	depends on BB_CONFIG_READLINK
+	depends on BB_READLINK
 	help
 	  Enable the readlink option (-f).
 
-config BB_CONFIG_RUN_PARTS
+config BB_RUN_PARTS
 	bool "run-parts"
 	default n
 	help
@@ -47,7 +47,14 @@ config BB_CONFIG_RUN_PARTS
 	  Unless you know that run-parts is used in some of your scripts
 	  you can safely say N here.
 
-config BB_CONFIG_START_STOP_DAEMON
+config BB_FEATURE_RUN_PARTS_LONG_OPTIONS
+	bool "Enable long options"
+	default n
+	depends on BB_RUN_PARTS && BB_GETOPT_LONG
+	help
+	  Support long options for the run-parts applet.
+
+config BB_START_STOP_DAEMON
 	bool "start-stop-daemon"
 	default y
 	help
@@ -55,7 +62,23 @@ config BB_CONFIG_START_STOP_DAEMON
 	  termination of system-level processes, usually the ones
 	  started during the startup of the system.
 
-config BB_CONFIG_WHICH
+config BB_FEATURE_START_STOP_DAEMON_FANCY
+	bool "Support additional arguments"
+	default y
+	depends on BB_START_STOP_DAEMON
+	help
+	  Support additional arguments.
+	  -o|--oknodo ignored since we exit with 0 anyway
+	  -v|--verbose
+
+config BB_FEATURE_START_STOP_DAEMON_LONG_OPTIONS
+	bool "Enable long options"
+	default n
+	depends on BB_START_STOP_DAEMON && BB_GETOPT_LONG
+	help
+	  Support long options for the start-stop-daemon applet.
+
+config BB_WHICH
 	bool "which"
 	default n
 	help
diff --git a/config/busybox-1.4.1/e2fsprogs/Config.in b/config/busybox-1.4.1/e2fsprogs/Config.in
new file mode 100644
index 000000000..9ed134df8
--- /dev/null
+++ b/config/busybox-1.4.1/e2fsprogs/Config.in
@@ -0,0 +1,68 @@
+#
+# For a description of the syntax of this configuration file,
+# see scripts/kbuild/config-language.txt.
+#
+
+menu "Linux Ext2 FS Progs"
+  depends on BUSYBOX
+
+config BB_CHATTR
+	bool "chattr"
+	default n
+	help
+	  chattr changes the file attributes on a second extended file system.
+
+### config E2FSCK
+### 	bool "e2fsck"
+### 	default n
+### 	help
+### 	  e2fsck is used to check Linux second extended file systems (ext2fs).
+### 	  e2fsck also supports ext2 filesystems countaining a journal (ext3).
+### 	  The normal compat symlinks 'fsck.ext2' and 'fsck.ext3' are also
+### 	  provided.
+
+config BB_FSCK
+	bool "fsck"
+	default n
+	help
+	  fsck is used to check and optionally repair one or more filesystems.
+	  In actuality, fsck is simply a front-end for the various file system
+	  checkers (fsck.fstype) available under Linux.
+
+config BB_LSATTR
+	bool "lsattr"
+	default n
+	help
+	  lsattr lists the file attributes on a second extended file system.
+
+### config MKE2FS
+### 	bool "mke2fs"
+### 	default n
+### 	help
+### 	  mke2fs is used to create an ext2/ext3 filesystem.  The normal compat
+### 	  symlinks 'mkfs.ext2' and 'mkfs.ext3' are also provided.
+
+### config TUNE2FS
+### 	bool "tune2fs"
+### 	default n
+### 	help
+### 	  tune2fs allows the system administrator to adjust various tunable
+### 	  filesystem parameters on Linux ext2/ext3 filesystems.
+
+### config E2LABEL
+### 	bool "e2label"
+### 	default n
+### 	depends on TUNE2FS
+### 	help
+### 	  e2label will display or change the filesystem label on the ext2
+### 	  filesystem located on device.
+
+### config FINDFS
+### 	bool "findfs"
+### 	default n
+### 	depends on TUNE2FS
+### 	help
+### 	  findfs will search the disks in the system looking for a filesystem
+### 	  which has a label matching label or a UUID equal to uuid.
+
+endmenu
diff --git a/config/busybox-1.1.3/e2fsprogs/Config.in b/config/busybox-1.4.1/e2fsprogs/old_e2fsprogs/Config.in
index 2b5e3698c..86339a098 100644
--- a/config/busybox-1.1.3/e2fsprogs/Config.in
+++ b/config/busybox-1.4.1/e2fsprogs/old_e2fsprogs/Config.in
@@ -6,13 +6,13 @@
 menu "Linux Ext2 FS Progs"
   depends on BUSYBOX
 
-config BB_CONFIG_CHATTR
+config BB_CHATTR
 	bool "chattr"
 	default n
 	help
 	  chattr changes the file attributes on a second extended file system.
 
-config BB_CONFIG_E2FSCK
+config BB_E2FSCK
 	bool "e2fsck"
 	default n
 	help
@@ -21,7 +21,7 @@ config BB_CONFIG_E2FSCK
 	  The normal compat symlinks 'fsck.ext2' and 'fsck.ext3' are also
 	  provided.
 
-config BB_CONFIG_FSCK
+config BB_FSCK
 	bool "fsck"
 	default n
 	help
@@ -29,38 +29,38 @@ config BB_CONFIG_FSCK
 	  In actuality, fsck is simply a front-end for the various file system
 	  checkers (fsck.fstype) available under Linux.
 
-config BB_CONFIG_LSATTR
+config BB_LSATTR
 	bool "lsattr"
 	default n
 	help
 	  lsattr lists the file attributes on a second extended file system.
 
-config BB_CONFIG_MKE2FS
+config BB_MKE2FS
 	bool "mke2fs"
 	default n
 	help
 	  mke2fs is used to create an ext2/ext3 filesystem.  The normal compat
 	  symlinks 'mkfs.ext2' and 'mkfs.ext3' are also provided.
 
-config BB_CONFIG_TUNE2FS
+config BB_TUNE2FS
 	bool "tune2fs"
 	default n
 	help
 	  tune2fs allows the system administrator to adjust various tunable
 	  filesystem parameters on Linux ext2/ext3 filesystems.
 
-config BB_CONFIG_E2LABEL
+config BB_E2LABEL
 	bool "e2label"
 	default n
-	depends on BB_CONFIG_TUNE2FS
+	depends on BB_TUNE2FS
 	help
 	  e2label will display or change the filesystem label on the ext2
 	  filesystem located on device.
 
-config BB_CONFIG_FINDFS
+config BB_FINDFS
 	bool "findfs"
 	default n
-	depends on BB_CONFIG_TUNE2FS
+	depends on BB_TUNE2FS
 	help
 	  findfs will search the disks in the system looking for a filesystem
 	  which has a label matching label or a UUID equal to uuid.
diff --git a/config/busybox-1.1.3/editors/Config.in b/config/busybox-1.4.1/editors/Config.in
index 08087b602..1010545d3 100644
--- a/config/busybox-1.1.3/editors/Config.in
+++ b/config/busybox-1.4.1/editors/Config.in
@@ -6,35 +6,43 @@
 menu "Editors"
   depends on BUSYBOX
 
-config BB_CONFIG_AWK
+config BB_AWK
 	bool "awk"
 	default n
 	help
 	  Awk is used as a pattern scanning and processing language.  This is
 	  the BusyBox implementation of that programming language.
 
-config BB_CONFIG_FEATURE_AWK_MATH
-	bool "  Enable math functions (requires libm)"
+config BB_FEATURE_AWK_MATH
+	bool "Enable math functions (requires libm)"
 	default y
-	depends on BB_CONFIG_AWK
+	depends on BB_AWK
 	help
 	  Enable math functions of the Awk programming language.
 	  NOTE: This will require libm to be present for linking.
 
-config BB_CONFIG_PATCH
+config BB_ED
+	bool "ed"
+	default n
+	help
+	  The original 1970's Unix text editor, from the days of teletypes.
+	  Small, simple, evil.  Part of SUSv3.  If you're not already using
+	  this, you don't need it.
+
+config BB_PATCH
 	bool "patch"
 	default n
 	help
 	  Apply a unified diff formatted patch.
 
-config BB_CONFIG_SED
+config BB_SED
 	bool "sed"
 	default n
 	help
 	  sed is used to perform text transformations on a file
 	  or input from a pipeline.
 
-config BB_CONFIG_VI
+config BB_VI
 	bool "vi"
 	default n
 	help
@@ -43,82 +51,89 @@ config BB_CONFIG_VI
 	  learning curve.  If you are not already comfortable with 'vi'
 	  you may wish to use something else.
 
-config BB_CONFIG_FEATURE_VI_COLON
-	bool "  Enable \":\" colon commands (no \"ex\" mode)"
+config BB_FEATURE_VI_COLON
+	bool "Enable \":\" colon commands (no \"ex\" mode)"
 	default y
-	depends on BB_CONFIG_VI
+	depends on BB_VI
 	help
 	  Enable a limited set of colon commands for vi.  This does not
 	  provide an "ex" mode.
 
-config BB_CONFIG_FEATURE_VI_YANKMARK
-	bool "  Enable yank/put commands and mark cmds"
+config BB_FEATURE_VI_YANKMARK
+	bool "Enable yank/put commands and mark cmds"
 	default y
-	depends on BB_CONFIG_VI
+	depends on BB_VI
 	help
 	  This will enable you to use yank and put, as well as mark in
 	  busybox vi.
 
-config BB_CONFIG_FEATURE_VI_SEARCH
-	bool "  Enable search and replace cmds"
+config BB_FEATURE_VI_SEARCH
+	bool "Enable search and replace cmds"
 	default y
-	depends on BB_CONFIG_VI
+	depends on BB_VI
 	help
 	  Select this if you wish to be able to do search and replace in
 	  busybox vi.
 
-config BB_CONFIG_FEATURE_VI_USE_SIGNALS
-	bool "  Catch signals"
+config BB_FEATURE_VI_USE_SIGNALS
+	bool "Catch signals"
 	default y
-	depends on BB_CONFIG_VI
+	depends on BB_VI
 	help
 	  Selecting this option will make busybox vi signal aware.  This will
 	  make busybox vi support SIGWINCH to deal with Window Changes, catch
 	  Ctrl-Z and Ctrl-C and alarms.
 
-config BB_CONFIG_FEATURE_VI_DOT_CMD
-	bool "  Remember previous cmd and \".\" cmd"
+config BB_FEATURE_VI_DOT_CMD
+	bool "Remember previous cmd and \".\" cmd"
 	default y
-	depends on BB_CONFIG_VI
+	depends on BB_VI
 	help
 	  Make busybox vi remember the last command and be able to repeat it.
 
-config BB_CONFIG_FEATURE_VI_READONLY
-	bool "  Enable -R option and \"view\" mode"
+config BB_FEATURE_VI_READONLY
+	bool "Enable -R option and \"view\" mode"
 	default y
-	depends on BB_CONFIG_VI
+	depends on BB_VI
 	help
 	  Enable the read-only command line option, which allows the user to
 	  open a file in read-only mode.
 
-config BB_CONFIG_FEATURE_VI_SETOPTS
-	bool "  Enable set-able options, ai ic showmatch"
+config BB_FEATURE_VI_SETOPTS
+	bool "Enable set-able options, ai ic showmatch"
 	default y
-	depends on BB_CONFIG_VI
+	depends on BB_VI
 	help
 	  Enable the editor to set some (ai, ic, showmatch) options.
 
-config BB_CONFIG_FEATURE_VI_SET
-	bool "  Support for :set"
+config BB_FEATURE_VI_SET
+	bool "Support for :set"
 	default y
-	depends on BB_CONFIG_VI
+	depends on BB_VI
 	help
 	  Support for ":set".
 
-config BB_CONFIG_FEATURE_VI_WIN_RESIZE
-	bool "  Handle window resize"
+config BB_FEATURE_VI_WIN_RESIZE
+	bool "Handle window resize"
 	default y
-	depends on BB_CONFIG_VI
+	depends on BB_VI
 	help
 	  Make busybox vi behave nicely with terminals that get resized.
 
-config BB_CONFIG_FEATURE_VI_OPTIMIZE_CURSOR
-	bool "  Optimize cursor movement"
+config BB_FEATURE_VI_OPTIMIZE_CURSOR
+	bool "Optimize cursor movement"
 	default y
-	depends on BB_CONFIG_VI
+	depends on BB_VI
 	help
 	  This will make the cursor movement faster, but requires more memory
 	  and it makes the applet a tiny bit larger.
 
-endmenu
+config BB_FEATURE_ALLOW_EXEC
+	bool "Allow vi and awk to execute shell commands"
+	default y
+	depends on BB_VI || BB_AWK
+	help
+	  Enables vi and awk features which allows user to execute
+	  shell commands (using system() C call).
 
+endmenu
diff --git a/config/busybox-1.1.3/findutils/Config.in b/config/busybox-1.4.1/findutils/Config.in
index 9d9e28e0e..d11ce326a 100644
--- a/config/busybox-1.1.3/findutils/Config.in
+++ b/config/busybox-1.4.1/findutils/Config.in
@@ -6,142 +6,152 @@
 menu "Finding Utilities"
   depends on BUSYBOX
 
-config BB_CONFIG_FIND
+config BB_FIND
 	bool "find"
 	default n
 	help
 	  find is used to search your system to find specified files.
 
-config BB_CONFIG_FEATURE_FIND_MTIME
-	bool "  Enable modified time matching (-mtime) option"
+config BB_FEATURE_FIND_PRINT0
+	bool "Enable -print0 option"
 	default y
-	depends on BB_CONFIG_FIND
+	depends on BB_FIND
+	help
+	  Causes output names to be separated by a null character
+	  rather than a newline.  This allows names that contain
+	  newlines and other whitespace to be more easily
+	  interpreted by other programs.
+
+config BB_FEATURE_FIND_MTIME
+	bool "Enable modified time matching (-mtime) option"
+	default y
+	depends on BB_FIND
 	help
 	  Allow searching based on the modification time of
 	  files, in days.
 
-config BB_CONFIG_FEATURE_FIND_MMIN
-	bool "  Enable modified time matching (-min) option"
+config BB_FEATURE_FIND_MMIN
+	bool "Enable modified time matching (-min) option"
 	default y
-	depends on BB_CONFIG_FIND
+	depends on BB_FIND
 	help
 	  Allow searching based on the modification time of
 	  files, in minutes.
 
-config BB_CONFIG_FEATURE_FIND_PERM
-	bool "  Enable permissions matching (-perm) option"
+config BB_FEATURE_FIND_PERM
+	bool "Enable permissions matching (-perm) option"
 	default y
-	depends on BB_CONFIG_FIND
+	depends on BB_FIND
 	help
 	  Enable searching based on file permissions.
 
-config BB_CONFIG_FEATURE_FIND_TYPE
-	bool "  Enable filetype matching (-type) option"
+config BB_FEATURE_FIND_TYPE
+	bool "Enable filetype matching (-type) option"
 	default y
-	depends on BB_CONFIG_FIND
+	depends on BB_FIND
 	help
 	  Enable searching based on file type (file,
 	  directory, socket, device, etc.).
 
-config BB_CONFIG_FEATURE_FIND_XDEV
-	bool "  Enable stay in filesystem (-xdev) option"
+config BB_FEATURE_FIND_XDEV
+	bool "Enable stay in filesystem (-xdev) option"
 	default y
-	depends on BB_CONFIG_FIND
+	depends on BB_FIND
 	help
 	  This option will allow find to restrict searches to a single
 	  filesystem.
 
-config BB_CONFIG_FEATURE_FIND_NEWER
-	bool "  Enable -newer option for comparing file mtimes"
+config BB_FEATURE_FIND_NEWER
+	bool "Enable -newer option for comparing file mtimes"
 	default y
-	depends on BB_CONFIG_FIND
+	depends on BB_FIND
 	help
 	  Support the 'find -newer' option for finding any files which have
 	  a modified time that is more recent than the specified FILE.
 
-config BB_CONFIG_FEATURE_FIND_INUM
-	bool "  Enable inode number matching (-inum) option"
+config BB_FEATURE_FIND_INUM
+	bool "Enable inode number matching (-inum) option"
 	default y
-	depends on BB_CONFIG_FIND
+	depends on BB_FIND
 	help
 	  Support the 'find -inum' option for searching by inode number.
 
-config BB_CONFIG_FEATURE_FIND_EXEC
-	bool "  Enable (-exec) option allowing execution of commands"
+config BB_FEATURE_FIND_EXEC
+	bool "Enable (-exec) option allowing execution of commands"
 	default y
-	depends on BB_CONFIG_FIND
+	depends on BB_FIND
 	help
 	  Support the 'find -exec' option for executing commands based upon
 	  the files matched.
 
-config BB_CONFIG_GREP
+config BB_GREP
 	bool "grep"
 	default n
 	help
 	  grep is used to search files for a specified pattern.
 
-config BB_CONFIG_FEATURE_GREP_EGREP_ALIAS
-	bool "  Support extended regular expressions (egrep & grep -E)"
+config BB_FEATURE_GREP_EGREP_ALIAS
+	bool "Support extended regular expressions (egrep & grep -E)"
 	default y
-	depends on BB_CONFIG_GREP
+	depends on BB_GREP
 	help
 	  Enabled support for extended regular expressions.  Extended
 	  regular expressions allow for alternation (foo|bar), grouping,
 	  and various repetition operators.
 
-config BB_CONFIG_FEATURE_GREP_FGREP_ALIAS
-	bool "  Alias fgrep to grep -F"
+config BB_FEATURE_GREP_FGREP_ALIAS
+	bool "Alias fgrep to grep -F"
 	default y
-	depends on BB_CONFIG_GREP
+	depends on BB_GREP
 	help
 	  fgrep sees the search pattern as a normal string rather than
 	  regular expressions.
 	  grep -F is always builtin, this just creates the fgrep alias.
 
-config BB_CONFIG_FEATURE_GREP_CONTEXT
-	bool "  Enable before and after context flags (-A, -B and -C)"
+config BB_FEATURE_GREP_CONTEXT
+	bool "Enable before and after context flags (-A, -B and -C)"
 	default y
-	depends on BB_CONFIG_GREP
+	depends on BB_GREP
 	help
 	  Print the specified number of leading (-B) and/or trailing (-A)
 	  context surrounding our matching lines.
 	  Print the specified number of context lines (-C).
 
-config BB_CONFIG_XARGS
+config BB_XARGS
 	bool "xargs"
 	default n
 	help
 	  xargs is used to execute a specified command on
 	  every item from standard input.
 
-config BB_CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION
-	bool "  Enable prompt and confirmation option -p"
+config BB_FEATURE_XARGS_SUPPORT_CONFIRMATION
+	bool "Enable prompt and confirmation option -p"
 	default n
-	depends on BB_CONFIG_XARGS
+	depends on BB_XARGS
 	help
 	  Support prompt the user about whether to run each command
 	  line and read a line from the terminal.
 
-config BB_CONFIG_FEATURE_XARGS_SUPPORT_QUOTES
-	bool "  Enable support single and double quotes and backslash"
+config BB_FEATURE_XARGS_SUPPORT_QUOTES
+	bool "Enable support single and double quotes and backslash"
 	default n
-	depends on BB_CONFIG_XARGS
+	depends on BB_XARGS
 	help
 	  Default xargs unsupport single and double quotes
 	  and backslash for can use aruments with spaces.
 
-config BB_CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT
-	bool "  Enable support options -x"
+config BB_FEATURE_XARGS_SUPPORT_TERMOPT
+	bool "Enable support options -x"
 	default n
-	depends on BB_CONFIG_XARGS
+	depends on BB_XARGS
 	help
 	  Enable support exit if the size (see the -s or -n option)
 	  is exceeded.
 
-config BB_CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM
-	bool "  Enable options -0"
+config BB_FEATURE_XARGS_SUPPORT_ZERO_TERM
+	bool "Enable null terminated option -0"
 	default n
-	depends on BB_CONFIG_XARGS
+	depends on BB_XARGS
 	help
 	  Enable input filenames are terminated by a null character
 	  instead of by whitespace, and the quotes and backslash
diff --git a/config/busybox-1.1.3/init/Config.in b/config/busybox-1.4.1/init/Config.in
index f4e438890..5ad011e68 100644
--- a/config/busybox-1.1.3/init/Config.in
+++ b/config/busybox-1.4.1/init/Config.in
@@ -6,23 +6,32 @@
 menu "Init Utilities"
   depends on BUSYBOX
 
-config BB_CONFIG_INIT
+config BB_INIT
 	bool "init"
 	default n
+	select BB_FEATURE_SYSLOG
 	help
 	  init is the first program run when the system boots.
 
-config BB_CONFIG_FEATURE_USE_INITTAB
-	bool "  Support reading an inittab file"
+config BB_DEBUG_INIT
+	bool "debugging aid"
+	default n
+	depends on BB_INIT
+	help
+	  Turn this on to disable all the dangerous
+	  rebooting stuff when debugging.
+
+config BB_FEATURE_USE_INITTAB
+	bool "Support reading an inittab file"
 	default y
-	depends on BB_CONFIG_INIT
+	depends on BB_INIT
 	help
 	  Allow init to read an inittab file when the system boot.
 
-config BB_CONFIG_FEATURE_INIT_SCTTY
-	bool "  Support running commands with a controlling-tty"
+config BB_FEATURE_INIT_SCTTY
+	bool "Support running commands with a controlling-tty"
 	default n
-	depends on BB_CONFIG_INIT
+	depends on BB_INIT
 	help
 	  If this option is enabled a command starting with hyphen (-)
 	  is run in its own session (setsid(2)) and possibly with a
@@ -30,17 +39,17 @@ config BB_CONFIG_FEATURE_INIT_SCTTY
 	  behavour, but is often what you want in an embedded system where
 	  the console is only accessed during development or for maintenance.
 
-config BB_CONFIG_FEATURE_EXTRA_QUIET
-	bool "  Be _extra_ quiet on boot"
+config BB_FEATURE_EXTRA_QUIET
+	bool "Be _extra_ quiet on boot"
 	default y
-	depends on BB_CONFIG_INIT
+	depends on BB_INIT
 	help
 	  Prevent init from logging some messages to the console during boot.
 
-config BB_CONFIG_FEATURE_INIT_COREDUMPS
-	bool "  Support dumping core for child processes (debugging only)"
+config BB_FEATURE_INIT_COREDUMPS
+	bool "Support dumping core for child processes (debugging only)"
 	default n
-	depends on BB_CONFIG_INIT
+	depends on BB_INIT
 	help
 	  If this option is enabled and the file /.init_enable_core
 	  exists, then init will call setrlimit() to allow unlimited
@@ -49,10 +58,10 @@ config BB_CONFIG_FEATURE_INIT_COREDUMPS
 
 
 
-config BB_CONFIG_FEATURE_INITRD
-	bool "  Support running init from within an initrd (not initramfs)"
+config BB_FEATURE_INITRD
+	bool "Support running init from within an initrd (not initramfs)"
 	default y
-	depends on BB_CONFIG_INIT
+	depends on BB_INIT
 	help
 	  Legacy support for running init under the old-style initrd.  Allows
 	  the name linuxrc to act as init, and it doesn't assume init is PID 1.
@@ -60,22 +69,17 @@ config BB_CONFIG_FEATURE_INITRD
 	  This does not apply to initramfs, which runs /init as PID 1 and
 	  requires no special support.
 
-config BB_CONFIG_HALT
+config BB_HALT
 	bool "poweroff, halt, and reboot"
 	default y
 	help
 	  Stop all processes and either halt, reboot, or power off the system.
 
-config BB_CONFIG_MESG
+config BB_MESG
 	bool "mesg"
 	default y
 	help
 	  Mesg controls access to your terminal by others.  It is typically
 	  used to allow or disallow other users to write to your terminal
 
-	default y
-	help
-	  Stop all processes and (try to) power off the system.
-
 endmenu
-
diff --git a/config/busybox-1.1.3/libbb/Config.in b/config/busybox-1.4.1/libbb/Config.in
index f1fa4f9eb..112c062d1 100644
--- a/config/busybox-1.1.3/libbb/Config.in
+++ b/config/busybox-1.4.1/libbb/Config.in
@@ -6,7 +6,14 @@
 menu "Busybox Library Tuning"
   depends on BUSYBOX
 
-config BB_CONFIG_MD5_SIZE_VS_SPEED
+config BB_PASSWORD_MINLEN
+	int "Minimum password length"
+	default 6
+	range 5 32
+	help
+	  Minimum allowable password length.
+
+config BB_MD5_SIZE_VS_SPEED
 	int " MD5: Trade Bytes for Speed"
 	default 2
 	range 0 3
diff --git a/config/busybox-1.1.3/loginutils/Config.in b/config/busybox-1.4.1/loginutils/Config.in
index ffbc6e76c..0cc2209ae 100644
--- a/config/busybox-1.1.3/loginutils/Config.in
+++ b/config/busybox-1.4.1/loginutils/Config.in
@@ -6,7 +6,7 @@
 menu "Login/Password Management Utilities"
   depends on BUSYBOX
 
-config BB_CONFIG_FEATURE_SHADOWPASSWDS
+config BB_FEATURE_SHADOWPASSWDS
 	bool "Support for shadow passwords"
 	default n
 	help
@@ -14,10 +14,10 @@ config BB_CONFIG_FEATURE_SHADOWPASSWDS
 	  readable by root and thus the encrypted passwords are no longer
 	  publicly readable.
 
-config BB_CONFIG_USE_BB_SHADOW
-	bool #"  Use busybox shadow password functions"
+config BB_USE_BB_SHADOW
+	bool "  Use busybox shadow password functions"
 	default y
-	depends on BB_CONFIG_USE_BB_PWD_GRP && BB_CONFIG_FEATURE_SHADOWPASSWDS
+	depends on BB_USE_BB_PWD_GRP && BB_FEATURE_SHADOWPASSWDS
 	help
 	    If you leave this disabled, busybox will use the system's shadow
 	    password handling functions.  And if you are using the GNU C library
@@ -33,7 +33,7 @@ config BB_CONFIG_USE_BB_SHADOW
 	    able to use PAM to access shadow passwords from remote LDAP
 	    password servers and whatnot.
 
-config BB_CONFIG_USE_BB_PWD_GRP
+config BB_USE_BB_PWD_GRP
 	bool "Use internal password and group functions rather than system functions"
 	default n
 	help
@@ -54,75 +54,86 @@ config BB_CONFIG_USE_BB_PWD_GRP
 
 	    If you enable this option, it will add about 1.5k to busybox.
 
-config BB_CONFIG_ADDGROUP
+config BB_ADDGROUP
 	bool "addgroup"
 	default n
 	help
 	  Utility for creating a new group account.
 
-config BB_CONFIG_DELGROUP
+config BB_DELGROUP
 	bool "delgroup"
 	default n
 	help
 	  Utility for deleting a group account.
 
-config BB_CONFIG_ADDUSER
+config BB_ADDUSER
 	bool "adduser"
 	default n
 	help
 	  Utility for creating a new user account.
 
-config BB_CONFIG_DELUSER
+config BB_DELUSER
 	bool "deluser"
 	default n
 	help
 	  Utility for deleting a user account.
 
-config BB_CONFIG_GETTY
+config BB_GETTY
 	bool "getty"
 	default n
+	select BB_FEATURE_SYSLOG
 	help
 	  getty lets you log in on a tty, it is normally invoked by init.
 
-config BB_CONFIG_FEATURE_UTMP
-	bool "  Support utmp file"
-	depends on BB_CONFIG_GETTY || BB_CONFIG_LOGIN || BB_CONFIG_SU || BB_CONFIG_WHO
+config BB_FEATURE_UTMP
+	bool "Support utmp file"
+	depends on BB_GETTY || BB_LOGIN || BB_SU || BB_WHO
 	default n
 	help
 	  The file /var/run/utmp is used to track who is currently logged in.
 
-config BB_CONFIG_FEATURE_WTMP
-	bool "  Support wtmp file"
-	depends on BB_CONFIG_GETTY || BB_CONFIG_LOGIN || BB_CONFIG_SU || BB_CONFIG_LAST
+config BB_FEATURE_WTMP
+	bool "Support wtmp file"
+	depends on BB_GETTY || BB_LOGIN || BB_SU || BB_LAST
 	default n
-	select BB_CONFIG_FEATURE_UTMP
+	select BB_FEATURE_UTMP
 	help
 	  The file /var/run/wtmp is used to track when user's have logged into
 	  and logged out of the system.
 
-config BB_CONFIG_LOGIN
+config BB_LOGIN
 	bool "login"
 	default n
-	select BB_CONFIG_FEATURE_SUID
+	select BB_FEATURE_SUID
+	select BB_FEATURE_SYSLOG
 	help
 	  login is used when signing onto a system.
 
 	  Note that Busybox binary must be setuid root for this applet to
 	  work properly.
 
-config BB_CONFIG_FEATURE_SECURETTY
-	bool "  Support for /etc/securetty"
+config BB_LOGIN_SCRIPTS
+	bool "Support for login scripts"
+	depends on BB_LOGIN
+	default n
+	help
+	  Enable this if you want login to execute $LOGIN_PRE_SUID_SCRIPT
+	  just prior to switching from root to logged-in user.
+
+config BB_FEATURE_SECURETTY
+	bool "Support for /etc/securetty"
 	default y
-	depends on BB_CONFIG_LOGIN
+	depends on BB_LOGIN
 	help
 	  The file  /etc/securetty  is used by (some versions of) login(1).
 	  The file contains the device names of tty lines (one per line,
 	  without leading /dev/) on which root is allowed to login.
 
-config BB_CONFIG_PASSWD
+config BB_PASSWD
 	bool "passwd"
 	default n
-	select BB_CONFIG_FEATURE_SUID
+	select BB_FEATURE_SUID
+	select BB_FEATURE_SYSLOG
 	help
 	  passwd changes passwords for user and group accounts.  A normal user
 	  may only change the password for his/her own account, the super user
@@ -132,10 +143,18 @@ config BB_CONFIG_PASSWD
 	  Note that Busybox binary must be setuid root for this applet to
 	  work properly.
 
-config BB_CONFIG_SU
+config BB_FEATURE_PASSWD_WEAK_CHECK
+	bool "Check new passwords for weakness"
+	default y
+	depends on BB_PASSWD
+	help
+	  With this option passwd will refuse new passwords which are "weak".
+
+config BB_SU
 	bool "su"
 	default n
-	select BB_CONFIG_FEATURE_SUID
+	select BB_FEATURE_SUID
+	select BB_FEATURE_SYSLOG
 	help
 	  su is used to become another user during a login session.
 	  Invoked without a username, su defaults to becoming the super user.
@@ -143,17 +162,28 @@ config BB_CONFIG_SU
 	  Note that Busybox binary must be setuid root for this applet to
 	  work properly.
 
-config BB_CONFIG_SULOGIN
+config BB_FEATURE_SU_SYSLOG
+	bool "Enable su to write to syslog"
+	default y
+	depends on BB_SU
+
+config BB_FEATURE_SU_CHECKS_SHELLS
+	bool "Enable su to check user's shell to be listed in /etc/shells"
+	depends on BB_SU
+	default y
+
+config BB_SULOGIN
 	bool "sulogin"
 	default n
+	select BB_FEATURE_SYSLOG
 	help
 	  sulogin is invoked when the system goes into single user
 	  mode (this is done through an entry in inittab).
 
-config BB_CONFIG_VLOCK
+config BB_VLOCK
 	bool "vlock"
 	default n
-	select BB_CONFIG_FEATURE_SUID
+	select BB_FEATURE_SUID
 	help
 	  Build the "vlock" applet which allows you to lock (virtual) terminals.
 
diff --git a/config/busybox-1.1.3/miscutils/Config.in b/config/busybox-1.4.1/miscutils/Config.in
index d663e2b2b..34aa78bf3 100644
--- a/config/busybox-1.1.3/miscutils/Config.in
+++ b/config/busybox-1.4.1/miscutils/Config.in
@@ -6,24 +6,25 @@
 menu "Miscellaneous Utilities"
   depends on BUSYBOX
 
-config BB_CONFIG_ADJTIMEX
+config BB_ADJTIMEX
 	bool "adjtimex"
 	default n
 	help
 	  Adjtimex reads and optionally sets adjustment parameters for
 	  the Linux clock adjustment algorithm.
 
-config BB_CONFIG_BBCONFIG
+config BB_BBCONFIG
 	bool "bbconfig"
 	default n
 	help
 	  The bbconfig applet will print the config file with which
 	  busybox was built.
 
-config BB_CONFIG_CROND
+config BB_CROND
 	bool "crond"
 	default n
-	select BB_CONFIG_FEATURE_SUID
+	select BB_FEATURE_SUID
+	select BB_FEATURE_SYSLOG
 	help
 	  Crond is a background daemon that parses individual crontab
 	  files and executes commands on behalf of the users in question.
@@ -35,32 +36,42 @@ config BB_CONFIG_CROND
 	  Note that Busybox binary must be setuid root for this applet to
 	  work properly.
 
-config BB_CONFIG_FEATURE_CROND_CALL_SENDMAIL
-	bool "  Using /usr/sbin/sendmail?"
+config BB_DEBUG_CROND_OPTION
+	bool "Support debug option -d"
+	depends on BB_CROND
 	default n
-	depends on BB_CONFIG_CROND
+	help
+	  Support option -d to enter debug mode.
+
+config BB_FEATURE_CROND_CALL_SENDMAIL
+	bool "Using /usr/sbin/sendmail?"
+	default n
+	depends on BB_CROND
 	help
 	  Support calling /usr/sbin/sendmail for send cmd outputs.
 
-config BB_CONFIG_CRONTAB
+config BB_CRONTAB
 	bool "crontab"
 	default n
-	select BB_CONFIG_FEATURE_SUID
+	select BB_FEATURE_SUID
 	help
 	  Crontab manipulates the crontab for a particular user.  Only
 	  the superuser may specify a different user and/or crontab directory.
 
-config BB_CONFIG_DC
+config BB_DC
 	bool "dc"
 	default n
 	help
 	  Dc is a reverse-polish desk calculator which supports unlimited
 	  precision arithmetic.
 
-config BB_CONFIG_DEVFSD
-	bool "devfsd"
+config BB_DEVFSD
+	bool "devfsd (obsolete)"
 	default n
+	select BB_FEATURE_SYSLOG
 	help
+	  This is deprecated, and will be removed at the end of 2008.
+
 	  Provides compatibility with old device names on a devfs systems.
 	  You should set it to true if you have devfs enabled.
 	  The following keywords in devsfd.conf are supported:
@@ -70,147 +81,164 @@ config BB_CONFIG_DEVFSD
 
 	   But only if they are written UPPERCASE!!!!!!!!
 
-config BB_CONFIG_DEVFSD_MODLOAD
+config BB_DEVFSD_MODLOAD
 	bool "Adds support for MODLOAD keyword in devsfd.conf"
 	default n
-	depends on BB_CONFIG_DEVFSD
+	depends on BB_DEVFSD
 	help
-	  This actually doesn't work with busybox  modutils but needs the real modutils.
+	  This actually doesn't work with busybox modutils but needs
+	  the external modutils.
 
-config BB_CONFIG_DEVFSD_FG_NP
+config BB_DEVFSD_FG_NP
 	bool "Enables the -fg and -np options"
 	default n
-	depends on BB_CONFIG_DEVFSD
+	depends on BB_DEVFSD
 	help
 		-fg	Run the daemon in the foreground.
 		-np	Exit  after  parsing  the configuration file. Do not poll for events.
 
-config BB_CONFIG_DEVFSD_VERBOSE
+config BB_DEVFSD_VERBOSE
 	bool "Increases logging (and size)"
 	default n
-	depends on BB_CONFIG_DEVFSD
+	depends on BB_DEVFSD
 	help
 	  Increases logging to stderr or syslog.
 
-config BB_CONFIG_EJECT
+config BB_FEATURE_DEVFS
+	bool "  Use devfs names for all devices (obsolete)"
+	default n
+	help
+	  This is obsolete and will be going away at the end of 2008..
+
+	  This tells busybox to look for names like /dev/loop/0 instead of
+	  /dev/loop0.  If your /dev directory has normal names instead of
+	  devfs names, you don't want this.
+
+config BB_EJECT
 	bool "eject"
 	default n
 	help
 	  Used to eject cdroms.  (defaults to /dev/cdrom)
 
-config BB_CONFIG_LAST
+config BB_LAST
 	bool "last"
 	default n
-	select BB_CONFIG_FEATURE_WTMP
+	select BB_FEATURE_WTMP
 	help
 	  'last' displays a list of the last users that logged into the system.
 
-config BB_CONFIG_LESS
+config BB_LESS
 	bool "less"
 	default n
 	help
 	  'less' is a pager, meaning that it displays text files. It possesses
 	  a wide array of features, and is an improvement over 'more'.
 
-config BB_CONFIG_FEATURE_LESS_BRACKETS
-	bool "  Enable bracket searching"
+config BB_FEATURE_LESS_MAXLINES
+	int "Max number of input lines less will try to eat"
+	default 9999999
+	depends on BB_LESS
+
+config BB_FEATURE_LESS_BRACKETS
+	bool "Enable bracket searching"
 	default y
-	depends on BB_CONFIG_LESS
+	depends on BB_LESS
 	help
 	  This option adds the capability to search for matching left and right
 	  brackets, facilitating programming.
 
-config BB_CONFIG_FEATURE_LESS_FLAGS
-	bool "  Enable extra flags"
+config BB_FEATURE_LESS_FLAGS
+	bool "Enable extra flags"
 	default y
-	depends on BB_CONFIG_LESS
+	depends on BB_LESS
 	help
 	  The extra flags provided do the following:
 
 	  The -M flag enables a more sophisticated status line.
 	  The -m flag enables a simpler status line with a percentage.
 
-config BB_CONFIG_FEATURE_LESS_FLAGCS
-	bool "  Enable flag changes"
+config BB_FEATURE_LESS_FLAGCS
+	bool "Enable flag changes"
 	default n
-	depends on BB_CONFIG_LESS
+	depends on BB_LESS
 	help
 	  This enables the ability to change command-line flags within
 	  less itself.
 
-config BB_CONFIG_FEATURE_LESS_MARKS
-	bool "  Enable marks"
+config BB_FEATURE_LESS_MARKS
+	bool "Enable marks"
 	default n
-	depends on BB_CONFIG_LESS
+	depends on BB_LESS
 	help
 	  Marks enable positions in a file to be stored for easy reference.
 
-config BB_CONFIG_FEATURE_LESS_REGEXP
-	bool "  Enable regular expressions"
+config BB_FEATURE_LESS_REGEXP
+	bool "Enable regular expressions"
 	default n
-	depends on BB_CONFIG_LESS
+	depends on BB_LESS
 	help
 	  Enable regular expressions, allowing complex file searches.
 
-config BB_CONFIG_HDPARM
+config BB_HDPARM
 	bool "hdparm"
 	default n
 	help
 	  Get/Set hard drive parameters.  Primarily intended for ATA
 	  drives.  Adds about 13k (or around 30k if you enable the
-	  CONFIG_FEATURE_HDPARM_GET_IDENTITY option)....
+	  FEATURE_HDPARM_GET_IDENTITY option)....
 
-config BB_CONFIG_FEATURE_HDPARM_GET_IDENTITY
-	bool "  Support obtaining detailed information directly from drives"
+config BB_FEATURE_HDPARM_GET_IDENTITY
+	bool "Support obtaining detailed information directly from drives"
 	default y
-	depends on BB_CONFIG_HDPARM
+	depends on BB_HDPARM
 	help
-	  Enables the -I and -Istdin options to obtain detailed information
+	  Enables the -I and -i options to obtain detailed information
 	  directly from drives about their capabilities and supported ATA
-	  feature set.  Enabling this option will add about 16k...
+	  feature set. If no device name is specified, hdparm will read
+	  identify data from stdin. Enabling this option will add about 16k...
 
-config BB_CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF
-	bool "  Register an IDE interface (DANGEROUS)"
+config BB_FEATURE_HDPARM_HDIO_SCAN_HWIF
+	bool "Register an IDE interface (DANGEROUS)"
 	default n
-	depends on BB_CONFIG_HDPARM
+	depends on BB_HDPARM
 	help
 	  Enables the 'hdparm -R' option to register an IDE interface.
 	  This is dangerous stuff, so you should probably say N.
 
-config BB_CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF
-	bool "  Un-register an IDE interface (DANGEROUS)"
+config BB_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF
+	bool "Un-register an IDE interface (DANGEROUS)"
 	default n
-	depends on BB_CONFIG_HDPARM
+	depends on BB_HDPARM
 	help
 	  Enables the 'hdparm -U' option to un-register an IDE interface.
 	  This is dangerous stuff, so you should probably say N.
 
-config BB_CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET
-	bool "  perform device reset (DANGEROUS)"
+config BB_FEATURE_HDPARM_HDIO_DRIVE_RESET
+	bool "perform device reset (DANGEROUS)"
 	default n
-	depends on BB_CONFIG_HDPARM
+	depends on BB_HDPARM
 	help
 	  Enables the 'hdparm -w' option to perform a device reset.
 	  This is dangerous stuff, so you should probably say N.
 
-config BB_CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF
-	bool "  tristate device for hotswap (DANGEROUS)"
+config BB_FEATURE_HDPARM_HDIO_TRISTATE_HWIF
+	bool "tristate device for hotswap (DANGEROUS)"
 	default n
-	depends on BB_CONFIG_HDPARM
+	depends on BB_HDPARM
 	help
 	  Enables the 'hdparm -x' option to tristate device for hotswap,
 	  and the '-b' option to get/set bus state.  This is dangerous
 	  stuff, so you should probably say N.
 
-config BB_CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA
-	bool "  get/set using_dma flag (DANGEROUS)"
+config BB_FEATURE_HDPARM_HDIO_GETSET_DMA
+	bool "get/set using_dma flag (DANGEROUS)"
 	default n
-	depends on BB_CONFIG_HDPARM
+	depends on BB_HDPARM
 	help
 	  Enables the 'hdparm -d' option to get/set using_dma flag.
 	  This is dangerous stuff, so you should probably say N.
 
-config BB_CONFIG_MAKEDEVS
+config BB_MAKEDEVS
 	bool "makedevs"
 	default n
 	help
@@ -226,29 +254,29 @@ config BB_CONFIG_MAKEDEVS
           Device properties are passed as command line arguments.
 	  .
 	  'table' reads device properties from a file or stdin, allowing
-	  a batch of unrelated devices to be makde with one command.
+	  a batch of unrelated devices to be made with one command.
           User/group names are allowed as an alternative to uid/gid.
 
 choice
 	prompt "Choose makedevs behaviour"
-	depends BB_CONFIG_MAKEDEVS
-	default BB_CONFIG_FEATURE_MAKEDEVS_TABLE
+	depends BB_MAKEDEVS
+	default BB_FEATURE_MAKEDEVS_TABLE
 
-config BB_CONFIG_FEATURE_MAKEDEVS_LEAF
+config BB_FEATURE_MAKEDEVS_LEAF
         bool "leaf"
 
-config BB_CONFIG_FEATURE_MAKEDEVS_TABLE
+config BB_FEATURE_MAKEDEVS_TABLE
 	bool "table"
 
 endchoice
 
-config BB_CONFIG_MOUNTPOINT
+config BB_MOUNTPOINT
 	bool "mountpoint"
 	default n
 	help
 	  mountpoint checks if the directory is a mountpoint.
 
-config BB_CONFIG_MT
+config BB_MT
 	bool "mt"
 	default n
 	help
@@ -256,7 +284,36 @@ config BB_CONFIG_MT
 	  to advance or rewind a tape past a specified number of archive
 	  files on the tape.
 
-config BB_CONFIG_RUNLEVEL
+config BB_NMETER
+	bool "nmeter"
+	default n
+	help
+	  nmeter prints various system parameters continuously.
+
+config BB_RAIDAUTORUN
+	bool "raidautorun"
+	default n
+	help
+	  raidautorun tells the kernel md driver to
+	  search and start RAID arrays.
+
+config BB_READAHEAD
+        bool "readahead"
+	default n
+	help
+ 	  Preload the files listed on the command line into RAM cache so that
+	  subsequent reads on these files will not block on disk I/O.
+
+	  This applet just calls the readahead(2) system call on each file.
+	  It is mainly useful in system startup scripts to preload files
+	  or executables before they are used.  When used at the right time
+	  (in particular when a CPU boundprocess is running) it can
+	  significantly speed up system startup.
+
+	  As readahead(2) blocks until each file has been read, it is best to
+	  run this applet as a background job.
+
+config BB_RUNLEVEL
         bool "runlevel"
 	default n
 	help
@@ -265,26 +322,42 @@ config BB_CONFIG_RUNLEVEL
 	  This applet uses utmp but does not rely on busybox supporing
 	  utmp on purpose. It is used by e.g. emdebian via /etc/init.d/rc.
 
-config BB_CONFIG_RX
+config BB_RX
         bool "rx"
 	default n
 	help
  	  Receive files using the Xmodem protocol.
 
-config BB_CONFIG_STRINGS
+config BB_STRINGS
 	bool "strings"
 	default n
 	help
 	  strings prints the printable character sequences for each file
 	  specified.
 
-config BB_CONFIG_SETSID
+config BB_SETSID
 	bool "setsid"
 	default n
 	help
 	  setsid runs a program in a new session
 
-config BB_CONFIG_TIME
+config BB_TASKSET
+	bool "taskset"
+	default n
+	help
+	  Retrieve or set a processes's CPU affinity.
+	  This requires sched_{g,s}etaffinity support in your libc.
+
+config BB_FEATURE_TASKSET_FANCY
+	bool "fancy output"
+	default y
+	depends on BB_TASKSET
+	help
+	  Add code for fancy output. This merely silences a compiler-warning
+	  and adds about 135 Bytes. May be needed for machines with alot
+	  of CPUs.
+
+config BB_TIME
 	bool "time"
 	default n
 	help
@@ -292,7 +365,7 @@ config BB_CONFIG_TIME
 	  When the command finishes, time writes a message to standard output
 	  giving timing statistics about this program run.
 
-config BB_CONFIG_WATCHDOG
+config BB_WATCHDOG
 	bool "watchdog"
 	default n
 	help
diff --git a/config/busybox-1.1.3/modutils/Config.in b/config/busybox-1.4.1/modutils/Config.in
index c929eed3d..0cebab95f 100644
--- a/config/busybox-1.1.3/modutils/Config.in
+++ b/config/busybox-1.4.1/modutils/Config.in
@@ -6,24 +6,24 @@
 menu "Linux Module Utilities"
   depends on BUSYBOX
 
-config BB_CONFIG_INSMOD
+config BB_INSMOD
 	bool "insmod"
 	default n
 	help
 	  insmod is used to load specified modules in the running kernel.
 
-config BB_CONFIG_FEATURE_INSMOD_VERSION_CHECKING
+config BB_FEATURE_INSMOD_VERSION_CHECKING
 	bool "Module version checking"
 	default n
-	depends on BB_CONFIG_INSMOD && BB_CONFIG_FEATURE_2_4_MODULES
+	depends on BB_INSMOD && BB_FEATURE_2_4_MODULES
 	help
 	  Support checking of versions for modules.  This is used to
 	  ensure that the kernel and module are made for each other.
 
-config BB_CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS
+config BB_FEATURE_INSMOD_KSYMOOPS_SYMBOLS
 	bool "Add module symbols to kernel symbol table"
 	default n
-	depends on BB_CONFIG_INSMOD && BB_CONFIG_FEATURE_2_4_MODULES
+	depends on BB_INSMOD && BB_FEATURE_2_4_MODULES
 	help
 	  By adding module symbols to the kernel symbol table, Oops messages
 	  occuring within kernel modules can be properly debugged.  By enabling
@@ -31,20 +31,20 @@ config BB_CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS
 	  table for properly debugging support.  If you are not interested in
 	  Oops messages from kernel modules, say N.
 
-config BB_CONFIG_FEATURE_INSMOD_LOADINKMEM
+config BB_FEATURE_INSMOD_LOADINKMEM
 	bool "In kernel memory optimization (uClinux only)"
 	default n
-	depends on BB_CONFIG_INSMOD && BB_CONFIG_FEATURE_2_4_MODULES
+	depends on BB_INSMOD && BB_FEATURE_2_4_MODULES
 	help
 	  This is a special uClinux only memory optimization that lets insmod
 	  load the specified kernel module directly into kernel space, reducing
 	  memory usage by preventing the need for two copies of the module
 	  being loaded into memory.
 
-config BB_CONFIG_FEATURE_INSMOD_LOAD_MAP
+config BB_FEATURE_INSMOD_LOAD_MAP
 	bool "Enable load map (-m) option"
 	default n
-	depends on BB_CONFIG_INSMOD && BB_CONFIG_FEATURE_2_4_MODULES
+	depends on BB_INSMOD && ( BB_FEATURE_2_4_MODULES || BB_FEATURE_2_6_MODULES )
 	help
 	  Enabling this, one would be able to get a load map
 	  output on stdout. This makes kernel module debugging
@@ -52,49 +52,50 @@ config BB_CONFIG_FEATURE_INSMOD_LOAD_MAP
 	  If you don't plan to debug kernel modules, you
 	  don't need this option.
 
-config BB_CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL
+config BB_FEATURE_INSMOD_LOAD_MAP_FULL
 	bool "Symbols in load map"
 	default y
-	depends on BB_CONFIG_FEATURE_INSMOD_LOAD_MAP
+	depends on BB_FEATURE_INSMOD_LOAD_MAP
 	help
 	  Without this option, -m will only output section
 	  load map.  With this option, -m will also output
 	  symbols load map.
 
-config BB_CONFIG_RMMOD
+config BB_RMMOD
 	bool "rmmod"
 	default n
 	help
 	  rmmod is used to unload specified modules from the kernel.
 
-config BB_CONFIG_LSMOD
+config BB_LSMOD
 	bool "lsmod"
 	default n
 	help
 	  lsmod is used to display a list of loaded modules.
 
-config BB_CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT
+config BB_FEATURE_LSMOD_PRETTY_2_6_OUTPUT
 	bool "lsmod pretty output for 2.6.x Linux kernels "
 	default n
-	depends on BB_CONFIG_LSMOD
+	depends on BB_LSMOD
 	help
 	  This option makes output format of lsmod adjusted to
 	  the format of module-init-tools for Linux kernel 2.6.
 
-config BB_CONFIG_MODPROBE
+config BB_MODPROBE
 	bool "modprobe"
 	default n
 	help
-	  Handle the loading of modules, and their dependancies on a high
+	  Handle the loading of modules, and their dependencies on a high
 	  level.
 
 	  Note that in the state, modprobe does not understand multiple
 	  module options from the configuration file. See option below.
 
-config BB_CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS
-	bool "Multiple options parsing"
+config BB_FEATURE_MODPROBE_MULTIPLE_OPTIONS
+	bool
+	prompt "Multiple options parsing" if NITPICK
 	default y
-	depends on BB_CONFIG_MODPROBE
+	depends on BB_MODPROBE
 	help
 	  Allow modprobe to understand more than one option to pass to
 	  modules.
@@ -107,41 +108,51 @@ config BB_CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS
 	  Saying Y here is not a bad idea if you're not that short
 	  on storage capacity.
 
+config BB_FEATURE_MODPROBE_FANCY_ALIAS
+	bool
+	prompt "Fancy alias parsing" if NITPICK
+	default y
+	depends on BB_MODPROBE && BB_FEATURE_2_6_MODULES
+	help
+	  Say 'y' here to enable parsing of aliases with underscore/dash
+	  mismatch between module name and file name, along with bus-specific
+	  aliases (such as pci:... or usb:... aliases).
+
 comment "Options common to multiple modutils"
-	depends on BB_CONFIG_INSMOD || BB_CONFIG_RMMOD || BB_CONFIG_MODPROBE || BB_CONFIG_LSMOD
+	depends on BB_INSMOD || BB_RMMOD || BB_MODPROBE || BB_LSMOD
 
-config BB_CONFIG_FEATURE_CHECK_TAINTED_MODULE
+config BB_FEATURE_CHECK_TAINTED_MODULE
 	# Simulate indentation
-	bool "  Support tainted module checking with new kernels"
+	bool "Support tainted module checking with new kernels"
 	default y
-	depends on BB_CONFIG_INSMOD || BB_CONFIG_LSMOD
+	depends on BB_INSMOD || BB_LSMOD
 	help
 	  Support checking for tainted modules.  These are usually binary
 	  only modules that will make the linux-kernel list ignore your
 	  support request.
 	  This option is required to support GPLONLY modules.
 
-config BB_CONFIG_FEATURE_2_4_MODULES
+config BB_FEATURE_2_4_MODULES
 	# Simulate indentation
-	bool "  Support version 2.2.x to 2.4.x Linux kernels"
+	bool "Support version 2.2.x to 2.4.x Linux kernels"
 	default y
-	depends on BB_CONFIG_INSMOD || BB_CONFIG_RMMOD
+	depends on BB_INSMOD || BB_RMMOD || BB_MODPROBE
 	help
 	  Support module loading for 2.2.x and 2.4.x Linux kernels.
 
-config BB_CONFIG_FEATURE_2_6_MODULES
+config BB_FEATURE_2_6_MODULES
 	# Simulate indentation
-	bool "  Support version 2.6.x Linux kernels"
+	bool "Support version 2.6.x Linux kernels"
 	default y
-	depends on BB_CONFIG_INSMOD || BB_CONFIG_RMMOD || BB_CONFIG_MODPROBE
+	depends on BB_INSMOD || BB_RMMOD || BB_MODPROBE
 	help
 	  Support module loading for newer 2.6.x Linux kernels.
 
 
-config BB_CONFIG_FEATURE_QUERY_MODULE_INTERFACE
+config BB_FEATURE_QUERY_MODULE_INTERFACE
 	bool
 	default y
-	depends on BB_CONFIG_FEATURE_2_4_MODULES && !BB_CONFIG_FEATURE_2_6_MODULES
+	depends on BB_FEATURE_2_4_MODULES && !BB_FEATURE_2_6_MODULES
 
 
 endmenu
diff --git a/config/busybox-1.1.3/networking/Config.in b/config/busybox-1.4.1/networking/Config.in
index 112d5e8cc..07bed9ea3 100644
--- a/config/busybox-1.1.3/networking/Config.in
+++ b/config/busybox-1.4.1/networking/Config.in
@@ -6,208 +6,212 @@
 menu "Networking Utilities"
   depends on BUSYBOX
 
-config BB_CONFIG_FEATURE_IPV6
+config BB_FEATURE_IPV6
 	bool "Enable IPv6 support"
 	default n
 	help
-	  Enable IPv6 support to busybox. This makes applets that talk IP
-	  able to work with IPv6.
+	  Enable IPv6 support in busybox.
+	  This adds IPv6 support in the networking applets.
 
-config BB_CONFIG_ARPING
+config BB_ARP
+	bool "arp"
+	default n
+	help
+	  Manipulate the system ARP cache
+
+config BB_ARPING
 	bool "arping"
 	default n
 	help
 	  Ping hosts by ARP packets
 
-config BB_CONFIG_DNSD
+config BB_DNSD
 	bool "dnsd"
 	default n
 	help
-	  Small and static DNS server deamon. 
+	  Small and static DNS server daemon.
 
-config BB_CONFIG_ETHER_WAKE
+config BB_ETHER_WAKE
 	bool "ether-wake"
 	default n
 	help
 	  Send a magic packet to wake up sleeping machines.
 
-config BB_CONFIG_FAKEIDENTD
+config BB_FAKEIDENTD
 	bool "fakeidentd"
 	default n
+	select BB_FEATURE_SYSLOG
 	help
-	  fakeidentd listens to the ident port and returns a set fake
-	  value whatever it gets.
+	  fakeidentd listens on the ident port and returns a predefined
+	  fake value on any query.
 
-config BB_CONFIG_FTPGET
+config BB_FTPGET
 	bool "ftpget"
 	default n
 	help
 	  Retrieve a remote file via FTP.
 
-config BB_CONFIG_FTPPUT
+config BB_FTPPUT
 	bool "ftpput"
 	default n
 	help
 	  Store a remote file via FTP.
 
-config BB_CONFIG_HOSTNAME
+config BB_FEATURE_FTPGETPUT_LONG_OPTIONS
+	bool "Enable long options in ftpget/ftpput"
+	default n
+	depends on BB_GETOPT_LONG && (BB_FTPGET || BB_FTPPUT)
+	help
+	  Support long options for the ftpget/ftpput applet.
+
+config BB_HOSTNAME
 	bool "hostname"
 	default n
 	help
 	  Show or set the system's host name
 
-config BB_CONFIG_HTTPD
+config BB_HTTPD
 	bool "httpd"
 	default n
 	help
 	  Serve web pages via an HTTP server.
 
-config BB_CONFIG_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY
-	bool "  Support using httpd only from inetd"
-	default n
-	depends on BB_CONFIG_HTTPD
-	help
-	  This option disables uid and port options for the httpd applet
-	  but requires inetd server daemon.
-
-config BB_CONFIG_FEATURE_HTTPD_BASIC_AUTH
-	bool "  Enable Basic http Authentication"
-	default y
-	depends on BB_CONFIG_HTTPD
-	help
-	  Utilizes password settings from /etc/httpd.conf for basic
-	  authentication on a per url basis.
-
-config BB_CONFIG_FEATURE_HTTPD_AUTH_MD5
-	bool "  Support MD5 crypted passwords for http Authentication"
-	default n
-	depends on BB_CONFIG_FEATURE_HTTPD_BASIC_AUTH
-	help
-	  Enables basic per url authentication from /etc/httpd.conf
-	  using md5 passwords.
-
-if !BB_CONFIG_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY
-config BB_CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP
-	bool "  Support reloading the global config file using hup signal"
+config BB_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP
+	bool "Support reloading the global config file using hup signal"
 	default n
-	depends on BB_CONFIG_HTTPD
+	depends on BB_HTTPD
 	help
 	  This option enables processing of SIGHUP to reload cached
 	  configuration settings.
 
-config BB_CONFIG_FEATURE_HTTPD_SETUID
-	bool "  Enable support -u <user> option"
+config BB_FEATURE_HTTPD_SETUID
+	bool "Enable -u <user> option"
 	default n
-	depends on BB_CONFIG_HTTPD
+	depends on BB_HTTPD
 	help
 	  This option allows the server to run as a specific user
 	  rather than defaulting to the user that starts the server.
 	  Use of this option requires special privileges to change to a
 	  different user.
-endif
 
-config BB_CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES
-	bool "  Support loading additional MIME types at run-time"
+config BB_FEATURE_HTTPD_BASIC_AUTH
+	bool "Enable Basic http Authentication"
+	default y
+	depends on BB_HTTPD
+	help
+	  Utilizes password settings from /etc/httpd.conf for basic
+	  authentication on a per url basis.
+
+config BB_FEATURE_HTTPD_AUTH_MD5
+	bool "Support MD5 crypted passwords for http Authentication"
+	default n
+	depends on BB_FEATURE_HTTPD_BASIC_AUTH
+	help
+	  Enables basic per URL authentication from /etc/httpd.conf
+	  using md5 passwords.
+
+config BB_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES
+	bool "Support loading additional MIME types at run-time"
 	default n
-	depends on BB_CONFIG_HTTPD
+	depends on BB_HTTPD
 	help
 	  This option enables support for additional MIME types at
 	  run-time to be specified in the configuration file.
 
-config BB_CONFIG_FEATURE_HTTPD_CGI
-	bool "  Support Common Gateway Interface (CGI)"
+config BB_FEATURE_HTTPD_CGI
+	bool "Support Common Gateway Interface (CGI)"
 	default y
-	depends on BB_CONFIG_HTTPD
+	depends on BB_HTTPD
 	help
 	  This option allows scripts and executables to be invoked
-	  when specific urls are requested.
+	  when specific URLs are requested.
 
-config BB_CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR
-	bool "  Enable support for running scripts through an interpreter"
+config BB_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR
+	bool "Enable support for running scripts through an interpreter"
 	default n
-	depends on BB_CONFIG_FEATURE_HTTPD_CGI
+	depends on BB_FEATURE_HTTPD_CGI
 	help
-	  This option enables support for running scripts through an 
-	  interpreter. Turn this on, if you want PHP scripts to work 
-	  properly. You need to supply an addition line in your httpd 
+	  This option enables support for running scripts through an
+	  interpreter. Turn this on if you want PHP scripts to work
+	  properly. You need to supply an addition line in your httpd
 	  config file:
 	  *.php:/path/to/your/php
 
-config BB_CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV
-	bool "  Support the REMOTE_PORT environment variable for CGI"
+config BB_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV
+	bool "Support the REMOTE_PORT environment variable for CGI"
 	default n
-	depends on BB_CONFIG_FEATURE_HTTPD_CGI
+	depends on BB_FEATURE_HTTPD_CGI
 	help
 	  Use of this option can assist scripts in generating
 	  references that contain a unique port number.
 
-config BB_CONFIG_FEATURE_HTTPD_ENCODE_URL_STR
-	bool "  Enable the -e option for shell script CGI simplification."
+config BB_FEATURE_HTTPD_ENCODE_URL_STR
+	bool "Enable the -e option for shell script CGI simplification."
 	default y
-	depends on BB_CONFIG_HTTPD
+	depends on BB_HTTPD
 	help
-	  After set, this option allows html encoding arbitrary
+	  This option allows html encoding arbitrary
 	  strings for display of the browser.  Output goes to stdout.
 	  For example, httpd -e "<Hello World>" as
 	  "&#60Hello&#32World&#62".
 
-config BB_CONFIG_IFCONFIG
+config BB_IFCONFIG
 	bool "ifconfig"
 	default n
 	help
 	  Ifconfig is used to configure the kernel-resident network interfaces.
 
-config BB_CONFIG_FEATURE_IFCONFIG_STATUS
-	bool "  Enable status reporting output (+7k)"
+config BB_FEATURE_IFCONFIG_STATUS
+	bool "Enable status reporting output (+7k)"
 	default y
-	depends on BB_CONFIG_IFCONFIG
+	depends on BB_IFCONFIG
 	help
 	  If ifconfig is called with no arguments it will display the status
 	  of the currently active interfaces.
 
-config BB_CONFIG_FEATURE_IFCONFIG_SLIP
-	bool "  Enable slip-specific options \"keepalive\" and \"outfill\""
+config BB_FEATURE_IFCONFIG_SLIP
+	bool "Enable slip-specific options \"keepalive\" and \"outfill\""
 	default n
-	depends on BB_CONFIG_IFCONFIG
+	depends on BB_IFCONFIG
 	help
 	  Allow "keepalive" and "outfill" support for SLIP.  If you're not
 	  planning on using serial lines, leave this unchecked.
 
-config BB_CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ
-	bool "  Enable options \"mem_start\", \"io_addr\", and \"irq\""
+config BB_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ
+	bool "Enable options \"mem_start\", \"io_addr\", and \"irq\""
 	default n
-	depends on BB_CONFIG_IFCONFIG
+	depends on BB_IFCONFIG
 	help
 	  Allow the start address for shared memory, start address for I/O,
 	  and/or the interrupt line used by the specified device.
 
-config BB_CONFIG_FEATURE_IFCONFIG_HW
-	bool "  Enable option \"hw\" (ether only)"
+config BB_FEATURE_IFCONFIG_HW
+	bool "Enable option \"hw\" (ether only)"
 	default y
-	depends on BB_CONFIG_IFCONFIG
+	depends on BB_IFCONFIG
 	help
 	  Set the hardware address of this interface, if the device driver
 	  supports  this  operation.  Currently, we only support the 'ether'
 	  class.
 
-config BB_CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS
-	bool "  Set the broadcast automatically"
+config BB_FEATURE_IFCONFIG_BROADCAST_PLUS
+	bool "Set the broadcast automatically"
 	default n
-	depends on BB_CONFIG_IFCONFIG
+	depends on BB_IFCONFIG
 	help
 	  Setting this will make ifconfig attempt to find the broadcast
 	  automatically if the value '+' is used.
 
-config BB_CONFIG_IFUPDOWN
+config BB_IFUPDOWN
 	bool "ifupdown"
 	default n
-	select BB_CONFIG_RUN_PARTS
+	select BB_RUN_PARTS
 	help
 	  Activate or deactivate the specified interfaces.  This applet makes
 	  use of either "ifconfig" and "route" or the "ip" command to actually
 	  configure network interfaces.  Therefore, you will probably also want
-	  to enable either CONFIG_IFCONFIG and CONFIG_ROUTE, or enable
-	  CONFIG_FEATURE_IFUPDOWN_IP and the various CONFIG_IP options.  Of
+	  to enable either IFCONFIG and ROUTE, or enable
+	  FEATURE_IFUPDOWN_IP and the various IP options.  Of
 	  course you could use non-busybox versions of these programs, so
 	  against my better judgement (since this will surely result in plenty
 	  of support questions on the mailing list), I do not force you to
@@ -215,122 +219,123 @@ config BB_CONFIG_IFUPDOWN
 	  "ifconfig" and "route" or the "ip" command, either via busybox or via
 	  standalone utilities.
 
-config BB_CONFIG_FEATURE_IFUPDOWN_IP
-	bool "  Use ip applet"
+config BB_FEATURE_IFUPDOWN_IP
+	bool "Use ip applet"
 	default n
-	depends on BB_CONFIG_IFUPDOWN
+	depends on BB_IFUPDOWN
 	help
 	  Use the iproute "ip" command to implement "ifup" and "ifdown", rather
 	  than the default of using the older 'ifconfig' and 'route' utilities.
 
-config BB_CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN
-	bool "  Use busybox ip applet"
+config BB_FEATURE_IFUPDOWN_IP_BUILTIN
+	bool "Use busybox ip applet"
 	default y
-	depends on BB_CONFIG_FEATURE_IFUPDOWN_IP
-	select BB_CONFIG_IP
-	select BB_CONFIG_FEATURE_IP_ADDRESS
-	select BB_CONFIG_FEATURE_IP_LINK
-	select BB_CONFIG_FEATURE_IP_ROUTE
+	depends on BB_FEATURE_IFUPDOWN_IP
+	select BB_IP
+	select BB_FEATURE_IP_ADDRESS
+	select BB_FEATURE_IP_LINK
+	select BB_FEATURE_IP_ROUTE
 	help
 	  Use the busybox iproute "ip" applet to implement "ifupdown".
 
-	  If leave this disabled, you must install the full-blown iproute2
+	  If left disabled, you must install the full-blown iproute2
 	  utility or the  "ifup" and "ifdown" applets will not work.
 
-config BB_CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN
-	bool "  Use busybox ifconfig and route applets"
+config BB_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN
+	bool "Use busybox ifconfig and route applets"
 	default y
-	depends on BB_CONFIG_IFUPDOWN && !BB_CONFIG_FEATURE_IFUPDOWN_IP
-	select BB_CONFIG_IFCONFIG
-	select BB_CONFIG_ROUTE
+	depends on BB_IFUPDOWN && !BB_FEATURE_IFUPDOWN_IP
+	select BB_IFCONFIG
+	select BB_ROUTE
 	help
 	  Use the busybox iproute "ifconfig" and "route" applets to
 	  implement the "ifup" and "ifdown" utilities.
 
-	  If leave this disabled, you must install the full-blown ifconfig
+	  If left disabled, you must install the full-blown ifconfig
 	  and route utilities, or the  "ifup" and "ifdown" applets will not
 	  work.
 
-config BB_CONFIG_FEATURE_IFUPDOWN_IPV4
-	bool "  Enable support for IPv4"
+config BB_FEATURE_IFUPDOWN_IPV4
+	bool "Enable support for IPv4"
 	default y
-	depends on BB_CONFIG_IFUPDOWN
+	depends on BB_IFUPDOWN
 	help
 	  If you want busybox to talk IPv4, leave this on.
 
-config BB_CONFIG_FEATURE_IFUPDOWN_IPV6
-	bool "  Enable support for IPv6"
+config BB_FEATURE_IFUPDOWN_IPV6
+	bool "Enable support for IPv6"
 	default n
-	depends on BB_CONFIG_IFUPDOWN
+	depends on BB_IFUPDOWN && BB_FEATURE_IPV6
 	help
 	  If you need support for IPv6, turn this option on.
 
-config BB_CONFIG_FEATURE_IFUPDOWN_IPX
-	bool "  Enable support for IPX"
+config BB_FEATURE_IFUPDOWN_IPX
+	bool "Enable support for IPX"
 	default n
-	depends on BB_CONFIG_IFUPDOWN
+	depends on BB_IFUPDOWN
 	help
 	  If this option is selected you can use busybox to work with IPX
 	  networks.
 
-config BB_CONFIG_FEATURE_IFUPDOWN_MAPPING
-	bool "  Enable mapping support"
+config BB_FEATURE_IFUPDOWN_MAPPING
+	bool "Enable mapping support"
 	default n
-	depends on BB_CONFIG_IFUPDOWN
+	depends on BB_IFUPDOWN
 	help
 	  This enables support for the "mapping" stanza, unless you have
 	  a weird network setup you don't need it.
 
-config BB_CONFIG_INETD
+config BB_INETD
 	bool "inetd"
 	default n
+	select BB_FEATURE_SYSLOG
 	help
 	  Internet superserver daemon
 
-config BB_CONFIG_FEATURE_INETD_SUPPORT_BILTIN_ECHO
-	bool "  Support echo service"
+config BB_FEATURE_INETD_SUPPORT_BUILTIN_ECHO
+	bool "Support echo service"
 	default y
-	depends on BB_CONFIG_INETD
+	depends on BB_INETD
 	help
 	  Echo received data internal inetd service
 
-config BB_CONFIG_FEATURE_INETD_SUPPORT_BILTIN_DISCARD
-	bool "  Support discard service"
+config BB_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD
+	bool "Support discard service"
 	default y
-	depends on BB_CONFIG_INETD
+	depends on BB_INETD
 	help
 	  Internet /dev/null internal inetd service
 
-config BB_CONFIG_FEATURE_INETD_SUPPORT_BILTIN_TIME
-	bool "  Support time service"
+config BB_FEATURE_INETD_SUPPORT_BUILTIN_TIME
+	bool "Support time service"
 	default y
-	depends on BB_CONFIG_INETD
+	depends on BB_INETD
 	help
 	  Return 32 bit time since 1900 internal inetd service
 
-config BB_CONFIG_FEATURE_INETD_SUPPORT_BILTIN_DAYTIME
-	bool "  Support daytime service"
+config BB_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME
+	bool "Support daytime service"
 	default y
-	depends on BB_CONFIG_INETD
+	depends on BB_INETD
 	help
 	  Return human-readable time internal inetd service
 
-config BB_CONFIG_FEATURE_INETD_SUPPORT_BILTIN_CHARGEN
-	bool "  Support chargen service"
+config BB_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN
+	bool "Support chargen service"
 	default y
-	depends on BB_CONFIG_INETD
+	depends on BB_INETD
 	help
 	  Familiar character generator internal inetd service
 
-config BB_CONFIG_FEATURE_INETD_RPC
-	bool "  Support RPC services"
+config BB_FEATURE_INETD_RPC
+	bool "Support RPC services"
 	default n
-	depends on BB_CONFIG_INETD
+	depends on BB_INETD
+	depends on BB_FEATURE_HAVE_RPC
 	help
-	  Suuport Sun-RPC based services
-
+	  Support Sun-RPC based services
 
-config BB_CONFIG_IP
+config BB_IP
 	bool "ip"
 	default n
 	help
@@ -338,103 +343,105 @@ config BB_CONFIG_IP
 	  utility.  You generally don't need "ip" to use busybox with
 	  TCP/IP.
 
-if BB_CONFIG_IP && BB_CONFIG_IPADDR
-	config BB_CONFIG_FEATURE_IP_ADDRESS
-		default y
-	comment "  address (forced enabled for ipaddr)"
-endif
-if ! (BB_CONFIG_IP && BB_CONFIG_IPADDR)
-	config BB_CONFIG_FEATURE_IP_ADDRESS
-		bool "  address"
-		default y
-		depends on BB_CONFIG_IP
-		help
-		  Address manipulation support for the "ip" applet.
-endif
-
-if BB_CONFIG_IP && BB_CONFIG_IPLINK
-	config BB_CONFIG_FEATURE_IP_LINK
-		default y
-	comment "  link (forced enabled for iplink)"
-endif
-if !(BB_CONFIG_IP && BB_CONFIG_IPLINK)
-	config BB_CONFIG_FEATURE_IP_LINK
-		bool "  link"
-		default y
-		depends on BB_CONFIG_IP
-		help
-		  Configure network devices with "ip".
-endif
-
-if BB_CONFIG_IP && BB_CONFIG_IPROUTE
-	config BB_CONFIG_FEATURE_IP_ROUTE
-		default y
-	comment "  route (forced enabled for iproute)"
-endif
-if !(BB_CONFIG_IP && BB_CONFIG_IPROUTE)
-	config BB_CONFIG_FEATURE_IP_ROUTE
-		bool "  route"
-		default y
-		depends on BB_CONFIG_IP
-		help
-		  Add support for routing table management to "ip".
-endif
-
-if BB_CONFIG_IP && BB_CONFIG_IPTUNNEL
-	config BB_CONFIG_FEATURE_IP_TUNNEL
-		default y
-	comment "  tunnel (forced enabled for iptunnel)"
-endif
-if !(BB_CONFIG_IP && BB_CONFIG_IPTUNNEL)
-	config BB_CONFIG_FEATURE_IP_TUNNEL
-		bool "  tunnel"
-		default n
-		depends on BB_CONFIG_IP
-		help
-		  Add support for tunneling commands to "ip".
-endif
-
-config BB_CONFIG_IPCALC
-	bool "ipcalc"
-	default n
+config BB_FEATURE_IP_ADDRESS
+	bool "ip address"
+	default y
+	depends on BB_IP
 	help
-	  ipcalc takes an IP address and netmask and calculates the
-	  resulting broadcast, network, and host range.
+	  Address manipulation support for the "ip" applet.
 
-config BB_CONFIG_FEATURE_IPCALC_FANCY
-	bool "  Fancy IPCALC, more options, adds 1 kbyte"
+config BB_FEATURE_IP_LINK
+	bool "ip link"
 	default y
-	depends on BB_CONFIG_IPCALC
+	depends on BB_IP
 	help
-	  Adds the options hostname, prefix and silent to the output of "ipcalc".
+	  Configure network devices with "ip".
+
+config BB_FEATURE_IP_ROUTE
+	bool "ip route"
+	default y
+	depends on BB_IP
+	help
+	  Add support for routing table management to "ip".
+
+config BB_FEATURE_IP_TUNNEL
+	bool "ip tunnel"
+	default n
+	depends on BB_IP
+	help
+	  Add support for tunneling commands to "ip".
 
-config BB_CONFIG_IPADDR
-	bool "ipaddr"
+config BB_FEATURE_IP_RULE
+	bool "ip rule"
 	default n
+	depends on BB_IP
 	help
-	  Equivalent to selecting address support to "ip", above.
+	  Add support for rule commands to "ip".
 
-config BB_CONFIG_IPLINK
-	bool "iplink"
+config BB_FEATURE_IP_SHORT_FORMS
+	bool "Support short forms of ip commands."
 	default n
+	depends on BB_IP
 	help
-	  Equivalent to selecting link support to "ip", above.
+	  Also support short-form of ip <OBJECT> commands:
+	  ip addr   -> ipaddr
+	  ip link   -> iplink
+	  ip route  -> iproute
+	  ip tunnel -> iptunnel
+
+	  Say N unless you desparately need the short form of the ip
+	  object commands.
+
+config BB_IPADDR
+	bool
+	default y
+	depends on BB_FEATURE_IP_SHORT_FORMS && BB_FEATURE_IP_ADDRESS
+
+config BB_IPLINK
+	bool
+	default y
+	depends on BB_FEATURE_IP_SHORT_FORMS && BB_FEATURE_IP_LINK
+
+config BB_IPROUTE
+	bool
+	default y
+	depends on BB_FEATURE_IP_SHORT_FORMS && BB_FEATURE_IP_ROUTE
+
+config BB_IPTUNNEL
+	bool
+	default y
+	depends on BB_FEATURE_IP_SHORT_FORMS && BB_FEATURE_IP_TUNNEL
+
+config BB_IPRULE
+	bool
+	default y
+	depends on BB_FEATURE_IP_SHORT_FORMS && BB_FEATURE_IP_RULE
 
-config BB_CONFIG_IPROUTE
-	bool "iproute"
+config BB_IPCALC
+	bool "ipcalc"
 	default n
 	help
-	  Equivalent to selecting route support to "ip", above.
+	  ipcalc takes an IP address and netmask and calculates the
+	  resulting broadcast, network, and host range.
+
+config BB_FEATURE_IPCALC_FANCY
+	bool "Fancy IPCALC, more options, adds 1 kbyte"
+	default y
+	depends on BB_IPCALC
+	help
+	  Adds the options hostname, prefix and silent to the output of "ipcalc".
 
-config BB_CONFIG_IPTUNNEL
-	bool "iptunnel"
+config BB_FEATURE_IPCALC_LONG_OPTIONS
+	bool "Enable long options"
 	default n
+	depends on BB_IPCALC && BB_GETOPT_LONG
 	help
-	  Equivalent to selecting tunnel support to "ip", above.
+	  Support long options for the ipcalc applet.
 
-config BB_CONFIG_NAMEIF
+config BB_NAMEIF
 	bool "nameif"
 	default n
+	select BB_FEATURE_SYSLOG
 	help
 	  nameif is used to rename network interface by its MAC address.
 	  Renamed interfaces MUST be in the down state.
@@ -446,98 +453,107 @@ config BB_CONFIG_NAMEIF
 	  # Comment
 	  new_interface_name    XX:XX:XX:XX:XX:XX
 
-config BB_CONFIG_NC
+config BB_NC
 	bool "nc"
 	default n
 	help
 	  A simple Unix utility which reads and writes data across network
 	  connections.
 
-config BB_CONFIG_NC_GAPING_SECURITY_HOLE
-	bool "gaping security hole"
+config BB_NC_SERVER
+	bool "Netcat server options (-lp)"
+	default n
+	depends on BB_NC
+	help
+	  Allow netcat to act as a server.
+
+config BB_NC_EXTRA
+	bool "Netcat extensions (-eiw and filename)"
 	default n
-	depends on BB_CONFIG_NC
+	depends on BB_NC
 	help
-	  Add support for executing a program after making or receiving a
-	  successful connection (-e option).
+	  Add -e (support for executing the rest of the command line after
+	  making or receiving a successful connection), -i (delay interval for
+	  lines sent), -w (timeout for initial connection).
 
-config BB_CONFIG_NETSTAT
+config BB_NETSTAT
 	bool "netstat"
 	default n
 	help
 	  netstat prints information about the Linux networking subsystem.
 
-config BB_CONFIG_NSLOOKUP
+config BB_NSLOOKUP
 	bool "nslookup"
 	default n
 	help
 	  nslookup is a tool to query Internet name servers.
 
-config BB_CONFIG_PING
+config BB_PING
 	bool "ping"
 	default n
 	help
 	  ping uses the ICMP protocol's mandatory ECHO_REQUEST datagram to
 	  elicit an ICMP ECHO_RESPONSE from a host or gateway.
 
-config BB_CONFIG_FEATURE_FANCY_PING
-	bool "  Enable fancy ping output"
+config BB_FEATURE_FANCY_PING
+	bool "Enable fancy ping output"
 	default y
-	depends on BB_CONFIG_PING
+	depends on BB_PING
 	help
 	  Make the output from the ping applet include statistics, and at the
 	  same time provide full support for ICMP packets.
 
-config BB_CONFIG_PING6
+config BB_PING6
 	bool "ping6"
 	default n
-	depends on BB_CONFIG_FEATURE_IPV6
+	depends on BB_FEATURE_IPV6
 	help
 	  This will give you a ping that can talk IPv6.
 
-config BB_CONFIG_FEATURE_FANCY_PING6
-	bool "  Enable fancy ping6 output"
+config BB_FEATURE_FANCY_PING6
+	bool "Enable fancy ping6 output"
 	default y
-	depends on BB_CONFIG_PING6
+	depends on BB_PING6
 	help
 	  Make the output from the ping6 applet include statistics, and at the
 	  same time provide full support for ICMP packets.
 
-config BB_CONFIG_ROUTE
+config BB_ROUTE
 	bool "route"
 	default n
 	help
 	  Route displays or manipulates the kernel's IP routing tables.
 
-config BB_CONFIG_TELNET
+config BB_TELNET
 	bool "telnet"
 	default n
 	help
 	  Telnet is an interface to the TELNET protocol, but is also commonly
 	  used to test other simple protocols.
 
-config BB_CONFIG_FEATURE_TELNET_TTYPE
-	bool "  Pass TERM type to remote host"
+config BB_FEATURE_TELNET_TTYPE
+	bool "Pass TERM type to remote host"
 	default y
-	depends on BB_CONFIG_TELNET
+	depends on BB_TELNET
 	help
 	  Setting this option will forward the TERM environment variable to the
 	  remote host you are connecting to.  This is useful to make sure that
 	  things like ANSI colors and other control sequences behave.
 
-config BB_CONFIG_FEATURE_TELNET_AUTOLOGIN
-	bool "  Pass USER type to remote host"
+config BB_FEATURE_TELNET_AUTOLOGIN
+	bool "Pass USER type to remote host"
 	default y
-	depends on BB_CONFIG_TELNET
+	depends on BB_TELNET
 	help
 	  Setting this option will forward the USER environment variable to the
 	  remote host you are connecting to. This is useful when you need to
 	  log into a machine without telling the username (autologin). This
 	  option enables `-a' and `-l USER' arguments.
 
-config BB_CONFIG_TELNETD
+config BB_TELNETD
 	bool "telnetd"
 	default n
+	select BB_FEATURE_SYSLOG
 	help
 	  A daemon for the TELNET protocol, allowing you to log onto the host
 	  running the daemon.  Please keep in mind that the TELNET protocol
@@ -549,8 +565,8 @@ config BB_CONFIG_TELNETD
 
 	  Note that for busybox telnetd to work you need several things:
 	  First of all, your kernel needs:
-		  CONFIG_UNIX98_PTYS=y
-		  CONFIG_DEVPTS_FS=y
+		  UNIX98_PTYS=y
+		  DEVPTS_FS=y
 
 	  Next, you need a /dev/pts directory on your root filesystem:
 
@@ -567,8 +583,8 @@ config BB_CONFIG_TELNETD
 
 		  mount -t devpts devpts /dev/pts
 
-	  You need to be sure that Busybox has CONFIG_LOGIN and
-	  CONFIG_FEATURE_SUID enabled.  And finally, you should make
+	  You need to be sure that Busybox has LOGIN and
+	  FEATURE_SUID enabled.  And finally, you should make
 	  certain that Busybox has been installed setuid root:
 
 		chown root.root /bin/busybox
@@ -577,15 +593,14 @@ config BB_CONFIG_TELNETD
 	  with all that done, telnetd _should_ work....
 
 
-config BB_CONFIG_FEATURE_TELNETD_INETD
-	bool "  Support call from inetd only"
+config BB_FEATURE_TELNETD_STANDALONE
+	bool "Support standalone telnetd (not inetd only)"
 	default n
-	depends on BB_CONFIG_TELNETD
+	depends on BB_TELNETD
 	help
-	  Selecting this will make telnetd only callable from inetd,
-	  removing the standalone support.
+	  Selecting this will make telnetd able to run standalone.
 
-config BB_CONFIG_TFTP
+config BB_TFTP
 	bool "tftp"
 	default n
 	help
@@ -593,107 +608,114 @@ config BB_CONFIG_TFTP
 	  is usually used for simple, small transfers such as a root image
 	  for a network-enabled bootloader.
 
-config BB_CONFIG_FEATURE_TFTP_GET
-	bool "  Enable \"get\" command"
+config BB_FEATURE_TFTP_GET
+	bool "Enable \"get\" command"
 	default y
-	depends on BB_CONFIG_TFTP
+	depends on BB_TFTP
 	help
 	  Add support for the GET command within the TFTP client.  This allows
 	  a client to retrieve a file from a TFTP server.
 
-config BB_CONFIG_FEATURE_TFTP_PUT
-	bool "  Enable \"put\" command"
+config BB_FEATURE_TFTP_PUT
+	bool "Enable \"put\" command"
 	default y
-	depends on BB_CONFIG_TFTP
+	depends on BB_TFTP
 	help
 	  Add support for the PUT command within the TFTP client.  This allows
 	  a client to transfer a file to a TFTP server.
 
-config BB_CONFIG_FEATURE_TFTP_BLOCKSIZE
-	bool "  Enable \"blocksize\" command"
+config BB_FEATURE_TFTP_BLOCKSIZE
+	bool "Enable \"blocksize\" command"
 	default n
-	depends on BB_CONFIG_TFTP
+	depends on BB_TFTP
 	help
 	  Allow the client to specify the desired block size for transfers.
 
-config BB_CONFIG_FEATURE_TFTP_DEBUG
-	bool "  Enable debug"
+config BB_DEBUG_TFTP
+	bool "Enable debug"
 	default n
-	depends on BB_CONFIG_TFTP
+	depends on BB_TFTP
 	help
 	  Enable debug settings for tftp.  This is useful if you're running
 	  into problems with tftp as the protocol doesn't help you much when
 	  you run into problems.
 
-config BB_CONFIG_TRACEROUTE
+config BB_TRACEROUTE
 	bool "traceroute"
 	default n
 	help
 	  Utility to trace the route of IP packets
 
-config BB_CONFIG_FEATURE_TRACEROUTE_VERBOSE
-	bool "  Enable verbose output"
+config BB_FEATURE_TRACEROUTE_VERBOSE
+	bool "Enable verbose output"
 	default n
-	depends on BB_CONFIG_TRACEROUTE
+	depends on BB_TRACEROUTE
 	help
 	  Add some verbosity to traceroute.  This includes amongst other things
 	  hostnames and ICMP response types.
 
-config BB_CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE
-	bool "  Enable loose source route"
+config BB_FEATURE_TRACEROUTE_SOURCE_ROUTE
+	bool "Enable loose source route"
 	default n
-	depends on BB_CONFIG_TRACEROUTE
+	depends on BB_TRACEROUTE
 	help
 	  Add option to specify a loose source route gateway
 	  (8 maximum).
 
-config BB_CONFIG_FEATURE_TRACEROUTE_USE_ICMP
-	bool "  Use ICMP instead of UDP"
+config BB_FEATURE_TRACEROUTE_USE_ICMP
+	bool "Use ICMP instead of UDP"
 	default n
-	depends on BB_CONFIG_TRACEROUTE
+	depends on BB_TRACEROUTE
 	help
 	  Add feature to allow for ICMP ECHO instead of UDP datagrams.
 
+source config/busybox-1.4.1/networking/udhcp/Config.in
 
-config BB_CONFIG_VCONFIG
+config BB_VCONFIG
 	bool "vconfig"
 	default n
 	help
 	  Creates, removes, and configures VLAN interfaces
 
-config BB_CONFIG_WGET
+config BB_WGET
 	bool "wget"
 	default n
 	help
 	  wget is a utility for non-interactive download of files from HTTP,
 	  HTTPS, and FTP servers.
 
-config BB_CONFIG_FEATURE_WGET_STATUSBAR
-	bool "  Enable a nifty process meter (+2k)"
+config BB_FEATURE_WGET_STATUSBAR
+	bool "Enable a nifty process meter (+2k)"
 	default y
-	depends on BB_CONFIG_WGET
+	depends on BB_WGET
 	help
 	  Enable the transfer progress bar for wget transfers.
 
-config BB_CONFIG_FEATURE_WGET_AUTHENTICATION
-	bool "  Enable HTTP authentication"
+config BB_FEATURE_WGET_AUTHENTICATION
+	bool "Enable HTTP authentication"
 	default y
-	depends on BB_CONFIG_WGET
+	depends on BB_WGET
 	help
 	  Support authenticated HTTP transfers.
 
-config BB_CONFIG_FEATURE_WGET_IP6_LITERAL
-	bool "  Enable IPv6 literal addresses"
+config BB_FEATURE_WGET_IP6_LITERAL
+	bool "Enable IPv6 literal addresses"
 	default y
-	depends on BB_CONFIG_WGET
+	depends on BB_WGET && BB_FEATURE_IPV6
 	help
 	  Support IPv6 address literal notation in URLs.
 
-source config/busybox-1.1.3/networking/udhcp/Config.in
+config BB_FEATURE_WGET_LONG_OPTIONS
+	bool "Enable long options"
+	default n
+	depends on BB_WGET && BB_GETOPT_LONG
+	help
+	  Support long options for the wget applet.
 
-config BB_CONFIG_ZCIP
+config BB_ZCIP
 	bool "zcip"
 	default n
+	select BB_FEATURE_SYSLOG
 	help
 	  ZCIP provides ZeroConf IPv4 address selection, according to RFC 3927.
 	  It's a daemon that allocates and defends a dynamically assigned
@@ -703,4 +725,3 @@ config BB_CONFIG_ZCIP
 	  in the busybox examples.
 
 endmenu
-
diff --git a/config/busybox-1.1.3/networking/udhcp/Config.in b/config/busybox-1.4.1/networking/udhcp/Config.in
index b56fc7ac2..8c1e9199b 100644
--- a/config/busybox-1.1.3/networking/udhcp/Config.in
+++ b/config/busybox-1.4.1/networking/udhcp/Config.in
@@ -3,10 +3,7 @@
 # see scripts/kbuild/config-language.txt.
 #
 
-menu "udhcp Server/Client"
-  depends on BUSYBOX
-
-config BB_CONFIG_UDHCPD
+config BB_APP_UDHCPD
 	bool "udhcp Server (udhcpd)"
 	default n
 	help
@@ -15,22 +12,19 @@ config BB_CONFIG_UDHCPD
 
 	  See http://udhcp.busybox.net for further details.
 
-config BB_CONFIG_UDHCPC
-	bool "udhcp Client (udhcpc)"
+config BB_APP_DHCPRELAY
+	bool "dhcprelay"
 	default n
+	depends on BB_APP_UDHCPD
 	help
-	  uDHCPc is a DHCP client geared primarily toward embedded systems,
-	  while striving to be fully functional and RFC compliant.
+	  dhcprelay listens for dhcp requests on one or more interfaces
+	  and forwards these requests to a different interface or dhcp
+	  server.
 
-	  The udhcp client negotiates a lease with the DHCP server and
-	  notifies a set of scripts when a lease is obtained or lost.
-
-	  See http://udhcp.busybox.net for further details.
-
-config BB_CONFIG_DUMPLEASES
+config BB_APP_DUMPLEASES
 	bool "Lease display utility (dumpleases)"
 	default n
-	depends on BB_CONFIG_UDHCPD
+	depends on BB_APP_UDHCPD
 	help
 	  dumpleases displays the leases written out by the udhcpd server.
 	  Lease times are stored in the file by time remaining in lease, or
@@ -38,26 +32,36 @@ config BB_CONFIG_DUMPLEASES
 
 	  See http://udhcp.busybox.net for further details.
 
-config BB_CONFIG_FEATURE_UDHCP_SYSLOG
-	bool "  Log udhcp messages to syslog (instead of stdout)"
+config BB_APP_UDHCPC
+	bool "udhcp Client (udhcpc)"
+	default n
+	help
+	  uDHCPc is a DHCP client geared primarily toward embedded systems,
+	  while striving to be fully functional and RFC compliant.
+
+	  The udhcp client negotiates a lease with the DHCP server and
+	  notifies a set of scripts when a lease is obtained or lost.
+
+	  See http://udhcp.busybox.net for further details.
+
+config BB_FEATURE_UDHCP_SYSLOG
+	bool "Log udhcp messages to syslog"
 	default n
-	depends on BB_CONFIG_UDHCPD || BB_CONFIG_UDHCPC
+	depends on BB_APP_UDHCPD || BB_APP_UDHCPC
+	select BB_FEATURE_SYSLOG
 	help
-	  If selected, udhcpd will log all its messages to syslog, otherwise,
-	  it will attempt to log them to stdout.
+	  If not daemonized, udhcpd prints its messages to stdout/stderr.
+	  If this option is selected, it will also log them to syslog.
 
 	  See http://udhcp.busybox.net for further details.
 
-config BB_CONFIG_FEATURE_UDHCP_DEBUG
-	bool "  Compile udhcp with noisy debugging messages"
+config BB_FEATURE_UDHCP_DEBUG
+	bool "Compile udhcp with noisy debugging messages"
 	default n
-	depends on BB_CONFIG_UDHCPD || BB_CONFIG_UDHCPC
+	depends on BB_APP_UDHCPD || BB_APP_UDHCPC
 	help
 	  If selected, udhcpd will output extra debugging output.  If using
 	  this option, compile uDHCP with "-g", and do not fork the daemon to
 	  the background.
 
 	  See http://udhcp.busybox.net for further details.
-
-endmenu
-
diff --git a/config/busybox-1.1.3/procps/Config.in b/config/busybox-1.4.1/procps/Config.in
index 05238366b..33299e4a8 100644
--- a/config/busybox-1.1.3/procps/Config.in
+++ b/config/busybox-1.4.1/procps/Config.in
@@ -6,7 +6,7 @@
 menu "Process Utilities"
   depends on BUSYBOX
 
-config BB_CONFIG_FREE
+config BB_FREE
 	bool "free"
 	default n
 	help
@@ -14,7 +14,7 @@ config BB_CONFIG_FREE
 	  memory in the system, as well as the buffers used by the kernel.
 	  The shared memory column should be ignored; it is obsolete.
 
-config BB_CONFIG_FUSER
+config BB_FUSER
 	bool "fuser"
 	default n
 	help
@@ -22,7 +22,7 @@ config BB_CONFIG_FUSER
 	  file open.  fuser can also list all PIDs that have a given network
 	  (TCP or UDP) port open.
 
-config BB_CONFIG_KILL
+config BB_KILL
 	bool "kill"
 	default n
 	help
@@ -30,81 +30,86 @@ config BB_CONFIG_KILL
 	  process or process group.  If no signal is specified, the TERM
 	  signal is sent.
 
-config BB_CONFIG_KILLALL
+config BB_KILLALL
 	bool "killall"
 	default n
-	depends on BB_CONFIG_KILL
+	depends on BB_KILL
 	help
 	  killall sends a signal to all processes running any of the
 	  specified commands.  If no signal name is specified, SIGTERM is
 	  sent.
 
-config BB_CONFIG_PIDOF
+config BB_KILLALL5
+	bool "killall5"
+	default n
+	depends on BB_KILL
+
+config BB_PIDOF
 	bool "pidof"
 	default n
 	help
 	  Pidof finds the process id's (pids) of the named programs. It prints
 	  those id's on the standard output.
 
-config BB_CONFIG_FEATURE_PIDOF_SINGLE
-	bool "  Enable argument for single shot (-s)"
+config BB_FEATURE_PIDOF_SINGLE
+	bool "Enable argument for single shot (-s)"
 	default n
-	depends on BB_CONFIG_PIDOF
+	depends on BB_PIDOF
 	help
 	  Support argument '-s' for returning only the first pid found.
 
-config BB_CONFIG_FEATURE_PIDOF_OMIT
-	bool "  Enable argument for omitting pids (-o)"
+config BB_FEATURE_PIDOF_OMIT
+	bool "Enable argument for omitting pids (-o)"
 	default n
-	depends on BB_CONFIG_PIDOF
+	depends on BB_PIDOF
 	help
 	  Support argument '-o' for omitting the given pids in output.
 	  The special pid %PPID can be used to name the parent process
 	  of the pidof, in other words the calling shell or shell script.
 
-config BB_CONFIG_PS
+config BB_PS
 	bool "ps"
 	default n
 	help
 	  ps gives a snapshot of the current processes.
 
-config BB_CONFIG_FEATURE_PS_WIDE
-	bool "  Enable argument for wide output (-w)"
+config BB_FEATURE_PS_WIDE
+	bool "Enable argument for wide output (-w)"
 	default n
-	depends on BB_CONFIG_PS
+	depends on BB_PS
 	help
 	  Support argument 'w' for wide output.
 	  If given once, 132 chars are printed and given more than
 	  one, the length is unlimited.
 
-config BB_CONFIG_RENICE
+config BB_RENICE
 	bool "renice"
 	default n
 	help
 	  Renice alters the scheduling priority of one or more running
 	  processes.
 
-config BB_CONFIG_BB_SYSCTL
+config BB_BB_SYSCTL
 	bool "sysctl"
 	default n
 	help
 	  Configure kernel parameters at runtime.
 
-config BB_CONFIG_TOP
+config BB_TOP
 	bool "top"
 	default n
 	help
 	  The top program provides a dynamic real-time view of a running
 	  system.
 
-config BB_CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE
-	bool "  Support showing CPU usage percentage (add 2k bytes)"
+config BB_FEATURE_TOP_CPU_USAGE_PERCENTAGE
+	bool "Support showing CPU usage percentage (add 2k bytes)"
 	default y
-	depends on BB_CONFIG_TOP
+	depends on BB_TOP
 	help
 	  Make top display CPU usage.
 
-config BB_CONFIG_UPTIME
+config BB_UPTIME
 	bool "uptime"
 	default n
 	help
diff --git a/config/busybox-1.4.1/runit/Config.in b/config/busybox-1.4.1/runit/Config.in
new file mode 100644
index 000000000..ccfc9e2b0
--- /dev/null
+++ b/config/busybox-1.4.1/runit/Config.in
@@ -0,0 +1,67 @@
+#
+# For a description of the syntax of this configuration file,
+# see scripts/kbuild/config-language.txt.
+#
+
+menu "Runit Utilities"
+  depends on BUSYBOX
+
+config BB_RUNSV
+	bool "runsv"
+	default n
+	help
+	  runsv starts and monitors a service and optionally an appendant log
+	  service.
+
+config BB_RUNSVDIR
+	bool "runsvdir"
+	default n
+	help
+	  runsvdir starts a runsv process for each subdirectory, or symlink to
+	  a directory, in the services directory dir, up to a limit of 1000
+	  subdirectories, and restarts a runsv process if it terminates.
+
+config BB_SV
+	bool "sv"
+	default n
+	help
+	  sv reports the current status and controls the state of services
+	  monitored by the runsv supervisor.
+
+config BB_SVLOGD
+	bool "svlogd"
+	default n
+	help
+	  svlogd continuously reads log data from its standard input, optionally
+	  filters log messages, and writes the data to one or more automatically
+	  rotated logs.
+
+config BB_CHPST
+	bool "chpst"
+	default n
+	help
+	  chpst changes the process state according to the given options, and
+	  execs specified program.
+
+config BB_SETUIDGID
+	bool "setuidgid"
+	help
+	  Sets soft resource limits as specified by options
+
+config BB_ENVUIDGID
+	bool "envuidgid"
+	help
+	  Sets $UID to account's uid and $GID to account's gid
+
+config BB_ENVDIR
+	bool "envdir"
+	help
+	  Sets various environment variables as specified by files
+	  in the given directory
+
+config BB_SOFTLIMIT
+	bool "softlimit"
+	help
+	  Sets soft resource limits as specified by options
+
+endmenu
diff --git a/config/busybox-1.1.3/shell/Config.in b/config/busybox-1.4.1/shell/Config.in
index 2ffca7d60..4dcb887d5 100644
--- a/config/busybox-1.1.3/shell/Config.in
+++ b/config/busybox-1.4.1/shell/Config.in
@@ -8,36 +8,36 @@ menu "Shells"
 
 choice
 	prompt "Choose your default shell"
-	default BB_CONFIG_FEATURE_SH_IS_NONE
+	default BB_FEATURE_SH_IS_NONE
 	help
 	  Choose a shell. The ash shell is the most bash compatible
 	  and full featured one.
 
-config BB_CONFIG_FEATURE_SH_IS_ASH
-	select BB_CONFIG_ASH
+config BB_FEATURE_SH_IS_ASH
+	select BB_ASH
 	bool "ash"
 
-config BB_CONFIG_FEATURE_SH_IS_HUSH
-	select BB_CONFIG_HUSH
+config BB_FEATURE_SH_IS_HUSH
+	select BB_HUSH
 	bool "hush"
 
-config BB_CONFIG_FEATURE_SH_IS_LASH
-	select BB_CONFIG_LASH
+config BB_FEATURE_SH_IS_LASH
+	select BB_LASH
 	bool "lash"
 
-config BB_CONFIG_FEATURE_SH_IS_MSH
-	select BB_CONFIG_MSH
+config BB_FEATURE_SH_IS_MSH
+	select BB_MSH
 	bool "msh"
 
-config BB_CONFIG_FEATURE_SH_IS_NONE
+config BB_FEATURE_SH_IS_NONE
 	bool "none"
 
 endchoice
 
-config BB_CONFIG_ASH
+config BB_ASH
 	bool "ash"
 	default n
-	select BB_CONFIG_TEST
+	select BB_TEST
 	help
 	  Tha 'ash' shell adds about 60k in the default configuration and is
 	  the most complete and most pedantically correct shell included with
@@ -46,104 +46,105 @@ config BB_CONFIG_ASH
 	  (written by Kenneth Almquist) from NetBSD.
 
 comment "Ash Shell Options"
-	depends on BB_CONFIG_ASH
+	depends on BB_ASH
 
-config BB_CONFIG_ASH_JOB_CONTROL
-	bool "  Enable Job control"
+config BB_ASH_JOB_CONTROL
+	bool "Job control"
 	default y
-	depends on BB_CONFIG_ASH
+	depends on BB_ASH
 	help
 	  Enable job control in the ash shell.
 
-config BB_CONFIG_ASH_READ_NCHARS
-	bool "  Enable 'read -n N' and 'read -s' support"
+config BB_ASH_READ_NCHARS
+	bool "'read -n N' and 'read -s' support"
 	default n
-	depends on BB_CONFIG_ASH
+	depends on BB_ASH
 	help
 	  'read -n N' will return a value after N characters have been read.
 	  'read -s' will read without echoing the user's input.
 
-config BB_CONFIG_ASH_READ_TIMEOUT
-	bool "  Enable 'read -t S' support."
+config BB_ASH_READ_TIMEOUT
+	bool "'read -t S' support."
 	default n
-	depends on BB_CONFIG_ASH
+	depends on BB_ASH
 	help
 	  'read -t S' will return a value after S seconds have passed.
 	  This implementation will allow fractional seconds, expressed
 	  as a decimal fraction, e.g. 'read -t 2.5 foo'.
 
-config BB_CONFIG_ASH_ALIAS
-	bool "  Enable alias support"
+config BB_ASH_ALIAS
+	bool "alias support"
 	default y
-	depends on BB_CONFIG_ASH
+	depends on BB_ASH
 	help
 	  Enable alias support in the ash shell.
 
-config BB_CONFIG_ASH_MATH_SUPPORT
-	bool "  Enable Posix math support"
+config BB_ASH_MATH_SUPPORT
+	bool "Posix math support"
 	default y
-	depends on BB_CONFIG_ASH
+	depends on BB_ASH
 	help
 	  Enable math support in the ash shell.
 
-config BB_CONFIG_ASH_MATH_SUPPORT_64
-	bool "    Extend Posix math support to 64 bit"
+config BB_ASH_MATH_SUPPORT_64
+	bool "Extend Posix math support to 64 bit"
 	default n
-	depends on BB_CONFIG_ASH_MATH_SUPPORT
+	depends on BB_ASH_MATH_SUPPORT
 	help
 	  Enable 64-bit math support in the ash shell.  This will make
 	  the shell slightly larger, but will allow computation with very
 	  large numbers.
 
-config BB_CONFIG_ASH_GETOPTS
-	bool "  Enable getopts builtin to parse positional parameters"
+config BB_ASH_GETOPTS
+	bool "Builtin getopt to parse positional parameters"
 	default n
-	depends on BB_CONFIG_ASH
+	depends on BB_ASH
 	help
 	  Enable getopts builtin in the ash shell.
 
-config BB_CONFIG_ASH_CMDCMD
-	bool "  Enable cmdcmd to override shell builtins"
-	default n
-	depends on BB_CONFIG_ASH
-	help
-	  Enable support for the ash 'command' builtin, which allows
-	  you to run the specified command with the specified arguments,
-	  even when there is an ash builtin command with the same name.
-
-config BB_CONFIG_ASH_BUILTIN_ECHO
-	bool "  Enable builtin version of 'echo'"
-	default n
-	depends on BB_CONFIG_ASH
+config BB_ASH_BUILTIN_ECHO
+	bool "Builtin version of 'echo'"
+	default y
+	select BB_ECHO
+	depends on BB_ASH
 	help
 	  Enable support for echo, built in to ash.
 
-# this entry also appears in coreutils/Config.in, next to the echo applet
-config BB_CONFIG_FEATURE_FANCY_ECHO
-	bool "  Enable echo options (-n and -e)"
+config BB_ASH_BUILTIN_TEST
+	bool "Builtin version of 'test'"
 	default y
-	depends on BB_CONFIG_ASH_BUILTIN_ECHO
+	select BB_TEST
+	depends on BB_ASH
 	help
-	  This adds options (-n and -e) to echo.
+	  Enable support for test, built in to ash.
 
-config BB_CONFIG_ASH_MAIL
-	bool "  Check for new mail on interactive shells"
+config BB_ASH_CMDCMD
+	bool "'command' command to override shell builtins"
+	default n
+	depends on BB_ASH
+	help
+	  Enable support for the ash 'command' builtin, which allows
+	  you to run the specified command with the specified arguments,
+	  even when there is an ash builtin command with the same name.
+
+config BB_ASH_MAIL
+	bool "Check for new mail on interactive shells"
 	default y
-	depends on BB_CONFIG_ASH
+	depends on BB_ASH
 	help
 	  Enable "check for new mail" in the ash shell.
 
-config BB_CONFIG_ASH_OPTIMIZE_FOR_SIZE
-	bool "  Optimize for size instead of speed"
+config BB_ASH_OPTIMIZE_FOR_SIZE
+	bool "Optimize for size instead of speed"
 	default y
-	depends on BB_CONFIG_ASH
+	depends on BB_ASH
 	help
 	  Compile ash for reduced size at the price of speed.
 
-config BB_CONFIG_ASH_RANDOM_SUPPORT
-	bool "  Enable pseudorandom generator and variable $RANDOM"
+config BB_ASH_RANDOM_SUPPORT
+	bool "Pseudorandom generator and variable $RANDOM"
 	default n
-	depends on BB_CONFIG_ASH
+	depends on BB_ASH
 	help
 	  Enable pseudorandom generator and dynamic variable "$RANDOM".
 	  Each read of "$RANDOM" will generate a new pseudorandom value.
@@ -151,21 +152,21 @@ config BB_CONFIG_ASH_RANDOM_SUPPORT
 	  After "unset RANDOM" then generator will switch off and this
 	  variable will no longer have special treatment.
 
-config BB_CONFIG_ASH_EXPAND_PRMT
-	bool "  Expand prompt string"
+config BB_ASH_EXPAND_PRMT
+	bool "Expand prompt string"
 	default n
-	depends on BB_CONFIG_ASH
+	depends on BB_ASH
 	help
 	  "PS#" may be contain volatile content, such as backquote commands.
 	  This option recreates the prompt string from the environment
 	  variable each time it is displayed.
 
-config BB_CONFIG_HUSH
+config BB_HUSH
 	bool "hush"
 	default n
-	select BB_CONFIG_TRUE
-	select BB_CONFIG_FALSE
-	select BB_CONFIG_TEST
+	select BB_TRUE
+	select BB_FALSE
+	select BB_TEST
 	help
 	  hush is a very small shell (just 18k) and it has fairly complete
 	  Bourne shell grammar.  It even handles all the normal flow control
@@ -177,12 +178,12 @@ config BB_CONFIG_HUSH
 	  expansion, &> and >& redirection of stdout+stderr, etc.
 
 
-config BB_CONFIG_LASH
+config BB_LASH
 	bool "lash"
 	default n
-	select BB_CONFIG_TRUE
-	select BB_CONFIG_FALSE
-	select BB_CONFIG_TEST
+	select BB_TRUE
+	select BB_FALSE
+	select BB_TEST
 	help
 	  lash is the very smallest shell (adds just 10k) and it is quite
 	  usable as a command prompt, but it is not suitable for any but the
@@ -192,12 +193,12 @@ config BB_CONFIG_LASH
 	  command editing makes it a very nice lightweight command prompt.
 
 
-config BB_CONFIG_MSH
+config BB_MSH
 	bool "msh"
 	default n
-	select BB_CONFIG_TRUE
-	select BB_CONFIG_FALSE
-	select BB_CONFIG_TEST
+	select BB_TRUE
+	select BB_FALSE
+	select BB_TEST
 	help
 	  The minix shell (adds just 30k) is quite complete and handles things
 	  like for/do/done, case/esac and all the things you expect a Bourne
@@ -207,19 +208,19 @@ config BB_CONFIG_MSH
 	  It also uses only vfork, so it can be used on uClinux systems.
 
 comment "Bourne Shell Options"
-	depends on BB_CONFIG_MSH || BB_CONFIG_LASH || BB_CONFIG_HUSH || BB_CONFIG_ASH
+	depends on BB_MSH || BB_LASH || BB_HUSH || BB_ASH
 
-config BB_CONFIG_FEATURE_SH_EXTRA_QUIET
+config BB_FEATURE_SH_EXTRA_QUIET
 	bool "Hide message on interactive shell startup"
 	default n
-	depends on BB_CONFIG_MSH || BB_CONFIG_LASH || BB_CONFIG_HUSH || BB_CONFIG_ASH
+	depends on BB_MSH || BB_LASH || BB_HUSH || BB_ASH
 	help
 	  Remove the busybox introduction when starting a shell.
 
-config BB_CONFIG_FEATURE_SH_STANDALONE_SHELL
+config BB_FEATURE_SH_STANDALONE_SHELL
 	bool "Standalone shell"
 	default n
-	depends on BB_CONFIG_MSH || BB_CONFIG_LASH || BB_CONFIG_HUSH || BB_CONFIG_ASH
+	depends on BB_MSH || BB_LASH || BB_HUSH || BB_ASH
 	help
 	  This option causes the selected busybox shell to use busybox applets
 	  in preference to executables in the PATH whenever possible.  For
@@ -230,58 +231,64 @@ config BB_CONFIG_FEATURE_SH_STANDALONE_SHELL
 	  is generally used when creating a statically linked version of busybox
 	  for use as a rescue shell, in the event that you screw up your system.
 
+	  Note that this will *also* cause applets to take precedence
+	  over shell builtins of the same name.  So turning this on will
+	  eliminate any performance gained by turning on the builtin "echo"
+	  and "test" commands in ash.
+
 	  Note that when using this option, the shell will attempt to directly
 	  run '/bin/busybox'.  If you do not have the busybox binary sitting in
 	  that exact location with that exact name, this option will not work at
 	  all.
 
-config BB_CONFIG_FEATURE_COMMAND_EDITING
-	bool "command line editing"
+config BB_FEATURE_COMMAND_EDITING
+	bool "Command line editing"
 	default n
-	depends on BB_CONFIG_MSH || BB_CONFIG_LASH || BB_CONFIG_HUSH || BB_CONFIG_ASH
+	depends on BB_MSH || BB_LASH || BB_HUSH || BB_ASH
 	help
 	  Enable command editing in shell.
 
-config BB_CONFIG_FEATURE_COMMAND_EDITING_VI
+config BB_FEATURE_COMMAND_EDITING_VI
 	bool "vi-style line editing commands"
 	default n
-	depends on BB_CONFIG_FEATURE_COMMAND_EDITING
+	depends on BB_FEATURE_COMMAND_EDITING
 	help
 	  Enable vi-style line editing in the shell.  This mode can be
 	  turned on and off with "set -o vi" and "set +o vi".
 
-config BB_CONFIG_FEATURE_COMMAND_HISTORY
-	int "history size"
+config BB_FEATURE_COMMAND_HISTORY
+	int "History size"
+	range 0 99999
 	default 15
-	depends on BB_CONFIG_FEATURE_COMMAND_EDITING
+	depends on BB_FEATURE_COMMAND_EDITING
 	help
 	  Specify command history size in shell.
 
-config BB_CONFIG_FEATURE_COMMAND_SAVEHISTORY
-	bool "history saving"
+config BB_FEATURE_COMMAND_SAVEHISTORY
+	bool "History saving"
 	default n
-	depends on BB_CONFIG_ASH && BB_CONFIG_FEATURE_COMMAND_EDITING
+	depends on BB_ASH && BB_FEATURE_COMMAND_EDITING
 	help
 	  Enable history saving in ash shell.
 
-config BB_CONFIG_FEATURE_COMMAND_TAB_COMPLETION
-	bool "tab completion"
+config BB_FEATURE_COMMAND_TAB_COMPLETION
+	bool "Tab completion"
 	default n
-	depends on BB_CONFIG_FEATURE_COMMAND_EDITING
+	depends on BB_FEATURE_COMMAND_EDITING
 	help
 	  Enable tab completion in shell.
 
-config BB_CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION
-	bool "username completion"
+config BB_FEATURE_COMMAND_USERNAME_COMPLETION
+	bool "Username completion"
 	default n
-	depends on BB_CONFIG_FEATURE_COMMAND_TAB_COMPLETION
+	depends on BB_FEATURE_COMMAND_TAB_COMPLETION
 	help
 	  Enable username completion in shell.
 
-config BB_CONFIG_FEATURE_SH_FANCY_PROMPT
+config BB_FEATURE_SH_FANCY_PROMPT
 	bool "Fancy shell prompts"
 	default n
-	depends on BB_CONFIG_FEATURE_COMMAND_EDITING
+	depends on BB_FEATURE_COMMAND_EDITING
 	help
 	  Setting this option allows for prompts to use things like \w and
 	  \$ and also using escape codes.
diff --git a/config/busybox-1.1.3/sysklogd/Config.in b/config/busybox-1.4.1/sysklogd/Config.in
index 38fc7f7c0..651b82fc0 100644
--- a/config/busybox-1.1.3/sysklogd/Config.in
+++ b/config/busybox-1.4.1/sysklogd/Config.in
@@ -6,7 +6,7 @@
 menu "System Logging Utilities"
   depends on BUSYBOX
 
-config BB_CONFIG_SYSLOGD
+config BB_SYSLOGD
 	bool "syslogd"
 	default n
 	help
@@ -21,18 +21,18 @@ config BB_CONFIG_SYSLOGD
 	  wrong.  And something almost always will go wrong if
 	  you wait long enough....
 
-config BB_CONFIG_FEATURE_ROTATE_LOGFILE
-	bool "  Rotate message files"
+config BB_FEATURE_ROTATE_LOGFILE
+	bool "Rotate message files"
 	default n
-	depends on BB_CONFIG_SYSLOGD
+	depends on BB_SYSLOGD
 	help
 	  This enables syslogd to rotate the message files
 	  on his own. No need to use an external rotatescript.
 
-config BB_CONFIG_FEATURE_REMOTE_LOG
-	bool "  Remote Log support"
+config BB_FEATURE_REMOTE_LOG
+	bool "Remote Log support"
 	default n
-	depends on BB_CONFIG_SYSLOGD
+	depends on BB_SYSLOGD
 	help
 	  When you enable this feature, the syslogd utility can
 	  be used to send system log messages to another system
@@ -43,10 +43,10 @@ config BB_CONFIG_FEATURE_REMOTE_LOG
 	  measure to prevent system logs from being tampered with
 	  by an intruder.
 
-config BB_CONFIG_FEATURE_IPC_SYSLOG
-	bool "  Circular Buffer support"
+config BB_FEATURE_IPC_SYSLOG
+	bool "Circular Buffer support"
 	default n
-	depends on BB_CONFIG_SYSLOGD
+	depends on BB_SYSLOGD
 	help
 	  When you enable this feature, the syslogd utility will
 	  use a circular buffer to record system log messages.
@@ -57,28 +57,28 @@ config BB_CONFIG_FEATURE_IPC_SYSLOG
 	  entire filesystem, which may cause your system to
 	  break badly.
 
-config BB_CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE
+config BB_FEATURE_IPC_SYSLOG_BUFFER_SIZE
 	int "    Circular buffer size in Kbytes (minimum 4KB)"
 	default 16
-	depends on BB_CONFIG_FEATURE_IPC_SYSLOG
+	depends on BB_FEATURE_IPC_SYSLOG
 	help
 	  This option sets the size of the circular buffer
 	  used to record system log messages.
 
-config BB_CONFIG_LOGREAD
-	bool "  logread"
+config BB_LOGREAD
+	bool "logread"
 	default y
-	depends on BB_CONFIG_FEATURE_IPC_SYSLOG
+	depends on BB_FEATURE_IPC_SYSLOG
 	help
 	  If you enabled Circular Buffer support, you almost
 	  certainly want to enable this feature as well.  This
 	  utility will allow you to read the messages that are
 	  stored in the syslogd circular buffer.
 
-config BB_CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING
-	bool "    logread double buffering"
+config BB_FEATURE_LOGREAD_REDUCED_LOCKING
+	bool "logread double buffering"
 	default n
-	depends on BB_CONFIG_LOGREAD
+	depends on BB_LOGREAD
 	help
 	  'logread' ouput to slow serial terminals can have
 	  side effects on syslog because of the semaphore.
@@ -86,10 +86,11 @@ config BB_CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING
 	  from circular buffer, minimizing semaphore
 	  contention at some minor memory expense.
 
-config BB_CONFIG_KLOGD
+config BB_KLOGD
 	bool "klogd"
 	default n
-	depends on BB_CONFIG_SYSLOGD
+	depends on BB_SYSLOGD
+	select BB_FEATURE_SYSLOG
 	help
 	  klogd is a utility which intercepts and logs all
 	  messages from the Linux kernel and sends the messages
@@ -97,9 +98,10 @@ config BB_CONFIG_KLOGD
 	  you wish to record the messages produced by the kernel,
 	  you should enable this option.
 
-config BB_CONFIG_LOGGER
+config BB_LOGGER
 	bool "logger"
 	default n
+	select BB_FEATURE_SYSLOG
 	help
 	    The logger utility allows you to send arbitrary text
 	    messages to the system log (i.e. the 'syslogd' utility) so
diff --git a/config/busybox-1.1.3/util-linux/Config.in b/config/busybox-1.4.1/util-linux/Config.in
index c42d115ef..263b1bf86 100644
--- a/config/busybox-1.1.3/util-linux/Config.in
+++ b/config/busybox-1.4.1/util-linux/Config.in
@@ -6,7 +6,7 @@
 menu "Linux System Utilities"
   depends on BUSYBOX
 
-config BB_CONFIG_DMESG
+config BB_DMESG
 	bool "dmesg"
 	default n
 	help
@@ -18,7 +18,27 @@ config BB_CONFIG_DMESG
 	  are also logged to the system console.  Enable this option if you
 	  wish to enable the 'dmesg' utility.
 
-config BB_CONFIG_FBSET
+config BB_FEATURE_DMESG_PRETTY
+	bool "pretty dmesg output"
+	default y
+	depends on BB_DMESG
+	help
+	  If you wish to scrub the syslog level from the output, say 'Y' here.
+	  The syslog level is a string prefixed to every line with the form "<#>".
+
+	  With this option you will see:
+	    # dmesg
+	    Linux version 2.6.17.4 .....
+	    BIOS-provided physical RAM map:
+	     BIOS-e820: 0000000000000000 - 000000000009f000 (usable)
+
+	  Without this option you will see:
+	    # dmesg
+	    <5>Linux version 2.6.17.4 .....
+	    <6>BIOS-provided physical RAM map:
+	    <6> BIOS-e820: 0000000000000000 - 000000000009f000 (usable)
+
+config BB_FBSET
 	bool "fbset"
 	default n
 	help
@@ -27,26 +47,26 @@ config BB_CONFIG_FBSET
 	  interface to access a graphics display.  Enable this option
 	  if you wish to enable the 'fbset' utility.
 
-config BB_CONFIG_FEATURE_FBSET_FANCY
-	bool "  Turn on extra fbset options"
+config BB_FEATURE_FBSET_FANCY
+	bool "Turn on extra fbset options"
 	default n
-	depends on BB_CONFIG_FBSET
+	depends on BB_FBSET
 	help
 	  This option enables extended fbset options, allowing one to set the
 	  framebuffer size, color depth, etc.  interface to access a graphics
 	  display.  Enable this option if you wish to enable extended fbset
 	  options.
 
-config BB_CONFIG_FEATURE_FBSET_READMODE
-	bool "  Turn on fbset readmode support"
+config BB_FEATURE_FBSET_READMODE
+	bool "Turn on fbset readmode support"
 	default n
-	depends on BB_CONFIG_FBSET
+	depends on BB_FBSET
 	help
 	  This option allows fbset to read the video mode database stored by
 	  default as /etc/fb.modes, which can be used to set frame buffer
 	  device to pre-defined video modes.
 
-config BB_CONFIG_FDFLUSH
+config BB_FDFLUSH
 	bool "fdflush"
 	default n
 	help
@@ -58,13 +78,13 @@ config BB_CONFIG_FDFLUSH
 	  you change a disk.  Most people have working hardware and can safely
 	  leave this disabled.
 
-config BB_CONFIG_FDFORMAT
+config BB_FDFORMAT
 	bool "fdformat"
 	default n
 	help
 	  fdformat is used to low-level format a floppy disk.
 
-config BB_CONFIG_FDISK
+config BB_FDISK
 	bool "fdisk"
 	default n
 	help
@@ -74,64 +94,64 @@ config BB_CONFIG_FDISK
 	  'disk slices' that are defined on a hard drive.
 
 config BB_FDISK_SUPPORT_LARGE_DISKS
-	bool "  support over 4GB disks"
+	bool "support over 4GB disks"
 	default y
-	depends on BB_CONFIG_FDISK
+	depends on BB_FDISK
 	help
 	  Enable this option to support large disks > 4GB.
 
-config BB_CONFIG_FEATURE_FDISK_WRITABLE
-	bool "  Write support"
+config BB_FEATURE_FDISK_WRITABLE
+	bool "Write support"
 	default y
-	depends on BB_CONFIG_FDISK
+	depends on BB_FDISK
 	help
 	  Enabling this option allows you to create or change a partition table
 	  and write those changes out to disk.  If you leave this option
 	  disabled, you will only be able to view the partition table.
 
-config BB_CONFIG_FEATURE_AIX_LABEL
-	bool "  Support AIX disklabels"
+config BB_FEATURE_AIX_LABEL
+	bool "Support AIX disklabels"
 	default n
-	depends on BB_CONFIG_FDISK && BB_CONFIG_FEATURE_FDISK_WRITABLE
+	depends on BB_FDISK && BB_FEATURE_FDISK_WRITABLE
 	help
 	  Enabling this option allows you to create or change AIX disklabels.
 	  Most people can safely leave this option disabled.
 
-config BB_CONFIG_FEATURE_SGI_LABEL
-	bool "  Support SGI disklabels"
+config BB_FEATURE_SGI_LABEL
+	bool "Support SGI disklabels"
 	default n
-	depends on BB_CONFIG_FDISK && BB_CONFIG_FEATURE_FDISK_WRITABLE
+	depends on BB_FDISK && BB_FEATURE_FDISK_WRITABLE
 	help
 	  Enabling this option allows you to create or change SGI disklabels.
 	  Most people can safely leave this option disabled.
 
-config BB_CONFIG_FEATURE_SUN_LABEL
-	bool "  Support SUN disklabels"
+config BB_FEATURE_SUN_LABEL
+	bool "Support SUN disklabels"
 	default n
- 	depends on BB_CONFIG_FDISK && BB_CONFIG_FEATURE_FDISK_WRITABLE
+ 	depends on BB_FDISK && BB_FEATURE_FDISK_WRITABLE
 	help
 	  Enabling this option allows you to create or change SUN disklabels.
 	  Most people can safely leave this option disabled.
 
-config BB_CONFIG_FEATURE_OSF_LABEL
-	bool "  Support BSD disklabels"
+config BB_FEATURE_OSF_LABEL
+	bool "Support BSD disklabels"
 	default n
-	depends on BB_CONFIG_FDISK && BB_CONFIG_FEATURE_FDISK_WRITABLE
+	depends on BB_FDISK && BB_FEATURE_FDISK_WRITABLE
 	help
 	  Enabling this option allows you to create or change BSD disklabels
 	  and define and edit BSD disk slices.
 
-config BB_CONFIG_FEATURE_FDISK_ADVANCED
-	bool "  Support expert mode"
+config BB_FEATURE_FDISK_ADVANCED
+	bool "Support expert mode"
 	default n
-	depends on BB_CONFIG_FDISK && BB_CONFIG_FEATURE_FDISK_WRITABLE
+	depends on BB_FDISK && BB_FEATURE_FDISK_WRITABLE
 	help
 	  Enabling this option allows you to do terribly unsafe things like
 	  define arbitrary drive geometry, move the beginning of data in a
 	  partition, and similarly evil things.  Unless you have a very good
 	  reason you would be wise to leave this disabled.
 
-config BB_CONFIG_FREERAMDISK
+config BB_FREERAMDISK
 	bool "freeramdisk"
 	default n
 	help
@@ -142,7 +162,7 @@ config BB_CONFIG_FREERAMDISK
 	  ramdisk.  If you have no use for freeing memory from a ramdisk, leave
 	  this disabled.
 
-config BB_CONFIG_FSCK_MINIX
+config BB_FSCK_MINIX
 	bool "fsck_minix"
 	default n
 	help
@@ -153,7 +173,7 @@ config BB_CONFIG_FSCK_MINIX
 	  check for and attempt to repair any corruption that occurs to a minix
 	  filesystem.
 
-config BB_CONFIG_MKFS_MINIX
+config BB_MKFS_MINIX
 	bool "mkfs_minix"
 	default n
 	help
@@ -162,18 +182,18 @@ config BB_CONFIG_MKFS_MINIX
 	  this utility will do the job for you.
 
 comment "Minix filesystem support"
-    depends on BB_CONFIG_FSCK_MINIX || BB_CONFIG_MKFS_MINIX
+    depends on BB_FSCK_MINIX || BB_MKFS_MINIX
 
-config BB_CONFIG_FEATURE_MINIX2
-	bool "  Support Minix fs v2 (fsck_minix/mkfs_minix)"
+config BB_FEATURE_MINIX2
+	bool "Support Minix fs v2 (fsck_minix/mkfs_minix)"
 	default y
-	depends on BB_CONFIG_FSCK_MINIX || BB_CONFIG_MKFS_MINIX
+	depends on BB_FSCK_MINIX || BB_MKFS_MINIX
 	help
 	  If you wish to be able to create version 2 minix filesystems, enable this.
 	  If you enabled 'mkfs_minix' then you almost certainly want to be using the
 	  version 2 filesystem support.
 
-config BB_CONFIG_GETOPT
+config BB_GETOPT
 	bool "getopt"
 	default n
 	help
@@ -184,14 +204,14 @@ config BB_CONFIG_GETOPT
 	  written by others, this utility may be for you.  Most people will
 	  wisely leave this disabled.
 
-config BB_CONFIG_HEXDUMP
+config BB_HEXDUMP
 	bool "hexdump"
 	default n
 	help
 	  The hexdump utility is used to display binary data in a readable
 	  way that is comparable to the output from most hex editors.
 
-config BB_CONFIG_HWCLOCK
+config BB_HWCLOCK
 	bool "hwclock"
 	default n
 	help
@@ -200,19 +220,19 @@ config BB_CONFIG_HWCLOCK
 	  shutdown in the hardware clock, so the hardware will keep the
 	  correct time when Linux is _not_ running.
 
-config BB_CONFIG_FEATURE_HWCLOCK_LONGOPTIONS
-	bool "  Support long options (--hctosys,...)"
+config BB_FEATURE_HWCLOCK_LONG_OPTIONS
+	bool "Support long options (--hctosys,...)"
 	default n
-	depends on BB_CONFIG_HWCLOCK
+	depends on BB_HWCLOCK && BB_GETOPT_LONG
 	help
 	  By default, the hwclock utility only uses short options.  If you
 	  are overly fond of its long options, such as --hctosys, --utc, etc)
 	  then enable this option.
 
-config BB_CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS
-	bool "  Use FHS /var/lib/hwclock/adjtime"
+config BB_FEATURE_HWCLOCK_ADJTIME_FHS
+	bool "Use FHS /var/lib/hwclock/adjtime"
 	default y
-	depends on BB_CONFIG_HWCLOCK
+	depends on BB_HWCLOCK
 	help
 	  Starting with FHS 2.3, the adjtime state file is supposed to exist
 	  at /var/lib/hwclock/adjtime instead of /etc/adjtime.  If you wish
@@ -221,24 +241,24 @@ config BB_CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS
 
 	  http://www.pathname.com/fhs/pub/fhs-2.3.html#VARLIBHWCLOCKSTATEDIRECTORYFORHWCLO
 
-config BB_CONFIG_IPCRM
+config BB_IPCRM
 	bool "ipcrm"
 	default n
-	select BB_CONFIG_FEATURE_SUID
+	select BB_FEATURE_SUID
 	help
 	  The ipcrm utility allows the removal of System V interprocess
 	  communication (IPC) objects and the associated data structures
 	  from the system.
 
-config BB_CONFIG_IPCS
+config BB_IPCS
 	bool "ipcs"
 	default n
-	select BB_CONFIG_FEATURE_SUID
+	select BB_FEATURE_SUID
 	help
 	  The ipcs utility is used to provide information on the currently
 	  allocated System V interprocess (IPC) objects in the system.
 
-config BB_CONFIG_LOSETUP
+config BB_LOSETUP
 	bool "losetup"
 	default n
 	help
@@ -246,7 +266,7 @@ config BB_CONFIG_LOSETUP
 	  file or block device, and to query the status of a loop device.  This
 	  version does not currently support enabling data encryption.
 
-config BB_CONFIG_MDEV
+config BB_MDEV
 	bool "mdev"
 	default n
 	help
@@ -255,10 +275,10 @@ config BB_CONFIG_MDEV
 	  have it handle hotplug events afterwards.  Device names are taken
 	  from sysfs.
 
-config BB_CONFIG_FEATURE_MDEV_CONF
-	bool "  Support /etc/mdev.conf"
+config BB_FEATURE_MDEV_CONF
+	bool "Support /etc/mdev.conf"
 	default n
-	depends on BB_CONFIG_MDEV
+	depends on BB_MDEV
 	help
 	  The mdev config file contains lines that look like:
 
@@ -266,17 +286,32 @@ config BB_CONFIG_FEATURE_MDEV_CONF
 
 	  That's device name (with regex match), uid:gid, and permissions.
 
-	  Optionally, that can be followed (on the same line) by an asterisk
-	  and a command line to run after creating the corresponding device(s),
-	  ala:
-
-	    hdc root:cdrom 660  *ln -s hdc cdrom
-
 	  Config file parsing stops on the first matching line.  If no config
 	  entry is matched, devices are created with default 0:0 660.  (Make
 	  the last line match .* to override this.)
 
-config BB_CONFIG_MKSWAP
+config BB_FEATURE_MDEV_EXEC
+	bool "Support command execution at device addition/removal"
+	default n
+	depends on BB_FEATURE_MDEV_CONF
+	help
+	  This adds support for an optional field to /etc/mdev.conf, consisting
+	  of a special character and a command line to run after creating the
+	  corresponding device(s) and before removing, ala:
+
+	    hdc root:cdrom 660  *ln -s $MDEV cdrom
+
+	  The $MDEV environment variable is set to the name of the device.
+
+	  The special characters and their meanings are:
+	    @ Run after creating the device.
+	    $ Run before removing the device.
+	    * Run both after creating and before removing the device.
+
+	  Commands are executed via system() so you need /bin/sh, meaning you
+	  probably want to select a default shell in the Shells menu.
+
+config BB_MKSWAP
 	bool "mkswap"
 	default n
 	help
@@ -289,7 +324,17 @@ config BB_CONFIG_MKSWAP
 	  Once you have created swap space using 'mkswap' you need to enable
 	  the swap space using the 'swapon' utility.
 
-config BB_CONFIG_MORE
+config BB_FEATURE_MKSWAP_V0
+	bool "version 0 support"
+	default n
+	depends on BB_MKSWAP
+#	depends on MKSWAP && DEPRECATED
+	help
+	  Enable support for the old v0 style.
+	  If your kernel is older than 2.1.117, then v0 support is the
+	  only option.
+
+config BB_MORE
 	bool "more"
 	default n
 	help
@@ -299,10 +344,10 @@ config BB_CONFIG_MORE
 	  you will probably find this utility very helpful.  If you don't have
 	  any need to reading text files, you can leave this disabled.
 
-config BB_CONFIG_FEATURE_USE_TERMIOS
-	bool "  Use termios to manipulate the screen"
+config BB_FEATURE_USE_TERMIOS
+	bool "Use termios to manipulate the screen"
 	default y
-	depends on BB_CONFIG_MORE
+	depends on BB_MORE
 	help
 	  This option allows utilities such as 'more' and 'top' to determine
 	  the size of the screen.  If you leave this disabled, your utilities
@@ -310,7 +355,7 @@ config BB_CONFIG_FEATURE_USE_TERMIOS
 	  will be unable to determine the current screen size, and will be
 	  unable to move the cursor.
 
-config BB_CONFIG_MOUNT
+config BB_MOUNT
 	bool "mount"
 	default n
 	help
@@ -321,14 +366,40 @@ config BB_CONFIG_MOUNT
 	  NFS filesystems.  Most people using BusyBox will also want to enable
 	  the 'mount' utility.
 
-config BB_CONFIG_FEATURE_MOUNT_NFS
-	bool "  Support mounting NFS file systems"
+config BB_FEATURE_MOUNT_NFS
+	bool "Support mounting NFS file systems"
 	default n
-	depends on BB_CONFIG_MOUNT
+	depends on BB_MOUNT
+	depends on BB_FEATURE_HAVE_RPC
+	select BB_FEATURE_SYSLOG
 	help
-	 Enable mounting of NFS file systems.
+	  Enable mounting of NFS file systems.
 
-config BB_CONFIG_PIVOT_ROOT
+config BB_FEATURE_MOUNT_CIFS
+	bool "Support mounting CIFS/SMB file systems"
+	default n
+	depends on BB_MOUNT
+	help
+	  Enable support for samba mounts.
+
+config BB_FEATURE_MOUNT_FLAGS
+	depends on BB_MOUNT
+	bool "Support lots of -o flags in mount"
+	default y
+	help
+	  Without this, mount only supports ro/rw/remount.  With this, it
+	  supports nosuid, suid, dev, nodev, exec, noexec, sync, async, atime,
+	  noatime, diratime, nodiratime, loud, bind, move, shared, slave,
+	  private, unbindable, rshared, rslave, rprivate, and runbindable.
+
+config BB_FEATURE_MOUNT_FSTAB
+	depends on BB_MOUNT
+	bool "Support /etc/fstab and -a"
+	default y
+	help
+	  Support mount all and looking for files in /etc/fstab.
+
+config BB_PIVOT_ROOT
 	bool "pivot_root"
 	default n
 	help
@@ -340,7 +411,7 @@ config BB_CONFIG_PIVOT_ROOT
 	  Note: This is for initrd in linux 2.4.  Under initramfs (introduced
 	  in linux 2.6) use switch_root instead.
 
-config BB_CONFIG_RDATE
+config BB_RDATE
 	bool "rdate"
 	default n
 	help
@@ -349,13 +420,13 @@ config BB_CONFIG_RDATE
 	  the RFC868 protocol, which is built into the inetd daemon on most
 	  systems.
 
-config BB_CONFIG_READPROFILE
+config BB_READPROFILE
 	bool "readprofile"
 	default n
 	help
 	  This allows you to parse /proc/profile for basic profiling.
 
-config BB_CONFIG_SETARCH
+config BB_SETARCH
 	bool "setarch"
 	default n
 	help
@@ -364,7 +435,7 @@ config BB_CONFIG_SETARCH
 	  this util on a system that supports both 64bit and 32bit userland
 	  (like amd64/x86, ppc64/ppc, sparc64/sparc, etc...).
 
-config BB_CONFIG_SWAPONOFF
+config BB_SWAPONOFF
 	bool "swaponoff"
 	default n
 	help
@@ -375,7 +446,7 @@ config BB_CONFIG_SWAPONOFF
 	  space.  If you are not using any swap space, you can leave this
 	  option disabled.
 
-config BB_CONFIG_SWITCH_ROOT
+config BB_SWITCH_ROOT
 	bool "switch_root"
 	default n
 	help
@@ -394,7 +465,7 @@ config BB_CONFIG_SWITCH_ROOT
 	  and ending point for searching through the kernel's doubly linked
 	  list of active mount points.  That's why.
 
-config BB_CONFIG_UMOUNT
+config BB_UMOUNT
 	bool "umount"
 	default n
 	help
@@ -403,20 +474,20 @@ config BB_CONFIG_UMOUNT
 	  the tool to use.  If you enabled the 'mount' utility, you almost certainly
 	  also want to enable 'umount'.
 
-config BB_CONFIG_FEATURE_UMOUNT_ALL
-	bool "  umount -a option"
+config BB_FEATURE_UMOUNT_ALL
+	bool "umount -a option"
 	default n
-	depends on BB_CONFIG_UMOUNT
+	depends on BB_UMOUNT
 	help
 	  Support -a option to unmount all currently mounted filesystems.
 
 comment "Common options for mount/umount"
-	depends on BB_CONFIG_MOUNT || BB_CONFIG_UMOUNT
+	depends on BB_MOUNT || BB_UMOUNT
 
-config BB_CONFIG_FEATURE_MOUNT_LOOP
-	bool "  Support loopback mounts"
+config BB_FEATURE_MOUNT_LOOP
+	bool "Support loopback mounts"
 	default n
-	depends on BB_CONFIG_MOUNT || BB_CONFIG_UMOUNT
+	depends on BB_MOUNT || BB_UMOUNT
 	help
 	  Enabling this feature allows automatic mounting of files (containing
 	  filesystem images) via the linux kernel's loopback devices.  The mount
@@ -429,10 +500,10 @@ config BB_CONFIG_FEATURE_MOUNT_LOOP
 	  specify an offset or cryptographic options to the loopback device.
 	  (If you don't want umount to free the loop device, use "umount -D".)
 
-config BB_CONFIG_FEATURE_MTAB_SUPPORT
-	bool "  Support for the old /etc/mtab file"
+config BB_FEATURE_MTAB_SUPPORT
+	bool "Support for the old /etc/mtab file"
 	default n
-	depends on BB_CONFIG_MOUNT || BB_CONFIG_UMOUNT
+	depends on BB_MOUNT || BB_UMOUNT
 	help
 	  Historically, Unix systems kept track of the currently mounted
 	  partitions in the file "/etc/mtab".  These days, the kernel exports
@@ -446,7 +517,11 @@ config BB_CONFIG_FEATURE_MTAB_SUPPORT
 	  example a mount under chroot won't update it), can't handle modern
 	  features like separate per-process filesystem namespaces, requires
 	  that your /etc directory be writeable, tends to get easily confused
-	  by --bind or --move mounts, and so on.  (In brief: avoid.)
+	  by --bind or --move mounts, won't update if you rename a directory
+	  that contains a mount point, and so on.  (In brief: avoid.)
+
+	  About the only reason to use this is if you've removed /proc from
+	  your kernel.
 
 endmenu