busybox: version bump 1.27.2 -> 1.28.3

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

25 files changed, 3362 insertions, 3268 deletions

diff --git a/config/busybox/Config.in b/config/busybox/Config.in
index a15c05cce..bd838f379 100644
--- a/config/busybox/Config.in
+++ b/config/busybox/Config.in
@@ -3,35 +3,39 @@
 # see scripts/kbuild/config-language.txt.
 #
 
-# mainmenu "BusyBox Configuration"
+# mainmenu "Configuration"
 
 config BUSYBOX_HAVE_DOT_CONFIG
 	bool
 	default y
 
-menu "Busybox Settings"
+menu "Settings"
 
 config BUSYBOX_DESKTOP
-	bool "Enable options for full-blown desktop systems"
+	bool "Enable compatibility for full-blown desktop systems"
 	default y
 	help
-	  Enable options and features which are not essential.
-	  Select this if you plan to use busybox on full-blown desktop machine
-	  with common Linux distro, which needs higher level of command-line
-	  compatibility.
+	Enable applet options and features which are not essential.
+	Many applet options have dedicated config options to (de)select them
+	under that applet; this options enables those options which have no
+	individual config item for them.
 
-	  If you are preparing your build to be used on an embedded box
-	  where you have tighter control over the entire set of userspace
-	  tools, you can unselect this option for smaller code size.
+	Select this if you plan to use busybox on full-blown desktop machine
+	with common Linux distro, which needs higher level of command-line
+	compatibility.
+
+	If you are preparing your build to be used on an embedded box
+	where you have tighter control over the entire set of userspace
+	tools, you can unselect this option for smaller code size.
 
 config BUSYBOX_EXTRA_COMPAT
 	bool "Provide compatible behavior for rare corner cases (bigger code)"
 	default n
 	help
-	  This option makes grep, sed etc handle rare corner cases
-	  (embedded NUL bytes and such). This makes code bigger and uses
-	  some GNU extensions in libc. You probably only need this option
-	  if you plan to run busybox on desktop.
+	This option makes grep, sed etc handle rare corner cases
+	(embedded NUL bytes and such). This makes code bigger and uses
+	some GNU extensions in libc. You probably only need this option
+	if you plan to run busybox on desktop.
 
 config BUSYBOX_FEDORA_COMPAT
 	bool "Building for Fedora distribution"
@@ -50,279 +54,285 @@ config BUSYBOX_INCLUDE_SUSv2
 	bool "Enable obsolete features removed before SUSv3"
 	default y
 	help
-	  This option will enable backwards compatibility with SuSv2,
-	  specifically, old-style numeric options ('command -1 <file>')
-	  will be supported in head, tail, and fold. (Note: should
-	  affect renice too.)
+	This option will enable backwards compatibility with SuSv2,
+	specifically, old-style numeric options ('command -1 <file>')
+	will be supported in head, tail, and fold. (Note: should
+	affect renice too.)
 
-config BUSYBOX_USE_PORTABLE_CODE
-	bool "Avoid using GCC-specific code constructs"
-	default n
+config BUSYBOX_LONG_OPTS
+	bool "Support --long-options"
+	default y
 	help
-	  Use this option if you are trying to compile busybox with
-	  compiler other than gcc.
-	  If you do use gcc, this option may needlessly increase code size.
+	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 BUSYBOX_SHOW_USAGE
 	bool "Show applet usage messages"
 	default y
 	help
-	  Enabling this option, BusyBox applets will show terse help messages
-	  when invoked with wrong arguments.
-	  If you do not want to show any (helpful) usage message when
-	  issuing wrong command syntax, you can say 'N' here,
-	  saving approximately 7k.
+	Enabling this option, applets will show terse help messages
+	when invoked with wrong arguments.
+	If you do not want to show any (helpful) usage message when
+	issuing wrong command syntax, you can say 'N' here,
+	saving approximately 7k.
 
 config BUSYBOX_FEATURE_VERBOSE_USAGE
 	bool "Show verbose applet usage messages"
 	default y
 	depends on BUSYBOX_SHOW_USAGE
 	help
-	  All BusyBox applets will show 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.
+	All applets will show verbose help messages when invoked with --help.
+	This will add a lot of text to the binary.
 
 config BUSYBOX_FEATURE_COMPRESS_USAGE
 	bool "Store applet usage messages in compressed form"
 	default y
 	depends on BUSYBOX_SHOW_USAGE
 	help
-	  Store usage messages in .bz 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 BUSYBOX_BUSYBOX
-	bool "Include busybox applet"
-	default y
-	help
-	  The busybox applet provides general help regarding busybox and
-	  allows the included applets to be listed.  It's also required
-	  if applet links are to be installed at runtime.
+	Store usage messages in .bz2 compressed form, uncompress them
+	on-the-fly when "APPLET --help" is run.
 
-	  If you can live without these features disabling this will save
-	  some space.
+	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 BUSYBOX_FEATURE_INSTALLER
-	bool "Support --install [-s] to install applet links at runtime"
+config BUSYBOX_LFS
+	bool "Support files > 2 GB"
 	default y
-	depends on BUSYBOX_BUSYBOX
 	help
-	  Enable 'busybox --install [-s]' support. This will allow you to use
-	  busybox at runtime to create hard links or symlinks for all the
-	  applets that are compiled into busybox.
-
-config BUSYBOX_INSTALL_NO_USR
-	bool "Don't use /usr"
-	default n
-	help
-	  Disable use of /usr. busybox --install and "make install"
-	  will install applets only to /bin and /sbin,
-	  never to /usr/bin or /usr/sbin.
+	If you need to work with large files, enable this option.
+	This will have no effect if your kernel or your C
+	library lacks large file support for large files. Some of the
+	programs that can benefit from large file support include dd, gzip,
+	cp, mount, tar.
 
 config BUSYBOX_PAM
 	bool "Support PAM (Pluggable Authentication Modules)"
 	default n
 	help
-	  Use PAM in some busybox applets (currently login and httpd) instead
-	  of direct access to password database.
-
-config BUSYBOX_LONG_OPTS
-	bool "Support --long-options"
-	default y
-	help
-	  Enable this if you want busybox applets to use the gnu --long-option
-	  style, in addition to single character -a -b -c style options.
+	Use PAM in some applets (currently login and httpd) instead
+	of direct access to password database.
 
 config BUSYBOX_FEATURE_DEVPTS
 	bool "Use the devpts filesystem for Unix98 PTYs"
 	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 mounted.
-
-config BUSYBOX_FEATURE_CLEAN_UP
-	bool "Clean up all memory before exiting (usually not needed)"
-	default n
-	help
-	  As a size optimization, busybox normally exits without explicitly
-	  freeing dynamically allocated memory or closing files. This saves
-	  space since the OS will clean up for us, but it can confuse debuggers
-	  like valgrind, which report tons of memory and resource leaks.
-
-	  Don't enable this unless you have a really good reason to clean
-	  things up manually.
+	Enable if you want 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 mounted.
 
 config BUSYBOX_FEATURE_UTMP
 	bool "Support utmp file"
 	default y
 	help
-	  The file /var/run/utmp is used to track who is currently logged in.
-	  With this option on, certain applets (getty, login, telnetd etc)
-	  will create and delete entries there.
-	  "who" applet requires this option.
+	The file /var/run/utmp is used to track who is currently logged in.
+	With this option on, certain applets (getty, login, telnetd etc)
+	will create and delete entries there.
+	"who" applet requires this option.
 
 config BUSYBOX_FEATURE_WTMP
 	bool "Support wtmp file"
 	default y
 	depends on BUSYBOX_FEATURE_UTMP
 	help
-	  The file /var/run/wtmp is used to track when users have logged into
-	  and logged out of the system.
-	  With this option on, certain applets (getty, login, telnetd etc)
-	  will append new entries there.
-	  "last" applet requires this option.
+	The file /var/run/wtmp is used to track when users have logged into
+	and logged out of the system.
+	With this option on, certain applets (getty, login, telnetd etc)
+	will append new entries there.
+	"last" applet requires this option.
 
 config BUSYBOX_FEATURE_PIDFILE
 	bool "Support writing pidfiles"
 	default y
 	help
-	  This option makes some applets (e.g. crond, syslogd, inetd) write
-	  a pidfile at the configured PID_FILE_PATH.  It has no effect
-	  on applets which require pidfiles to run.
+	This option makes some applets (e.g. crond, syslogd, inetd) write
+	a pidfile at the configured PID_FILE_PATH.  It has no effect
+	on applets which require pidfiles to run.
 
 config BUSYBOX_PID_FILE_PATH
-	string "Path to directory for pidfile"
+	string "Directory for pidfiles"
 	default "/var/run"
 	depends on BUSYBOX_FEATURE_PIDFILE
 	help
-	  This is the default path where pidfiles are created.  Applets which
-	  allow you to set the pidfile path on the command line will override
-	  this value.  The option has no effect on applets that require you to
-	  specify a pidfile path.
+	This is the default path where pidfiles are created.  Applets which
+	allow you to set the pidfile path on the command line will override
+	this value.  The option has no effect on applets that require you to
+	specify a pidfile path.
 
-config BUSYBOX_FEATURE_SUID
-	bool "Support SUID/SGID handling"
+config BUSYBOX_BUSYBOX
+	bool "Include busybox applet"
 	default y
 	help
-	  With this option you can install the busybox binary belonging
-	  to root with the suid bit set, enabling some applets to perform
-	  root-level operations even when run by ordinary users
-	  (for example, mounting of user mounts in fstab needs this).
-
-	  Busybox will automatically drop privileges for applets
-	  that don't need root access.
-
-	  If you are 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 which require root rights (need suid bit or
-	  to be run by root) and will refuse to execute otherwise:
-	  crontab, login, passwd, su, vlock, wall.
+	The busybox applet provides general help message and allows
+	the included applets to be listed.  It also provides
+	optional --install command to create applet links. If you unselect
+	this option, running busybox without any arguments will give
+	just a cryptic error message:
 
-	  The applets which will use root rights if they have them
-	  (via suid bit, or because run by root), but would try to work
-	  without root right nevertheless:
-	  findfs, ping[6], traceroute[6], mount.
+	$ busybox
+	busybox: applet not found
 
-	  Note that if you DONT select this option, but DO make busybox
-	  suid root, ALL applets will run under root, which is a huge
-	  security hole (think "cp /some/file /etc/passwd").
+	Running "busybox APPLET [ARGS...]" will still work, of course.
 
-config BUSYBOX_FEATURE_SUID_CONFIG
-	bool "Runtime SUID/SGID configuration via /etc/busybox.conf"
+config BUSYBOX_FEATURE_INSTALLER
+	bool "Support --install [-s] to install applet links at runtime"
 	default y
-	depends on BUSYBOX_FEATURE_SUID
+	depends on BUSYBOX_BUSYBOX
 	help
-	  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:
+	Enable 'busybox --install [-s]' support. This will allow you to use
+	busybox at runtime to create hard links or symlinks for all the
+	applets that are compiled into busybox.
 
-	  APPLET = [Ssx-][Ssx-][x-] [USER.GROUP]
+config BUSYBOX_INSTALL_NO_USR
+	bool "Don't use /usr"
+	default n
+	help
+	Disable use of /usr. "busybox --install" and "make install"
+	will install applets only to /bin and /sbin,
+	never to /usr/bin or /usr/sbin.
 
-	  s: USER or GROUP is allowed to execute APPLET.
-	     APPLET will run under USER or GROUP
-	     (reagardless of who's running it).
-	  S: USER or GROUP is NOT allowed to execute APPLET.
-	     APPLET will run under USER or GROUP.
-	     This option is not very sensical.
-	  x: USER/GROUP/others are allowed to execute APPLET.
-	     No UID/GID change will be done when it is run.
-	  -: USER/GROUP/others are not allowed to execute APPLET.
+config BUSYBOX_FEATURE_SUID
+	bool "Drop SUID state for most applets"
+	default y
+	help
+	With this option you can install the busybox binary belonging
+	to root with the suid bit set, enabling some applets to perform
+	root-level operations even when run by ordinary users
+	(for example, mounting of user mounts in fstab needs this).
 
-	  An example might help:
+	With this option enabled, busybox drops privileges for applets
+	that don't need root access, before entering their main() function.
 
-	  [SUID]
-	  su = ssx root.0 # applet su can be run by anyone and runs with
-	                  # euid=0/egid=0
-	  su = ssx        # exactly the same
+	If you are really paranoid and don't want even initial busybox code
+	to run under root for every applet, 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.
 
-	  mount = sx- root.disk # applet mount can be run by root and members
-	                        # of group disk (but not anyone else)
-	                        # and runs with euid=0 (egid is not changed)
+	Some applets which require root rights (need suid bit on the binary
+	or to be run by root) and will refuse to execute otherwise:
+	crontab, login, passwd, su, vlock, wall.
 
-	  cp = --- # disable applet cp for everyone
+	The applets which will use root rights if they have them
+	(via suid bit, or because run by root), but would try to work
+	without root right nevertheless:
+	findfs, ping[6], traceroute[6], mount.
 
-	  The file has to be owned by user root, group root and has to be
-	  writeable only by root:
-	        (chown 0.0 /etc/busybox.conf; chmod 600 /etc/busybox.conf)
-	  The busybox executable has to be owned by user root, group
-	  root and has to be setuid root for this to work:
-	        (chown 0.0 /bin/busybox; chmod 4755 /bin/busybox)
+	Note that if you DO NOT select this option, but DO make busybox
+	suid root, ALL applets will run under root, which is a huge
+	security hole (think "cp /some/file /etc/passwd").
 
-	  Robert 'sandman' Griebl has more information here:
-	  <url: http://www.softforge.de/bb/suid.html >.
+config BUSYBOX_FEATURE_SUID_CONFIG
+	bool "Enable SUID configuration via /etc/busybox.conf"
+	default y
+	depends on BUSYBOX_FEATURE_SUID
+	help
+	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-] [USER.GROUP]
+
+	s: USER or GROUP is allowed to execute APPLET.
+	   APPLET will run under USER or GROUP
+	   (regardless of who's running it).
+	S: USER or GROUP is NOT allowed to execute APPLET.
+	   APPLET will run under USER or GROUP.
+	   This option is not very sensical.
+	x: USER/GROUP/others are allowed to execute APPLET.
+	   No UID/GID change will be done when it is run.
+	-: USER/GROUP/others are not allowed to execute APPLET.
+
+	An example might help:
+
+	|[SUID]
+	|su = ssx root.0 # applet su can be run by anyone and runs with
+	|                # euid=0,egid=0
+	|su = ssx        # exactly the same
+	|
+	|mount = sx- root.disk # applet mount can be run by root and members
+	|                      # of group disk (but not anyone else)
+	|                      # and runs with euid=0 (egid is not changed)
+	|
+	|cp = --- # disable applet cp for everyone
+
+	The file has to be owned by user root, group root and has to be
+	writeable only by root:
+		(chown 0.0 /etc/busybox.conf; chmod 600 /etc/busybox.conf)
+	The busybox executable has to be owned by user root, group
+	root and has to be setuid root for this to work:
+		(chown 0.0 /bin/busybox; chmod 4755 /bin/busybox)
+
+	Robert 'sandman' Griebl has more information here:
+	<url: http://www.softforge.de/bb/suid.html >.
 
 config BUSYBOX_FEATURE_SUID_CONFIG_QUIET
 	bool "Suppress warning message if /etc/busybox.conf is not readable"
 	default y
 	depends on BUSYBOX_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.
+	/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 BUSYBOX_FEATURE_PREFER_APPLETS
+	bool "exec prefers applets"
+	default n
+	help
+	This is an experimental option which directs applets about to
+	call 'exec' to try and find an applicable busybox applet before
+	searching the PATH. This is typically done by exec'ing
+	/proc/self/exe.
+
+	This may affect shell, find -exec, xargs and similar applets.
+	They will use applets even if /bin/APPLET -> busybox link
+	is missing (or is not a link to busybox). However, this causes
+	problems in chroot jails without mounted /proc and with ps/top
+	(command name can be shown as 'exe' for applets started this way).
+
+config BUSYBOX_BUSYBOX_EXEC_PATH
+	string "Path to busybox executable"
+	default "/proc/self/exe"
+	help
+	When applets need to run other 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.
 
 config BUSYBOX_SELINUX
 	bool "Support NSA Security Enhanced Linux"
 	default n
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  Enable support for SELinux in applets ls, ps, and id. Also provide
-	  the option of compiling in SELinux 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 SELinux userland installed, this stuff
+	will not compile.  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:
 
-	  If you do not have a complete SELinux userland installed, this stuff
-	  will not compile.  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'.
+	Most people will leave this set to 'N'.
 
-config BUSYBOX_FEATURE_PREFER_APPLETS
-	bool "exec prefers applets"
+config BUSYBOX_FEATURE_CLEAN_UP
+	bool "Clean up all memory before exiting (usually not needed)"
 	default n
 	help
-	  This is an experimental option which directs applets about to
-	  call 'exec' to try and find an applicable busybox applet before
-	  searching the PATH. This is typically done by exec'ing
-	  /proc/self/exe.
-	  This may affect shell, find -exec, xargs and similar applets.
-	  They will use applets even if /bin/<applet> -> busybox link
-	  is missing (or is not a link to busybox). However, this causes
-	  problems in chroot jails without mounted /proc and with ps/top
-	  (command name can be shown as 'exe' for applets started this way).
+	As a size optimization, busybox normally exits without explicitly
+	freeing dynamically allocated memory or closing files. This saves
+	space since the OS will clean up for us, but it can confuse debuggers
+	like valgrind, which report tons of memory and resource leaks.
 
-config BUSYBOX_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.
+	Don't enable this unless you have a really good reason to clean
+	things up manually.
 
 # These are auto-selected by other options
 
@@ -330,64 +340,53 @@ config BUSYBOX_FEATURE_SYSLOG
 	bool #No description makes it a hidden option
 	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 BUSYBOX_FEATURE_HAVE_RPC
-	bool #No description makes it a hidden option
-	default n
-	#help
-	#  This is automatically selected if any of enabled applets need it.
-	#  You do not need to select it manually.
+	#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 BUSYBOX_PLATFORM_LINUX
 	bool #No description makes it a hidden option
 	default n
 	#help
-	#  For the most part, busybox requires only POSIX compatibility
-	#  from the target system, but some applets and features use
-	#  Linux-specific interfaces.
+	#For the most part, busybox requires only POSIX compatibility
+	#from the target system, but some applets and features use
+	#Linux-specific interfaces.
 	#
-	#  This is automatically selected if any applet or feature requires
-	#  Linux-specific interfaces. You do not need to select it manually.
+	#This is automatically selected if any applet or feature requires
+	#Linux-specific interfaces. You do not need to select it manually.
 
 comment 'Build Options'
 
 config BUSYBOX_STATIC
-	bool "Build BusyBox as a static binary (no shared libs)"
+	bool "Build static binary (no shared libs)"
 	default n
 	help
-	  If you want to build a static BusyBox binary, which does not
-	  use or require any shared libraries, then enable this option.
-	  This can cause BusyBox to be considerably larger, so you should
-	  leave this option false unless you have a good reason (i.e.
-	  your target platform does not support shared libraries, or
-	  you are building an initrd which doesn't need anything but
-	  BusyBox, etc).
-
-	  Most people will leave this set to 'N'.
+	If you want to build a static binary, which does not use
+	or require any shared libraries, enable this option.
+	Static binaries are larger, but do not require functioning
+	dynamic libraries to be present, which is important if used
+	as a system rescue tool.
 
 config BUSYBOX_PIE
-	bool "Build BusyBox as a position independent executable"
+	bool "Build position independent executable"
 	default n
 	depends on !BUSYBOX_STATIC
 	help
-	  Hardened code option. PIE binaries are loaded at a different
-	  address at each invocation. This has some overhead,
-	  particularly on x86-32 which is short on registers.
+	Hardened code option. PIE binaries are loaded at a different
+	address at each invocation. This has some overhead,
+	particularly on x86-32 which is short on registers.
 
-	  Most people will leave this set to 'N'.
+	Most people will leave this set to 'N'.
 
 config BUSYBOX_NOMMU
 	bool "Force NOMMU build"
 	default n
 	help
-	  Busybox tries to detect whether architecture it is being
-	  built against supports MMU or not. If this detection fails,
-	  or if you want to build NOMMU version of busybox for testing,
-	  you may force NOMMU build here.
+	Busybox tries to detect whether architecture it is being
+	built against supports MMU or not. If this detection fails,
+	or if you want to build NOMMU version of busybox for testing,
+	you may force NOMMU build here.
 
-	  Most people will leave this set to 'N'.
+	Most people will leave this set to 'N'.
 
 # PIE can be made to work with BUILD_LIBBUSYBOX, but currently
 # build system does not support that
@@ -396,135 +395,128 @@ config BUSYBOX_BUILD_LIBBUSYBOX
 	default n
 	depends on !BUSYBOX_FEATURE_PREFER_APPLETS && !BUSYBOX_PIE && !BUSYBOX_STATIC
 	help
-	  Build a shared library libbusybox.so.N.N.N which contains all
-	  busybox code.
+	Build a shared library libbusybox.so.N.N.N which contains all
+	busybox code.
 
-	  This feature allows every applet to be built as a tiny
-	  separate executable. Enabling it for "one big busybox binary"
-	  approach serves no purpose and increases code size.
-	  You should almost certainly say "no" to this.
+	This feature allows every applet to be built as a really tiny
+	separate executable linked against the library:
+	|$ size 0_lib/l*
+	|    text  data   bss     dec    hex filename
+	|     939   212    28    1179    49b 0_lib/last
+	|     939   212    28    1179    49b 0_lib/less
+	|  919138  8328  1556  929022  e2cfe 0_lib/libbusybox.so.1.N.M
 
-### config FEATURE_FULL_LIBBUSYBOX
-###	bool "Feature-complete libbusybox"
-###	default n if !FEATURE_SHARED_BUSYBOX
-###	depends on BUILD_LIBBUSYBOX
-###	help
-###	  Build a libbusybox with the complete feature-set, disregarding
-###	  the actually selected config.
-###
-###	  Normally, libbusybox will only contain the features which are
-###	  used by busybox itself. If you plan to write a separate
-###	  standalone application which uses libbusybox say 'Y'.
-###
-###	  Note: libbusybox is GPL, not LGPL, and exports no stable API that
-###	  might act as a copyright barrier. We can and will modify the
-###	  exported function set between releases (even minor version number
-###	  changes), and happily break out-of-tree features.
-###
-###	  Say 'N' if in doubt.
+	This is useful on NOMMU systems which are not capable
+	of sharing executables, but are capable of sharing code
+	in dynamic libraries.
+
+config BUSYBOX_FEATURE_LIBBUSYBOX_STATIC
+	bool "Pull in all external references into libbusybox"
+	default n
+	depends on BUSYBOX_BUILD_LIBBUSYBOX
+	help
+	Make libbusybox library independent, not using or requiring
+	any other shared libraries.
 
 config BUSYBOX_FEATURE_INDIVIDUAL
 	bool "Produce a binary for each applet, linked against libbusybox"
 	default y
 	depends on BUSYBOX_BUILD_LIBBUSYBOX
 	help
-	  If your CPU architecture doesn't allow for sharing text/rodata
-	  sections of running binaries, but allows for runtime dynamic
-	  libraries, this option will allow you to reduce memory footprint
-	  when you have many different applets running at once.
+	If your CPU architecture doesn't allow for sharing text/rodata
+	sections of running binaries, but allows for runtime dynamic
+	libraries, this option will allow you to reduce memory footprint
+	when you have many different applets running at once.
 
-	  If your CPU architecture allows for sharing text/rodata,
-	  having single binary is more optimal.
+	If your CPU architecture allows for sharing text/rodata,
+	having single binary is more optimal.
 
-	  Each applet will be a tiny program, dynamically linked
-	  against libbusybox.so.N.N.N.
+	Each applet will be a tiny program, dynamically linked
+	against libbusybox.so.N.N.N.
 
-	  You need to have a working dynamic linker.
+	You need to have a working dynamic linker.
 
 config BUSYBOX_FEATURE_SHARED_BUSYBOX
 	bool "Produce additional busybox binary linked against libbusybox"
 	default y
 	depends on BUSYBOX_BUILD_LIBBUSYBOX
 	help
-	  Build busybox, dynamically linked against libbusybox.so.N.N.N.
+	Build busybox, dynamically linked against libbusybox.so.N.N.N.
 
-	  You need to have a working dynamic linker.
+	You need to have a working dynamic linker.
 
 ### config BUILD_AT_ONCE
 ###	bool "Compile all sources at once"
 ###	default n
 ###	help
-###	  Normally each source-file is compiled with one invocation of
-###	  the compiler.
-###	  If you set this option, all sources are compiled at once.
-###	  This gives the compiler more opportunities to optimize which can
-###	  result in smaller and/or faster binaries.
+###	Normally each source-file is compiled with one invocation of
+###	the compiler.
+###	If you set this option, all sources are compiled at once.
+###	This gives the compiler more opportunities to optimize which can
+###	result in smaller and/or faster binaries.
 ###
-###	  Setting this option will consume alot of memory, e.g. if you
-###	  enable all applets with all features, gcc uses more than 300MB
-###	  RAM during compilation of busybox.
+###	Setting this option will consume alot of memory, e.g. if you
+###	enable all applets with all features, gcc uses more than 300MB
+###	RAM during compilation of busybox.
 ###
-###	  This option is most likely only beneficial for newer compilers
-###	  such as gcc-4.1 and above.
+###	This option is most likely only beneficial for newer compilers
+###	such as gcc-4.1 and above.
 ###
-###	  Say 'N' unless you know what you are doing.
-
-config BUSYBOX_LFS
-	bool "Build with Large File Support (for accessing files > 2 GB)"
-	default y
-	help
-	  If you want to build BusyBox with large file support, then enable
-	  this option. This will have no effect if your kernel or your C
-	  library lacks large file support for large files. Some of the
-	  programs that can benefit from large file support include dd, gzip,
-	  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'.
+###	Say 'N' unless you know what you are doing.
 
 config BUSYBOX_CROSS_COMPILER_PREFIX
-	string "Cross Compiler prefix"
+	string "Cross compiler prefix"
 	default ""
 	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,
-	  "i386-uclibc-".
+	If you want to build busybox with a cross compiler, then you
+	will need to set this to the cross-compiler prefix, for example,
+	"i386-uclibc-".
 
-	  Note that CROSS_COMPILE environment variable or
-	  "make CROSS_COMPILE=xxx ..." will override this selection.
+	Note that CROSS_COMPILE environment variable or
+	"make CROSS_COMPILE=xxx ..." will override this selection.
 
-	  Native builds leave this empty.
+	Native builds leave this empty.
 
 config BUSYBOX_SYSROOT
 	string "Path to sysroot"
 	default ""
 	help
-	  If you want to build BusyBox with a cross compiler, then you
-	  might also need to specify where /usr/include and /usr/lib
-	  will be found.
+	If you want to build busybox with a cross compiler, then you
+	might also need to specify where /usr/include and /usr/lib
+	will be found.
 
-	  For example, BusyBox can be built against an installed
-	  Android NDK, platform version 9, for ARM ABI with
+	For example, busybox can be built against an installed
+	Android NDK, platform version 9, for ARM ABI with
 
-	  CONFIG_SYSROOT=/opt/android-ndk/platforms/android-9/arch-arm
+	CONFIG_SYSROOT=/opt/android-ndk/platforms/android-9/arch-arm
 
-	  Native builds leave this empty.
+	Native builds leave this empty.
 
 config BUSYBOX_EXTRA_CFLAGS
 	string "Additional CFLAGS"
 	default ""
 	help
-	  Additional CFLAGS to pass to the compiler verbatim.
+	Additional CFLAGS to pass to the compiler verbatim.
 
 config BUSYBOX_EXTRA_LDFLAGS
 	string "Additional LDFLAGS"
 	default ""
 	help
-	  Additional LDFLAGS to pass to the linker verbatim.
+	Additional LDFLAGS to pass to the linker verbatim.
 
 config BUSYBOX_EXTRA_LDLIBS
 	string "Additional LDLIBS"
 	default ""
 	help
-	  Additional LDLIBS to pass to the linker with -l.
+	Additional LDLIBS to pass to the linker with -l.
+
+config BUSYBOX_USE_PORTABLE_CODE
+	bool "Avoid using GCC-specific code constructs"
+	default n
+	help
+	Use this option if you are trying to compile busybox with
+	compiler other than gcc.
+	If you do use gcc, this option may needlessly increase code size.
 
 comment 'Installation Options ("make install" behavior)'
 
@@ -532,32 +524,32 @@ choice
 	prompt "What kind of applet links to install"
 	default BUSYBOX_INSTALL_APPLET_SYMLINKS
 	help
-	  Choose what kind of links to applets are created by "make install".
+	Choose what kind of links to applets are created by "make install".
 
 config BUSYBOX_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.
+	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 BUSYBOX_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.
+	Install applets as hard-links to the busybox binary. This might
+	count on a filesystem with few inodes.
 
 config BUSYBOX_INSTALL_APPLET_SCRIPT_WRAPPERS
 	bool "as script wrappers"
 	help
-	  Install applets as script wrappers that call the busybox binary.
+	Install applets as script wrappers that call the busybox binary.
 
 config BUSYBOX_INSTALL_APPLET_DONT
 	bool "not installed"
 	help
-	  Do not install applet links. Useful when you plan to use
-	  busybox --install for installing links, or plan to use
-	  a standalone shell and thus don't need applet links.
+	Do not install applet links. Useful when you plan to use
+	busybox --install for installing links, or plan to use
+	a standalone shell and thus don't need applet links.
 
 endchoice
 
@@ -566,113 +558,116 @@ choice
 	default BUSYBOX_INSTALL_SH_APPLET_SYMLINK
 	depends on BUSYBOX_INSTALL_APPLET_SCRIPT_WRAPPERS
 	help
-	  Choose how you install /bin/sh applet link.
+	Choose how you install /bin/sh applet link.
 
 config BUSYBOX_INSTALL_SH_APPLET_SYMLINK
 	bool "as soft-link"
 	help
-	  Install /bin/sh applet as soft-link to the busybox binary.
+	Install /bin/sh applet as soft-link to the busybox binary.
 
 config BUSYBOX_INSTALL_SH_APPLET_HARDLINK
 	bool "as hard-link"
 	help
-	  Install /bin/sh applet as hard-link to the busybox binary.
+	Install /bin/sh applet as hard-link to the busybox binary.
 
 config BUSYBOX_INSTALL_SH_APPLET_SCRIPT_WRAPPER
 	bool "as script wrapper"
 	help
-	  Install /bin/sh applet as script wrapper that calls
-	  the busybox binary.
+	Install /bin/sh applet as script wrapper that calls
+	the busybox binary.
 
 endchoice
 
 config BUSYBOX_PREFIX
-	string "BusyBox installation prefix"
+	string "Destination path for 'make install'"
 	default "./_install"
 	help
-	  Define your directory to install BusyBox files/subdirs in.
+	Where "make install" should install busybox binary and links.
 
 comment 'Debugging Options'
 
 config BUSYBOX_DEBUG
-	bool "Build BusyBox with extra Debugging symbols"
+	bool "Build with debug information"
 	default n
 	help
-	  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.
+	Say Y here to compile with debug information.
+	This increases the size of the binary considerably, and
+	should only be used when doing development.
 
-	  Most people should answer N.
+	This adds -g option to gcc command line.
+
+	Most people should answer N.
 
 config BUSYBOX_DEBUG_PESSIMIZE
 	bool "Disable compiler optimizations"
 	default n
 	depends on BUSYBOX_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.
+	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.
+
+	This replaces -Os/-O2 with -O0 in gcc command line.
 
 config BUSYBOX_DEBUG_SANITIZE
 	bool "Enable runtime sanitizers (ASAN/LSAN/USAN/etc...)"
 	default n
 	help
-	  Say Y here if you want to enable runtime sanitizers. These help
-	  catch bad memory accesses (e.g. buffer overflows), but will make
-	  the executable larger and slow down runtime a bit.
+	Say Y here if you want to enable runtime sanitizers. These help
+	catch bad memory accesses (e.g. buffer overflows), but will make
+	the executable larger and slow down runtime a bit.
 
-	  This adds -fsanitize=foo options to gcc command line.
+	This adds -fsanitize=foo options to gcc command line.
 
-	  If you aren't developing/testing busybox, say N here.
+	If you aren't developing/testing busybox, say N here.
 
 config BUSYBOX_UNIT_TEST
 	bool "Build unit tests"
 	default n
 	help
-	  Say Y here if you want to build unit tests (both the framework and
-	  test cases) as a Busybox applet. This results in bigger code, so you
-	  probably don't want this option in production builds.
+	Say Y here if you want to build unit tests (both the framework and
+	test cases) as an applet. This results in bigger code, so you
+	probably don't want this option in production builds.
 
 config BUSYBOX_WERROR
 	bool "Abort compilation on any warning"
 	default n
 	help
-	  This adds -Werror to gcc command line.
+	This adds -Werror to gcc command line.
 
-	  Most people should answer N.
+	Most people should answer N.
 
 choice
 	prompt "Additional debugging library"
 	default BUSYBOX_NO_DEBUG_LIB
 	help
-	  Using an additional debugging library will make BusyBox become
-	  considerable larger and will cause it to run more slowly. You
-	  should always leave this option disabled for production use.
-
-	  dmalloc support:
-	  ----------------
-	  This enables compiling with dmalloc ( http://dmalloc.com/ )
-	  which is an excellent public domain mem leak and malloc problem
-	  detector. To enable dmalloc, before running busybox you will
-	  want to properly set your environment, for example:
-	    export DMALLOC_OPTIONS=debug=0x34f47d83,inter=100,log=logfile
-	  The 'debug=' value is generated using the following command
-	    dmalloc -p log-stats -p log-non-free -p log-bad-space \
-	       -p log-elapsed-time -p check-fence -p check-heap \
-	       -p check-lists -p check-blank -p check-funcs -p realloc-copy \
-	       -p allow-free-null
-
-	  Electric-fence support:
-	  -----------------------
-	  This enables compiling with Electric-fence support. Electric
-	  fence is another very useful malloc debugging library which uses
-	  your computer's virtual memory hardware to detect illegal memory
-	  accesses. This support will make BusyBox be considerable larger
-	  and run slower, so you should leave this option disabled unless
-	  you are hunting a hard to find memory problem.
+	Using an additional debugging library will make busybox become
+	considerably larger and will cause it to run more slowly. You
+	should always leave this option disabled for production use.
+
+	dmalloc support:
+	----------------
+	This enables compiling with dmalloc ( http://dmalloc.com/ )
+	which is an excellent public domain mem leak and malloc problem
+	detector. To enable dmalloc, before running busybox you will
+	want to properly set your environment, for example:
+		export DMALLOC_OPTIONS=debug=0x34f47d83,inter=100,log=logfile
+	The 'debug=' value is generated using the following command
+	dmalloc -p log-stats -p log-non-free -p log-bad-space \
+		-p log-elapsed-time -p check-fence -p check-heap \
+		-p check-lists -p check-blank -p check-funcs -p realloc-copy \
+		-p allow-free-null
+
+	Electric-fence support:
+	-----------------------
+	This enables compiling with Electric-fence support. Electric
+	fence is another very useful malloc debugging library which uses
+	your computer's virtual memory hardware to detect illegal memory
+	accesses. This support will make busybox be considerably larger
+	and run slower, so you should leave this option disabled unless
+	you are hunting a hard to find memory problem.
 
 
 config BUSYBOX_NO_DEBUG_LIB
@@ -686,16 +681,17 @@ config BUSYBOX_EFENCE
 
 endchoice
 
-endmenu
-
 source "config/busybox/libbb/Config.in"
 
+endmenu
+
 comment "Applets"
 
 source "config/busybox/archival/Config.in"
 source "config/busybox/coreutils/Config.in"
 source "config/busybox/console-tools/Config.in"
 source "config/busybox/debianutils/Config.in"
+source "config/busybox/klibc-utils/Config.in"
 source "config/busybox/editors/Config.in"
 source "config/busybox/findutils/Config.in"
 source "config/busybox/init/Config.in"
diff --git a/config/busybox/archival/Config.in b/config/busybox/archival/Config.in
index 750df33c7..6cfee89e2 100644
--- a/config/busybox/archival/Config.in
+++ b/config/busybox/archival/Config.in
@@ -27,212 +27,193 @@ config BUSYBOX_FEATURE_SEAMLESS_Z
 	default n  # it is ancient
 
 config BUSYBOX_AR
-	bool "ar"
+	bool "ar (9.5 kb)"
 	default n  # needs to be improved to be able to replace binutils ar
 	help
-	  ar is an archival utility program used to create, modify, and
-	  extract contents from archives. In practice, it is used exclusively
-	  for object module archives used by compilers.
+	ar is an archival utility program used to create, modify, and
+	extract contents from archives. In practice, it is used exclusively
+	for object module archives used by compilers.
 
-	  On an x86 system, the ar applet adds about 1K.
-
-	  Unless you have a specific application which requires ar, you should
-	  probably say N here: most compilers come with their own ar utility.
+	Unless you have a specific application which requires ar, you should
+	probably say N here: most compilers come with their own ar utility.
 
 config BUSYBOX_FEATURE_AR_LONG_FILENAMES
 	bool "Support long filenames (not needed for debs)"
 	default y
 	depends on BUSYBOX_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.
+	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 BUSYBOX_FEATURE_AR_CREATE
 	bool "Support archive creation"
 	default y
 	depends on BUSYBOX_AR
 	help
-	  This enables archive creation (-c and -r) with busybox ar.
+	This enables archive creation (-c and -r) with busybox ar.
 config BUSYBOX_UNCOMPRESS
-	bool "uncompress"
+	bool "uncompress (7.1 kb)"
 	default n  # ancient
 	help
-	  uncompress is used to decompress archives created by compress.
-	  Not much used anymore, replaced by gzip/gunzip.
+	uncompress is used to decompress archives created by compress.
+	Not much used anymore, replaced by gzip/gunzip.
 config BUSYBOX_GUNZIP
-	bool "gunzip"
+	bool "gunzip (12 kb)"
 	default y
 	select BUSYBOX_FEATURE_GZIP_DECOMPRESS
 	help
-	  gunzip is used to decompress archives created by gzip.
-	  You can use the `-t' option to test the integrity of
-	  an archive, without decompressing it.
+	gunzip is used to decompress archives created by gzip.
+	You can use the '-t' option to test the integrity of
+	an archive, without decompressing it.
 
 config BUSYBOX_ZCAT
-	bool "zcat"
+	bool "zcat (25 kb)"
 	default y
 	select BUSYBOX_FEATURE_GZIP_DECOMPRESS
 	help
-	  Alias to "gunzip -c".
+	Alias to "gunzip -c".
 
 config BUSYBOX_FEATURE_GUNZIP_LONG_OPTIONS
 	bool "Enable long options"
 	default y
 	depends on (BUSYBOX_GUNZIP || BUSYBOX_ZCAT) && BUSYBOX_LONG_OPTS
 config BUSYBOX_BUNZIP2
-	bool "bunzip2"
+	bool "bunzip2 (8.8 kb)"
 	default y
 	select BUSYBOX_FEATURE_BZIP2_DECOMPRESS
 	help
-	  bunzip2 is a compression utility using the Burrows-Wheeler block
-	  sorting text compression algorithm, and Huffman coding. Compression
-	  is generally considerably better than that achieved by more
-	  conventional LZ77/LZ78-based compressors, and approaches the
-	  performance of the PPM family of statistical compressors.
+	bunzip2 is a compression utility using the Burrows-Wheeler block
+	sorting text compression algorithm, and Huffman coding. Compression
+	is generally considerably better than that achieved by more
+	conventional LZ77/LZ78-based compressors, and approaches the
+	performance of the PPM family of statistical compressors.
 
-	  Unless you have a specific application which requires bunzip2, you
-	  should probably say N here.
+	Unless you have a specific application which requires bunzip2, you
+	should probably say N here.
 
 config BUSYBOX_BZCAT
-	bool "bzcat"
+	bool "bzcat (8.8 kb)"
 	default y
 	select BUSYBOX_FEATURE_BZIP2_DECOMPRESS
 	help
-	  Alias to "bunzip2 -c".
+	Alias to "bunzip2 -c".
 config BUSYBOX_UNLZMA
-	bool "unlzma"
+	bool "unlzma (8.6 kb)"
 	default y
 	help
-	  unlzma is a compression utility using the Lempel-Ziv-Markov chain
-	  compression algorithm, and range coding. Compression
-	  is generally considerably better than that achieved by the bzip2
-	  compressors.
-
-	  The BusyBox unlzma applet is limited to decompression only.
-	  On an x86 system, this applet adds about 4K.
+	unlzma is a compression utility using the Lempel-Ziv-Markov chain
+	compression algorithm, and range coding. Compression
+	is generally considerably better than that achieved by the bzip2
+	compressors.
 
 config BUSYBOX_LZCAT
-	bool "lzcat"
+	bool "lzcat (8.5 kb)"
 	default y
 	help
-	  unlzma is a compression utility using the Lempel-Ziv-Markov chain
-	  compression algorithm, and range coding. Compression
-	  is generally considerably better than that achieved by the bzip2
-	  compressors.
-
-	  The BusyBox unlzma applet is limited to decompression only.
-	  On an x86 system, this applet adds about 4K.
+	Alias to "unlzma -c".
 
 config BUSYBOX_LZMA
 	bool "lzma -d"
 	default y
 	help
-	  Enable this option if you want commands like "lzma -d" to work.
-	  IOW: you'll get lzma applet, but it will always require -d option.
-
-config BUSYBOX_FEATURE_LZMA_FAST
-	bool "Optimize for speed"
-	default n
-	depends on BUSYBOX_UNLZMA || BUSYBOX_LZCAT || BUSYBOX_LZMA
-	help
-	  This option reduces decompression time by about 25% at the cost of
-	  a 1K bigger binary.
+	Enable this option if you want commands like "lzma -d" to work.
+	IOW: you'll get lzma applet, but it will always require -d option.
 config BUSYBOX_UNXZ
-	bool "unxz"
+	bool "unxz (13 kb)"
 	default y
 	help
-	  unxz is a unlzma successor.
+	unxz is a unlzma successor.
 
 config BUSYBOX_XZCAT
-	bool "xzcat"
+	bool "xzcat (13 kb)"
 	default y
 	help
-	  Alias to "unxz -c".
+	Alias to "unxz -c".
 
 config BUSYBOX_XZ
 	bool "xz -d"
 	default y
 	help
-	  Enable this option if you want commands like "xz -d" to work.
-	  IOW: you'll get xz applet, but it will always require -d option.
+	Enable this option if you want commands like "xz -d" to work.
+	IOW: you'll get xz applet, but it will always require -d option.
 config BUSYBOX_BZIP2
-	bool "bzip2"
+	bool "bzip2 (18 kb)"
 	default y
 	help
-	  bzip2 is a compression utility using the Burrows-Wheeler block
-	  sorting text compression algorithm, and Huffman coding. Compression
-	  is generally considerably better than that achieved by more
-	  conventional LZ77/LZ78-based compressors, and approaches the
-	  performance of the PPM family of statistical compressors.
+	bzip2 is a compression utility using the Burrows-Wheeler block
+	sorting text compression algorithm, and Huffman coding. Compression
+	is generally considerably better than that achieved by more
+	conventional LZ77/LZ78-based compressors, and approaches the
+	performance of the PPM family of statistical compressors.
 
-	  Unless you have a specific application which requires bzip2, you
-	  should probably say N here.
+	Unless you have a specific application which requires bzip2, you
+	should probably say N here.
 
 config BUSYBOX_FEATURE_BZIP2_DECOMPRESS
 	bool "Enable decompression"
 	default y
 	depends on BUSYBOX_BZIP2 || BUSYBOX_BUNZIP2 || BUSYBOX_BZCAT
 	help
-	  Enable -d (--decompress) and -t (--test) options for bzip2.
-	  This will be automatically selected if bunzip2 or bzcat is
-	  enabled.
+	Enable -d (--decompress) and -t (--test) options for bzip2.
+	This will be automatically selected if bunzip2 or bzcat is
+	enabled.
 config BUSYBOX_CPIO
-	bool "cpio"
+	bool "cpio (14 kb)"
 	default y
 	help
-	  cpio is an archival utility program used to create, modify, and
-	  extract contents from archives.
-	  cpio has 110 bytes of overheads for every stored file.
+	cpio is an archival utility program used to create, modify, and
+	extract contents from archives.
+	cpio has 110 bytes of overheads for every stored file.
 
-	  This implementation of cpio can extract cpio archives created in the
-	  "newc" or "crc" format.
+	This implementation of cpio can extract cpio archives created in the
+	"newc" or "crc" format.
 
-	  Unless you have a specific application which requires cpio, you
-	  should probably say N here.
+	Unless you have a specific application which requires cpio, you
+	should probably say N here.
 
 config BUSYBOX_FEATURE_CPIO_O
 	bool "Support archive creation"
 	default y
 	depends on BUSYBOX_CPIO
 	help
-	  This implementation of cpio can create cpio archives in the "newc"
-	  format only.
+	This implementation of cpio can create cpio archives in the "newc"
+	format only.
 
 config BUSYBOX_FEATURE_CPIO_P
 	bool "Support passthrough mode"
 	default y
 	depends on BUSYBOX_FEATURE_CPIO_O
 	help
-	  Passthrough mode. Rarely used.
+	Passthrough mode. Rarely used.
 config BUSYBOX_DPKG
-	bool "dpkg"
+	bool "dpkg (44 kb)"
 	default y
 	select BUSYBOX_FEATURE_SEAMLESS_GZ
 	help
-	  dpkg is a medium-level tool to install, build, remove and manage
-	  Debian packages.
+	dpkg is a medium-level tool to install, build, remove and manage
+	Debian packages.
 
-	  This implementation of dpkg has a number of limitations,
-	  you should use the official dpkg if possible.
+	This implementation of dpkg has a number of limitations,
+	you should use the official dpkg if possible.
 config BUSYBOX_DPKG_DEB
 	bool "dpkg_deb"
 	default y
 	select BUSYBOX_FEATURE_SEAMLESS_GZ
 	help
-	  dpkg-deb unpacks and provides information about Debian archives.
+	dpkg-deb unpacks and provides information about Debian archives.
 
-	  This implementation of dpkg-deb cannot pack archives.
+	This implementation of dpkg-deb cannot pack archives.
 
-	  Unless you have a specific application which requires dpkg-deb,
-	  say N here.
+	Unless you have a specific application which requires dpkg-deb,
+	say N here.
 config BUSYBOX_GZIP
-	bool "gzip"
+	bool "gzip (19 kb)"
 	default y
 	help
-	  gzip is used to compress files.
-	  It's probably the most widely used UNIX compression program.
+	gzip is used to compress files.
+	It's probably the most widely used UNIX compression program.
 
 config BUSYBOX_FEATURE_GZIP_LONG_OPTIONS
 	bool "Enable long options"
@@ -245,73 +226,73 @@ config BUSYBOX_GZIP_FAST
 	range 0 2
 	depends on BUSYBOX_GZIP
 	help
-	  Enable big memory options for gzip.
-	  0: small buffers, small hash-tables
-	  1: larger buffers, larger hash-tables
-	  2: larger buffers, largest hash-tables
-	  Larger models may give slightly better compression
+	Enable big memory options for gzip.
+	0: small buffers, small hash-tables
+	1: larger buffers, larger hash-tables
+	2: larger buffers, largest hash-tables
+	Larger models may give slightly better compression
 
 config BUSYBOX_FEATURE_GZIP_LEVELS
 	bool "Enable compression levels"
 	default n
 	depends on BUSYBOX_GZIP
 	help
-	  Enable support for compression levels 4-9. The default level
-	  is 6. If levels 1-3 are specified, 4 is used.
-	  If this option is not selected, -N options are ignored and -9
-	  is used.
+	Enable support for compression levels 4-9. The default level
+	is 6. If levels 1-3 are specified, 4 is used.
+	If this option is not selected, -N options are ignored and -9
+	is used.
 
 config BUSYBOX_FEATURE_GZIP_DECOMPRESS
 	bool "Enable decompression"
 	default y
 	depends on BUSYBOX_GZIP || BUSYBOX_GUNZIP || BUSYBOX_ZCAT
 	help
-	  Enable -d (--decompress) and -t (--test) options for gzip.
-	  This will be automatically selected if gunzip or zcat is
-	  enabled.
+	Enable -d (--decompress) and -t (--test) options for gzip.
+	This will be automatically selected if gunzip or zcat is
+	enabled.
 config BUSYBOX_LZOP
-	bool "lzop"
+	bool "lzop (13 kb)"
 	default y
 	help
-	  Lzop compression/decompresion.
+	Lzop compression/decompresion.
 
 config BUSYBOX_UNLZOP
-	bool "unlzop"
+	bool "unlzop (13 kb)"
 	default n  # INCOMPAT: upstream lzop does not provide such tool
 	help
-	  Lzop decompresion.
+	Lzop decompresion.
 
 config BUSYBOX_LZOPCAT
-	bool "lzopcat"
+	bool "lzopcat (13 kb)"
 	default n  # INCOMPAT: upstream lzop does not provide such tool
 	help
-	  Alias to "unlzop -c".
+	Alias to "lzop -dc".
 
 config BUSYBOX_LZOP_COMPR_HIGH
 	bool "lzop compression levels 7,8,9 (not very useful)"
 	default n
 	depends on BUSYBOX_LZOP || BUSYBOX_UNLZOP || BUSYBOX_LZOPCAT
 	help
-	  High levels (7,8,9) of lzop compression. These levels
-	  are actually slower than gzip at equivalent compression ratios
-	  and take up 3.2K of code.
+	High levels (7,8,9) of lzop compression. These levels
+	are actually slower than gzip at equivalent compression ratios
+	and take up 3.2K of code.
 config BUSYBOX_RPM
-	bool "rpm"
+	bool "rpm (33 kb)"
 	default y
 	help
-	  Mini RPM applet - queries and extracts RPM packages.
+	Mini RPM applet - queries and extracts RPM packages.
 config BUSYBOX_RPM2CPIO
-	bool "rpm2cpio"
+	bool "rpm2cpio (20 kb)"
 	default y
 	help
-	  Converts a RPM file into a CPIO archive.
+	Converts a RPM file into a CPIO archive.
 config BUSYBOX_TAR
-	bool "tar"
+	bool "tar (40 kb)"
 	default y
 	help
-	  tar is an archiving program. It's commonly used with gzip to
-	  create compressed archives. It's probably the most widely used
-	  UNIX archive program.
+	tar is an archiving program. It's commonly used with gzip to
+	create compressed archives. It's probably the most widely used
+	UNIX archive program.
 
 config BUSYBOX_FEATURE_TAR_LONG_OPTIONS
 	bool "Enable long options"
@@ -328,35 +309,35 @@ config BUSYBOX_FEATURE_TAR_AUTODETECT
 	default y
 	depends on BUSYBOX_TAR && (BUSYBOX_FEATURE_SEAMLESS_Z || BUSYBOX_FEATURE_SEAMLESS_GZ || BUSYBOX_FEATURE_SEAMLESS_BZ2 || BUSYBOX_FEATURE_SEAMLESS_LZMA || BUSYBOX_FEATURE_SEAMLESS_XZ)
 	help
-	  With this option tar can automatically detect compressed
-	  tarballs. Currently it works only on files (not pipes etc).
+	With this option tar can automatically detect compressed
+	tarballs. Currently it works only on files (not pipes etc).
 
 config BUSYBOX_FEATURE_TAR_FROM
-	bool "Enable -X (exclude from) and -T (include from) options)"
+	bool "Enable -X (exclude from) and -T (include from) options"
 	default y
 	depends on BUSYBOX_TAR
 	help
-	  If you enable this option you'll be able to specify
-	  a list of files to include or exclude from an archive.
+	If you enable this option you'll be able to specify
+	a list of files to include or exclude from an archive.
 
 config BUSYBOX_FEATURE_TAR_OLDGNU_COMPATIBILITY
 	bool "Support old tar header format"
 	default y
 	depends on BUSYBOX_TAR || BUSYBOX_DPKG
 	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.
+	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 BUSYBOX_FEATURE_TAR_OLDSUN_COMPATIBILITY
 	bool "Enable untarring of tarballs with checksums produced by buggy Sun tar"
 	default y
 	depends on BUSYBOX_TAR || BUSYBOX_DPKG
 	help
-	  This option is required to unpack archives created by some old
-	  version of Sun's tar (it was calculating checksum using signed
-	  arithmetic). It is said to be fixed in newer Sun tar, but "old"
-	  tarballs still exist.
+	This option is required to unpack archives created by some old
+	version of Sun's tar (it was calculating checksum using signed
+	arithmetic). It is said to be fixed in newer Sun tar, but "old"
+	tarballs still exist.
 
 config BUSYBOX_FEATURE_TAR_GNU_EXTENSIONS
 	bool "Support GNU tar extensions (long filenames)"
@@ -368,18 +349,18 @@ config BUSYBOX_FEATURE_TAR_TO_COMMAND
 	default y
 	depends on BUSYBOX_TAR && BUSYBOX_FEATURE_TAR_LONG_OPTIONS
 	help
-	  If you enable this option you'll be able to instruct tar to send
-	  the contents of each extracted file to the standard input of an
-	  external program.
+	If you enable this option you'll be able to instruct tar to send
+	the contents of each extracted file to the standard input of an
+	external program.
 
 config BUSYBOX_FEATURE_TAR_UNAME_GNAME
 	bool "Enable use of user and group names"
 	default y
 	depends on BUSYBOX_TAR
 	help
-	  Enable use of user and group names in tar. This affects contents
-	  listings (-t) and preserving permissions when unpacking (-p).
-	  +200 bytes.
+	Enable use of user and group names in tar. This affects contents
+	listings (-t) and preserving permissions when unpacking (-p).
+	+200 bytes.
 
 config BUSYBOX_FEATURE_TAR_NOPRESERVE_TIME
 	bool "Enable -m (do not preserve time) GNU option"
@@ -391,26 +372,26 @@ config BUSYBOX_FEATURE_TAR_SELINUX
 	default n
 	depends on BUSYBOX_TAR && BUSYBOX_SELINUX
 	help
-	  With this option busybox supports restoring SELinux labels
-	  when extracting files from tar archives.
+	With this option busybox supports restoring SELinux labels
+	when extracting files from tar archives.
 config BUSYBOX_UNZIP
-	bool "unzip"
+	bool "unzip (24 kb)"
 	default y
 	help
-	  unzip will list or extract files from a ZIP archive,
-	  commonly found on DOS/WIN systems. The default behavior
-	  (with no options) is to extract the archive into the
-	  current directory.
+	unzip will list or extract files from a ZIP archive,
+	commonly found on DOS/WIN systems. The default behavior
+	(with no options) is to extract the archive into the
+	current directory.
 
 config BUSYBOX_FEATURE_UNZIP_CDF
 	bool "Read and use Central Directory data"
 	default y
 	depends on BUSYBOX_UNZIP
 	help
-	  If you know that you only need to deal with simple
-	  ZIP files without deleted/updated files, SFX archives etc,
-	  you can reduce code size by unselecting this option.
-	  To support less trivial ZIPs, say Y.
+	If you know that you only need to deal with simple
+	ZIP files without deleted/updated files, SFX archives etc,
+	you can reduce code size by unselecting this option.
+	To support less trivial ZIPs, say Y.
 
 config BUSYBOX_FEATURE_UNZIP_BZIP2
 	bool "Support compression method 12 (bzip2)"
@@ -427,4 +408,12 @@ config BUSYBOX_FEATURE_UNZIP_XZ
 	default y
 	depends on BUSYBOX_FEATURE_UNZIP_CDF && BUSYBOX_DESKTOP
 
+config BUSYBOX_FEATURE_LZMA_FAST
+	bool "Optimize lzma for speed"
+	default n
+	depends on BUSYBOX_UNLZMA || BUSYBOX_LZCAT || BUSYBOX_LZMA || BUSYBOX_FEATURE_SEAMLESS_LZMA
+	help
+	This option reduces decompression time by about 25% at the cost of
+	a 1K bigger binary.
+
 endmenu
diff --git a/config/busybox/console-tools/Config.in b/config/busybox/console-tools/Config.in
index 331a09af0..c311e36fe 100644
--- a/config/busybox/console-tools/Config.in
+++ b/config/busybox/console-tools/Config.in
@@ -7,70 +7,70 @@
 menu "Console Utilities"
 
 config BUSYBOX_CHVT
-	bool "chvt"
+	bool "chvt (2 kb)"
 	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  This program is used to change to another terminal.
-	  Example: chvt 4 (change to terminal /dev/tty4)
+	This program is used to change to another terminal.
+	Example: chvt 4 (change to terminal /dev/tty4)
 config BUSYBOX_CLEAR
-	bool "clear"
+	bool "clear (tiny)"
 	default y
 	help
-	  This program clears the terminal screen.
+	This program clears the terminal screen.
 config BUSYBOX_DEALLOCVT
-	bool "deallocvt"
+	bool "deallocvt (1.9 kb)"
 	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  This program deallocates unused virtual consoles.
+	This program deallocates unused virtual consoles.
 config BUSYBOX_DUMPKMAP
-	bool "dumpkmap"
+	bool "dumpkmap (1.3 kb)"
 	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  This program dumps the kernel's keyboard translation table to
-	  stdout, in binary format. You can then use loadkmap to load it.
+	This program dumps the kernel's keyboard translation table to
+	stdout, in binary format. You can then use loadkmap to load it.
 config BUSYBOX_FGCONSOLE
-	bool "fgconsole"
+	bool "fgconsole (1.6 kb)"
 	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  This program prints active (foreground) console number.
+	This program prints active (foreground) console number.
 config BUSYBOX_KBD_MODE
-	bool "kbd_mode"
+	bool "kbd_mode (4 kb)"
 	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  This program reports and sets keyboard mode.
+	This program reports and sets keyboard mode.
 config BUSYBOX_LOADFONT
-	bool "loadfont"
+	bool "loadfont (5.4 kb)"
 	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  This program loads a console font from standard input.
+	This program loads a console font from standard input.
 
 config BUSYBOX_SETFONT
-	bool "setfont"
+	bool "setfont (26 kb)"
 	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  Allows to load console screen map. Useful for i18n.
+	Allows to load console screen map. Useful for i18n.
 
 config BUSYBOX_FEATURE_SETFONT_TEXTUAL_MAP
 	bool "Support reading textual screen maps"
 	default y
 	depends on BUSYBOX_SETFONT
 	help
-	  Support reading textual screen maps.
+	Support reading textual screen maps.
 
 config BUSYBOX_DEFAULT_SETFONT_DIR
 	string "Default directory for console-tools files"
 	default ""
 	depends on BUSYBOX_SETFONT
 	help
-	  Directory to use if setfont's params are simple filenames
-	  (not /path/to/file or ./file). Default is "" (no default directory).
+	Directory to use if setfont's params are simple filenames
+	(not /path/to/file or ./file). Default is "" (no default directory).
 
 comment "Common options for loadfont and setfont"
 	depends on BUSYBOX_LOADFONT || BUSYBOX_SETFONT
@@ -85,71 +85,73 @@ config BUSYBOX_FEATURE_LOADFONT_RAW
 	default y
 	depends on BUSYBOX_LOADFONT || BUSYBOX_SETFONT
 config BUSYBOX_LOADKMAP
-	bool "loadkmap"
+	bool "loadkmap (1.5 kb)"
 	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  This program loads a keyboard translation table from
-	  standard input.
+	This program loads a keyboard translation table from
+	standard input.
 config BUSYBOX_OPENVT
-	bool "openvt"
+	bool "openvt (7 kb)"
 	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  This program is used to start a command on an unused
-	  virtual terminal.
+	This program is used to start a command on an unused
+	virtual terminal.
 config BUSYBOX_RESET
-	bool "reset"
+	bool "reset (275 bytes)"
 	default y
 	help
-	  This program is used to reset the terminal screen, if it
-	  gets messed up.
+	This program is used to reset the terminal screen, if it
+	gets messed up.
 config BUSYBOX_RESIZE
-	bool "resize"
+	bool "resize (756 bytes)"
 	default y
 	help
-	  This program is used to (re)set the width and height of your current
-	  terminal.
+	This program is used to (re)set the width and height of your current
+	terminal.
 
 config BUSYBOX_FEATURE_RESIZE_PRINT
 	bool "Print environment variables"
 	default y
 	depends on BUSYBOX_RESIZE
 	help
-	  Prints the newly set size (number of columns and rows) of
-	  the terminal.
-	  E.g.:
-	  COLUMNS=80;LINES=44;export COLUMNS LINES;
+	Prints the newly set size (number of columns and rows) of
+	the terminal.
+	E.g.:
+	COLUMNS=80;LINES=44;export COLUMNS LINES;
 config BUSYBOX_SETCONSOLE
-	bool "setconsole"
+	bool "setconsole (3.7 kb)"
 	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  This program redirects the system console to another device,
-	  like the current tty while logged in via telnet.
+	Redirect writes to /dev/console to another device,
+	like the current tty while logged in via telnet.
+	This does not redirect kernel log, only writes
+	from user space.
 
 config BUSYBOX_FEATURE_SETCONSOLE_LONG_OPTIONS
 	bool "Enable long options"
 	default y
 	depends on BUSYBOX_SETCONSOLE && BUSYBOX_LONG_OPTS
 config BUSYBOX_SETKEYCODES
-	bool "setkeycodes"
+	bool "setkeycodes (1.7 kb)"
 	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  This program loads entries into the kernel's scancode-to-keycode
-	  map, allowing unusual keyboards to generate usable keycodes.
+	This program loads entries into the kernel's scancode-to-keycode
+	map, allowing unusual keyboards to generate usable keycodes.
 config BUSYBOX_SETLOGCONS
-	bool "setlogcons"
+	bool "setlogcons (1.8 kb)"
 	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  This program redirects the output console of kernel messages.
+	This program redirects the output console of kernel messages.
 config BUSYBOX_SHOWKEY
-	bool "showkey"
+	bool "showkey (4.7 kb)"
 	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  Shows keys pressed.
+	Shows keys pressed.
 
 endmenu
diff --git a/config/busybox/coreutils/Config.in b/config/busybox/coreutils/Config.in
index f8dd7b0aa..49793ab98 100644
--- a/config/busybox/coreutils/Config.in
+++ b/config/busybox/coreutils/Config.in
@@ -7,217 +7,224 @@
 menu "Coreutils"
 
 config BUSYBOX_BASENAME
-	bool "basename"
+	bool "basename (371 bytes)"
 	default y
 	help
-	  basename is used to strip the directory and suffix from filenames,
-	  leaving just the filename itself. Enable this option if you wish
-	  to enable the 'basename' utility.
+	basename is used to strip the directory and suffix from filenames,
+	leaving just the filename itself. Enable this option if you wish
+	to enable the 'basename' utility.
 config BUSYBOX_CAT
-	bool "cat"
+	bool "cat (5.6 kb)"
 	default y
 	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.
+	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 BUSYBOX_FEATURE_CATN
+	bool "Enable -n and -b options"
+	default y
+	depends on BUSYBOX_CAT
+	help
+	-n numbers all output lines while -b numbers nonempty output lines.
 
 config BUSYBOX_FEATURE_CATV
 	bool "cat -v[etA]"
 	default y
 	depends on BUSYBOX_CAT
 	help
-	  Display nonprinting characters as escape sequences
+	Display nonprinting characters as escape sequences
 config BUSYBOX_CHGRP
-	bool "chgrp"
+	bool "chgrp (7.2 kb)"
 	default y
 	help
-	  chgrp is used to change the group ownership of files.
+	chgrp is used to change the group ownership of files.
 config BUSYBOX_CHMOD
-	bool "chmod"
+	bool "chmod (5.1 kb)"
 	default y
 	help
-	  chmod is used to change the access permission of files.
+	chmod is used to change the access permission of files.
 config BUSYBOX_CHOWN
-	bool "chown"
+	bool "chown (7.2 kb)"
 	default y
 	help
-	  chown is used to change the user and/or group ownership
-	  of files.
+	chown is used to change the user and/or group ownership
+	of files.
 
 config BUSYBOX_FEATURE_CHOWN_LONG_OPTIONS
 	bool "Enable long options"
 	default y
 	depends on BUSYBOX_CHOWN && BUSYBOX_LONG_OPTS
 config BUSYBOX_CHROOT
-	bool "chroot"
+	bool "chroot (3.7 kb)"
 	default y
 	help
-	  chroot is used to change the root directory and run a command.
-	  The default command is `/bin/sh'.
+	chroot is used to change the root directory and run a command.
+	The default command is '/bin/sh'.
 config BUSYBOX_CKSUM
-	bool "cksum"
+	bool "cksum (4.2 kb)"
 	default y
 	help
-	  cksum is used to calculate the CRC32 checksum of a file.
+	cksum is used to calculate the CRC32 checksum of a file.
 config BUSYBOX_COMM
-	bool "comm"
+	bool "comm (3.9 kb)"
 	default y
 	help
-	  comm is used to compare two files line by line and return
-	  a three-column output.
+	comm is used to compare two files line by line and return
+	a three-column output.
 config BUSYBOX_CP
-	bool "cp"
+	bool "cp (9.7 kb)"
 	default y
 	help
-	  cp is used to copy files and directories.
+	cp is used to copy files and directories.
 
 config BUSYBOX_FEATURE_CP_LONG_OPTIONS
 	bool "Enable long options"
 	default y
 	depends on BUSYBOX_CP && BUSYBOX_LONG_OPTS
 	help
-	  Enable long options.
-	  Also add support for --parents option.
+	Enable long options.
+	Also add support for --parents option.
 config BUSYBOX_CUT
-	bool "cut"
+	bool "cut (5.3 kb)"
 	default y
 	help
-	  cut is used to print selected parts of lines from
-	  each file to stdout.
+	cut is used to print selected parts of lines from
+	each file to stdout.
 config BUSYBOX_DATE
-	bool "date"
+	bool "date (7.1 kb)"
 	default y
 	help
-	  date is used to set the system date or display the
-	  current time in the given format.
+	date is used to set the system date or display the
+	current time in the given format.
 
 config BUSYBOX_FEATURE_DATE_ISOFMT
 	bool "Enable ISO date format output (-I)"
 	default y
 	depends on BUSYBOX_DATE
 	help
-	  Enable option (-I) to output an ISO-8601 compliant
-	  date/time string.
+	Enable option (-I) to output an ISO-8601 compliant
+	date/time string.
 
 # defaults to "no": stat's nanosecond field is a bit non-portable
 config BUSYBOX_FEATURE_DATE_NANO
 	bool "Support %[num]N nanosecond format specifier"
-	default n
-	depends on BUSYBOX_DATE  # syscall(__NR_clock_gettime)
+	default n  # syscall(__NR_clock_gettime)
+	depends on BUSYBOX_DATE
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  Support %[num]N format specifier. Adds ~250 bytes of code.
+	Support %[num]N format specifier. Adds ~250 bytes of code.
 
 config BUSYBOX_FEATURE_DATE_COMPAT
 	bool "Support weird 'date MMDDhhmm[[YY]YY][.ss]' format"
 	default y
 	depends on BUSYBOX_DATE
 	help
-	  System time can be set by 'date -s DATE' and simply 'date DATE',
-	  but formats of DATE string are different. 'date DATE' accepts
-	  a rather weird MMDDhhmm[[YY]YY][.ss] format with completely
-	  unnatural placement of year between minutes and seconds.
-	  date -s (and other commands like touch -d) use more sensible
-	  formats (for one, ISO format YYYY-MM-DD hh:mm:ss.ssssss).
+	System time can be set by 'date -s DATE' and simply 'date DATE',
+	but formats of DATE string are different. 'date DATE' accepts
+	a rather weird MMDDhhmm[[YY]YY][.ss] format with completely
+	unnatural placement of year between minutes and seconds.
+	date -s (and other commands like touch -d) use more sensible
+	formats (for one, ISO format YYYY-MM-DD hh:mm:ss.ssssss).
 
-	  With this option off, 'date DATE' is 'date -s DATE' support
-	  the same format. With it on, 'date DATE' additionally supports
-	  MMDDhhmm[[YY]YY][.ss] format.
+	With this option off, 'date DATE' is 'date -s DATE' support
+	the same format. With it on, 'date DATE' additionally supports
+	MMDDhhmm[[YY]YY][.ss] format.
 config BUSYBOX_DD
-	bool "dd"
+	bool "dd (7.1 kb)"
 	default y
 	help
-	  dd copies a file (from standard input to standard output,
-	  by default) using specific input and output blocksizes,
-	  while optionally performing conversions on it.
+	dd copies a file (from standard input to standard output,
+	by default) using specific input and output blocksizes,
+	while optionally performing conversions on it.
 
 config BUSYBOX_FEATURE_DD_SIGNAL_HANDLING
 	bool "Enable signal handling for status reporting"
 	default y
 	depends on BUSYBOX_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.
+	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
+	$ dd if=/dev/zero of=/dev/null &
+	$ pid=$!; kill -USR1 $pid; sleep 1; kill $pid
+	10899206+0 records in
+	10899206+0 records out
 
 config BUSYBOX_FEATURE_DD_THIRD_STATUS_LINE
 	bool "Enable the third status line upon signal"
 	default y
 	depends on BUSYBOX_DD && BUSYBOX_FEATURE_DD_SIGNAL_HANDLING
 	help
-	  Displays a coreutils-like third status line with transferred bytes,
-	  elapsed time and speed.
+	Displays a coreutils-like third status line with transferred bytes,
+	elapsed time and speed.
 
 config BUSYBOX_FEATURE_DD_IBS_OBS
 	bool "Enable ibs, obs and conv options"
 	default y
 	depends on BUSYBOX_DD
 	help
-	  Enable support for writing a certain number of bytes in and out,
-	  at a time, and performing conversions on the data stream.
+	Enable support for writing a certain number of bytes in and out,
+	at a time, and performing conversions on the data stream.
 
 config BUSYBOX_FEATURE_DD_STATUS
 	bool "Enable status display options"
 	default y
 	depends on BUSYBOX_DD
 	help
-	  Enable support for status=noxfer/none option.
+	Enable support for status=noxfer/none option.
 config BUSYBOX_DF
-	bool "df"
+	bool "df (7.5 kb)"
 	default y
 	help
-	  df reports the amount of disk space used and available
-	  on filesystems.
+	df reports the amount of disk space used and available
+	on filesystems.
 
 config BUSYBOX_FEATURE_DF_FANCY
 	bool "Enable -a, -i, -B"
 	default y
 	depends on BUSYBOX_DF
 	help
-	  -a Show all filesystems
-	  -i Inodes
-	  -B <SIZE> Blocksize
+	-a Show all filesystems
+	-i Inodes
+	-B <SIZE> Blocksize
 config BUSYBOX_DIRNAME
-	bool "dirname"
+	bool "dirname (289 bytes)"
 	default y
 	help
-	  dirname is used to strip a non-directory suffix from
-	  a file name.
+	dirname is used to strip a non-directory suffix from
+	a file name.
 config BUSYBOX_DOS2UNIX
-	bool "dos2unix"
+	bool "dos2unix (5.1 kb)"
 	default y
 	help
-	  dos2unix is used to convert a text file from DOS format to
-	  UNIX format, and vice versa.
+	dos2unix is used to convert a text file from DOS format to
+	UNIX format, and vice versa.
 
 config BUSYBOX_UNIX2DOS
-	bool "unix2dos"
+	bool "unix2dos (5.1 kb)"
 	default y
 	help
-	  unix2dos is used to convert a text file from UNIX format to
-	  DOS format, and vice versa.
+	unix2dos is used to convert a text file from UNIX format to
+	DOS format, and vice versa.
 config BUSYBOX_DU
 	bool "du (default blocksize of 512 bytes)"
 	default y
 	help
-	  du is used to report the amount of disk space used
-	  for specified files.
+	du is used to report the amount of disk space used
+	for specified files.
 
 config BUSYBOX_FEATURE_DU_DEFAULT_BLOCKSIZE_1K
 	bool "Use a default blocksize of 1024 bytes (1K)"
 	default y
 	depends on BUSYBOX_DU
 	help
-	  Use a blocksize of (1K) instead of the default 512b.
+	Use a blocksize of (1K) instead of the default 512b.
 config BUSYBOX_ECHO
 	bool "echo (basic SuSv3 version taking no options)"
 	default y
 	help
-	  echo is used to print a specified string to stdout.
+	echo is used to print a specified string to stdout.
 
 # this entry also appears in shell/Config.in, next to the echo builtin
 config BUSYBOX_FEATURE_FANCY_ECHO
@@ -225,131 +232,116 @@ config BUSYBOX_FEATURE_FANCY_ECHO
 	default y
 	depends on BUSYBOX_ECHO || BUSYBOX_ASH_ECHO || BUSYBOX_HUSH_ECHO
 config BUSYBOX_ENV
-	bool "env"
+	bool "env (3.8 kb)"
 	default y
 	help
-	  env is used to set an environment variable and run
-	  a command; without options it displays the current
-	  environment.
-
-config BUSYBOX_FEATURE_ENV_LONG_OPTIONS
-	bool "Enable long options"
-	default y
-	depends on BUSYBOX_ENV && BUSYBOX_LONG_OPTS
+	env is used to set an environment variable and run
+	a command; without options it displays the current
+	environment.
 config BUSYBOX_EXPAND
-	bool "expand"
+	bool "expand (5.8 kb)"
 	default y
 	help
-	  By default, convert all tabs to spaces.
-
-config BUSYBOX_FEATURE_EXPAND_LONG_OPTIONS
-	bool "Enable long options"
-	default y
-	depends on BUSYBOX_EXPAND && BUSYBOX_LONG_OPTS
+	By default, convert all tabs to spaces.
 
 config BUSYBOX_UNEXPAND
-	bool "unexpand"
+	bool "unexpand (6 kb)"
 	default y
 	help
-	  By default, convert only leading sequences of blanks to tabs.
-
-config BUSYBOX_FEATURE_UNEXPAND_LONG_OPTIONS
-	bool "Enable long options"
-	default y
-	depends on BUSYBOX_UNEXPAND && BUSYBOX_LONG_OPTS
+	By default, convert only leading sequences of blanks to tabs.
 config BUSYBOX_EXPR
-	bool "expr"
+	bool "expr (6.1 kb)"
 	default y
 	help
-	  expr is used to calculate numbers and print the result
-	  to standard output.
+	expr is used to calculate numbers and print the result
+	to standard output.
 
 config BUSYBOX_EXPR_MATH_SUPPORT_64
 	bool "Extend Posix numbers support to 64 bit"
 	default y
 	depends on BUSYBOX_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.
+	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 BUSYBOX_FACTOR
-	bool "factor"
+	bool "factor (2.6 kb)"
 	default y
 	help
-	  factor factorizes integers
+	factor factorizes integers
 config BUSYBOX_FALSE
-	bool "false"
+	bool "false (tiny)"
 	default y
 	help
-	  false returns an exit code of FALSE (1).
+	false returns an exit code of FALSE (1).
 config BUSYBOX_FOLD
-	bool "fold"
+	bool "fold (4.6 kb)"
 	default y
 	help
-	  Wrap text to fit a specific width.
+	Wrap text to fit a specific width.
 config BUSYBOX_FSYNC
-	bool "fsync"
+	bool "fsync (3.7 kb)"
 	default y
 	help
-	  fsync is used to flush file-related cached blocks to disk.
+	fsync is used to flush file-related cached blocks to disk.
 config BUSYBOX_HEAD
-	bool "head"
+	bool "head (3.7 kb)"
 	default y
 	help
-	  head is used to print the first specified number of lines
-	  from files.
+	head is used to print the first specified number of lines
+	from files.
 
 config BUSYBOX_FEATURE_FANCY_HEAD
 	bool "Enable -c, -q, and -v"
 	default y
 	depends on BUSYBOX_HEAD
 config BUSYBOX_HOSTID
-	bool "hostid"
+	bool "hostid (247 bytes)"
 	default y
 	help
-	  hostid prints the numeric identifier (in hexadecimal) for
-	  the current host.
+	hostid prints the numeric identifier (in hexadecimal) for
+	the current host.
 config BUSYBOX_ID
-	bool "id"
+	bool "id (6.7 kb)"
 	default y
 	help
-	  id displays the current user and group ID names.
+	id displays the current user and group ID names.
 
 config BUSYBOX_GROUPS
-	bool "groups"
+	bool "groups (6.5 kb)"
 	default y
 	help
-	  Print the group names associated with current user id.
+	Print the group names associated with current user id.
 config BUSYBOX_INSTALL
-	bool "install"
+	bool "install (12 kb)"
 	default y
 	help
-	  Copy files and set attributes.
+	Copy files and set attributes.
 
 config BUSYBOX_FEATURE_INSTALL_LONG_OPTIONS
 	bool "Enable long options"
 	default y
 	depends on BUSYBOX_INSTALL && BUSYBOX_LONG_OPTS
 config BUSYBOX_LINK
-	bool "link"
+	bool "link (3.1 kb)"
 	default y
 	help
-	  link creates hard links between files.
+	link creates hard links between files.
 config BUSYBOX_LN
-	bool "ln"
+	bool "ln (4.5 kb)"
 	default y
 	help
-	  ln is used to create hard or soft links between files.
+	ln is used to create hard or soft links between files.
 config BUSYBOX_LOGNAME
-	bool "logname"
+	bool "logname (894 bytes)"
 	default y
 	help
-	  logname is used to print the current user's login name.
+	logname is used to print the current user's login name.
 config BUSYBOX_LS
-	bool "ls"
+	bool "ls (14 kb)"
 	default y
 	help
-	  ls is used to list the contents of directories.
+	ls is used to list the contents of directories.
 
 config BUSYBOX_FEATURE_LS_FILETYPES
 	bool "Enable filetyping options (-p and -F)"
@@ -376,68 +368,68 @@ config BUSYBOX_FEATURE_LS_SORTFILES
 	default y
 	depends on BUSYBOX_LS
 	help
-	  Allow ls to sort file names alphabetically.
+	Allow ls to sort file names alphabetically.
 
 config BUSYBOX_FEATURE_LS_TIMESTAMPS
 	bool "Show file timestamps"
 	default y
 	depends on BUSYBOX_LS
 	help
-	  Allow ls to display timestamps for files.
+	Allow ls to display timestamps for files.
 
 config BUSYBOX_FEATURE_LS_USERNAME
 	bool "Show username/groupnames"
 	default y
 	depends on BUSYBOX_LS
 	help
-	  Allow ls to display username/groupname for files.
+	Allow ls to display username/groupname for files.
 
 config BUSYBOX_FEATURE_LS_COLOR
 	bool "Allow use of color to identify file types"
 	default y
 	depends on BUSYBOX_LS && BUSYBOX_LONG_OPTS
 	help
-	  This enables the --color option to ls.
+	This enables the --color option to ls.
 
 config BUSYBOX_FEATURE_LS_COLOR_IS_DEFAULT
 	bool "Produce colored ls output by default"
 	default y
 	depends on BUSYBOX_FEATURE_LS_COLOR
 	help
-	  Saying yes here will turn coloring on by default,
-	  even if no "--color" option is given to the ls command.
-	  This is not recommended, since the colors are not
-	  configurable, and the output may not be legible on
-	  many output screens.
+	Saying yes here will turn coloring on by default,
+	even if no "--color" option is given to the ls command.
+	This is not recommended, since the colors are not
+	configurable, and the output may not be legible on
+	many output screens.
 config BUSYBOX_MD5SUM
-	bool "md5sum"
+	bool "md5sum (6.8 kb)"
 	default y
 	help
-	  md5sum is used to print or check MD5 checksums.
+	md5sum is used to print or check MD5 checksums.
 
 config BUSYBOX_SHA1SUM
-	bool "sha1sum"
+	bool "sha1sum (6 kb)"
 	default y
 	help
-	  Compute and check SHA1 message digest
+	Compute and check SHA1 message digest
 
 config BUSYBOX_SHA256SUM
-	bool "sha256sum"
+	bool "sha256sum (7.1 kb)"
 	default y
 	help
-	  Compute and check SHA256 message digest
+	Compute and check SHA256 message digest
 
 config BUSYBOX_SHA512SUM
-	bool "sha512sum"
+	bool "sha512sum (7.6 kb)"
 	default y
 	help
-	  Compute and check SHA512 message digest
+	Compute and check SHA512 message digest
 
 config BUSYBOX_SHA3SUM
-	bool "sha3sum"
+	bool "sha3sum (6.3 kb)"
 	default y
 	help
-	  Compute and check SHA3 message digest
+	Compute and check SHA3 message digest
 
 comment "Common options for md5sum, sha1sum, sha256sum, sha512sum, sha3sum"
 	depends on BUSYBOX_MD5SUM || BUSYBOX_SHA1SUM || BUSYBOX_SHA256SUM || BUSYBOX_SHA512SUM || BUSYBOX_SHA3SUM
@@ -447,217 +439,199 @@ config BUSYBOX_FEATURE_MD5_SHA1_SUM_CHECK
 	default y
 	depends on BUSYBOX_MD5SUM || BUSYBOX_SHA1SUM || BUSYBOX_SHA256SUM || BUSYBOX_SHA512SUM || BUSYBOX_SHA3SUM
 	help
-	  Enabling the -c options allows files to be checked
-	  against pre-calculated hash values.
-	  -s and -w are useful options when verifying checksums.
+	Enabling the -c options allows files to be checked
+	against pre-calculated hash values.
+	-s and -w are useful options when verifying checksums.
 config BUSYBOX_MKDIR
-	bool "mkdir"
+	bool "mkdir (4.4 kb)"
 	default y
 	help
-	  mkdir is used to create directories with the specified names.
-
-config BUSYBOX_FEATURE_MKDIR_LONG_OPTIONS
-	bool "Enable long options"
-	default y
-	depends on BUSYBOX_MKDIR && BUSYBOX_LONG_OPTS
+	mkdir is used to create directories with the specified names.
 config BUSYBOX_MKFIFO
-	bool "mkfifo"
+	bool "mkfifo (3.7 kb)"
 	default y
 	help
-	  mkfifo is used to create FIFOs (named pipes).
-	  The 'mknod' program can also create FIFOs.
+	mkfifo is used to create FIFOs (named pipes).
+	The 'mknod' program can also create FIFOs.
 config BUSYBOX_MKNOD
-	bool "mknod"
+	bool "mknod (4 kb)"
 	default y
 	help
-	  mknod is used to create FIFOs or block/character special
-	  files with the specified names.
+	mknod is used to create FIFOs or block/character special
+	files with the specified names.
 config BUSYBOX_MKTEMP
-	bool "mktemp"
+	bool "mktemp (4 kb)"
 	default y
 	help
-	  mktemp is used to create unique temporary files
+	mktemp is used to create unique temporary files
 config BUSYBOX_MV
-	bool "mv"
+	bool "mv (9.8 kb)"
 	default y
 	help
-	  mv is used to move or rename files or directories.
-
-config BUSYBOX_FEATURE_MV_LONG_OPTIONS
-	bool "Enable long options"
-	default y
-	depends on BUSYBOX_MV && BUSYBOX_LONG_OPTS
+	mv is used to move or rename files or directories.
 config BUSYBOX_NICE
-	bool "nice"
+	bool "nice (1.8 kb)"
 	default y
 	help
-	  nice runs a program with modified scheduling priority.
+	nice runs a program with modified scheduling priority.
 config BUSYBOX_NL
-	bool "nl"
+	bool "nl (4.3 kb)"
 	default y
 	help
-	  nl is used to number lines of files.
+	nl is used to number lines of files.
 config BUSYBOX_NOHUP
-	bool "nohup"
+	bool "nohup (2 kb)"
 	default y
 	help
-	  run a command immune to hangups, with output to a non-tty.
+	run a command immune to hangups, with output to a non-tty.
 config BUSYBOX_NPROC
-	bool "nproc"
+	bool "nproc (248 bytes)"
 	default y
 	help
-	  Print number of CPUs
+	Print number of CPUs
 config BUSYBOX_OD
-	bool "od"
+	bool "od (11 kb)"
 	default y
 	help
-	  od is used to dump binary files in octal and other formats.
+	od is used to dump binary files in octal and other formats.
 config BUSYBOX_PASTE
-	bool "paste"
+	bool "paste (4.5 kb)"
 	default y
 	help
-	  paste is used to paste lines of different files together
-	  and write the result to stdout
+	paste is used to paste lines of different files together
+	and write the result to stdout
 config BUSYBOX_PRINTENV
-	bool "printenv"
+	bool "printenv (1 kb)"
 	default y
 	help
-	  printenv is used to print all or part of environment.
+	printenv is used to print all or part of environment.
 config BUSYBOX_PRINTF
-	bool "printf"
+	bool "printf (3.3 kb)"
 	default y
 	help
-	  printf is used to format and print specified strings.
-	  It's similar to `echo' except it has more options.
+	printf is used to format and print specified strings.
+	It's similar to 'echo' except it has more options.
 config BUSYBOX_PWD
-	bool "pwd"
+	bool "pwd (3.4 kb)"
 	default y
 	help
-	  pwd is used to print the current directory.
+	pwd is used to print the current directory.
 config BUSYBOX_READLINK
-	bool "readlink"
+	bool "readlink (3.6 kb)"
 	default y
 	help
-	  This program reads a symbolic link and returns the name
-	  of the file it points to
+	This program reads a symbolic link and returns the name
+	of the file it points to
 
 config BUSYBOX_FEATURE_READLINK_FOLLOW
 	bool "Enable canonicalization by following all symlinks (-f)"
 	default y
 	depends on BUSYBOX_READLINK
 	help
-	  Enable the readlink option (-f).
+	Enable the readlink option (-f).
 config BUSYBOX_REALPATH
-	bool "realpath"
+	bool "realpath (1.1 kb)"
 	default y
 	help
-	  Return the canonicalized absolute pathname.
-	  This isn't provided by GNU shellutils, but where else does it belong.
+	Return the canonicalized absolute pathname.
+	This isn't provided by GNU shellutils, but where else does it belong.
 config BUSYBOX_RM
-	bool "rm"
+	bool "rm (4.9 kb)"
 	default y
 	help
-	  rm is used to remove files or directories.
+	rm is used to remove files or directories.
 config BUSYBOX_RMDIR
-	bool "rmdir"
-	default y
-	help
-	  rmdir is used to remove empty directories.
-
-config BUSYBOX_FEATURE_RMDIR_LONG_OPTIONS
-	bool "Enable long options"
+	bool "rmdir (3.4 kb)"
 	default y
-	depends on BUSYBOX_RMDIR && BUSYBOX_LONG_OPTS
 	help
-	  Support long options for the rmdir applet, including
-	  --ignore-fail-on-non-empty for compatibility with GNU rmdir.
+	rmdir is used to remove empty directories.
 config BUSYBOX_SEQ
-	bool "seq"
+	bool "seq (3.6 kb)"
 	default y
 	help
-	  print a sequence of numbers
+	print a sequence of numbers
 config BUSYBOX_SHRED
-	bool "shred"
+	bool "shred (5 kb)"
 	default y
 	help
-	  Overwrite a file to hide its contents, and optionally delete it
+	Overwrite a file to hide its contents, and optionally delete it
 config BUSYBOX_SHUF
-	bool "shuf"
+	bool "shuf (5.4 kb)"
 	default y
 	help
-	  Generate random permutations
+	Generate random permutations
 config BUSYBOX_SLEEP
-	bool "sleep"
+	bool "sleep (1.7 kb)"
 	default y
 	help
-	  sleep is used to pause for a specified number of seconds.
-	  It comes in 3 versions:
-	  - small: takes one integer parameter
-	  - fancy: takes multiple integer arguments with suffixes:
-	    sleep 1d 2h 3m 15s
-	  - fancy with fractional numbers:
-	    sleep 2.3s 4.5h sleeps for 16202.3 seconds
-	  Last one is "the most compatible" with coreutils sleep,
-	  but it adds around 1k of code.
+	sleep is used to pause for a specified number of seconds.
+	It comes in 3 versions:
+	- small: takes one integer parameter
+	- fancy: takes multiple integer arguments with suffixes:
+		sleep 1d 2h 3m 15s
+	- fancy with fractional numbers:
+		sleep 2.3s 4.5h sleeps for 16202.3 seconds
+	Last one is "the most compatible" with coreutils sleep,
+	but it adds around 1k of code.
 
 config BUSYBOX_FEATURE_FANCY_SLEEP
 	bool "Enable multiple arguments and s/m/h/d suffixes"
 	default y
 	depends on BUSYBOX_SLEEP
 	help
-	  Allow sleep to pause for specified minutes, hours, and days.
+	Allow sleep to pause for specified minutes, hours, and days.
 
 config BUSYBOX_FEATURE_FLOAT_SLEEP
 	bool "Enable fractional arguments"
 	default y
 	depends on BUSYBOX_FEATURE_FANCY_SLEEP
 	help
-	  Allow for fractional numeric parameters.
+	Allow for fractional numeric parameters.
 config BUSYBOX_SORT
-	bool "sort"
+	bool "sort (7.4 kb)"
 	default y
 	help
-	  sort is used to sort lines of text in specified files.
+	sort is used to sort lines of text in specified files.
 
 config BUSYBOX_FEATURE_SORT_BIG
 	bool "Full SuSv3 compliant sort (support -ktcsbdfiozgM)"
 	default y
 	depends on BUSYBOX_SORT
 	help
-	  Without this, sort only supports -r, -u, and an integer version
-	  of -n. Selecting this adds sort keys, floating point support, and
-	  more. This adds a little over 3k to a nonstatic build on x86.
+	Without this, sort only supports -r, -u, and an integer version
+	of -n. Selecting this adds sort keys, floating point support, and
+	more. This adds a little over 3k to a nonstatic build on x86.
 
-	  The SuSv3 sort standard is available at:
-	  http://www.opengroup.org/onlinepubs/007904975/utilities/sort.html
+	The SuSv3 sort standard is available at:
+	http://www.opengroup.org/onlinepubs/007904975/utilities/sort.html
 config BUSYBOX_SPLIT
-	bool "split"
+	bool "split (5.4 kb)"
 	default y
 	help
-	  Split a file into pieces.
+	Split a file into pieces.
 
 config BUSYBOX_FEATURE_SPLIT_FANCY
 	bool "Fancy extensions"
 	default y
 	depends on BUSYBOX_SPLIT
 	help
-	  Add support for features not required by SUSv3.
-	  Supports additional suffixes 'b' for 512 bytes,
-	  'g' for 1GiB for the -b option.
+	Add support for features not required by SUSv3.
+	Supports additional suffixes 'b' for 512 bytes,
+	'g' for 1GiB for the -b option.
 config BUSYBOX_STAT
-	bool "stat"
+	bool "stat (10 kb)"
 	default y
 	help
-	  display file or filesystem status.
+	display file or filesystem status.
 
 config BUSYBOX_FEATURE_STAT_FORMAT
 	bool "Enable custom formats (-c)"
 	default y
 	depends on BUSYBOX_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.
+	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 BUSYBOX_FEATURE_STAT_FILESYSTEM
 	bool "Enable display of filesystem status (-f)"
@@ -665,249 +639,255 @@ config BUSYBOX_FEATURE_STAT_FILESYSTEM
 	depends on BUSYBOX_STAT
 	select BUSYBOX_PLATFORM_LINUX # statfs()
 	help
-	  Without this, stat will not support the '-f' option to display
-	  information about filesystem status.
+	Without this, stat will not support the '-f' option to display
+	information about filesystem status.
 config BUSYBOX_STTY
-	bool "stty"
+	bool "stty (8.6 kb)"
 	default y
 	help
-	  stty is used to change and print terminal line settings.
+	stty is used to change and print terminal line settings.
 config BUSYBOX_SUM
-	bool "sum"
+	bool "sum (4.3 kb)"
 	default y
 	help
-	  checksum and count the blocks in a file
+	checksum and count the blocks in a file
 config BUSYBOX_SYNC
-	bool "sync"
+	bool "sync (769 bytes)"
 	default y
 	help
-	  sync is used to flush filesystem buffers.
+	sync is used to flush filesystem buffers.
 config BUSYBOX_FEATURE_SYNC_FANCY
 	bool "Enable -d and -f flags (requires syncfs(2) in libc)"
 	default y
 	depends on BUSYBOX_SYNC
 	help
-	  sync -d FILE... executes fdatasync() on each FILE.
-	  sync -f FILE... executes syncfs() on each FILE.
+	sync -d FILE... executes fdatasync() on each FILE.
+	sync -f FILE... executes syncfs() on each FILE.
 config BUSYBOX_TAC
-	bool "tac"
+	bool "tac (4.1 kb)"
 	default y
 	help
-	  tac is used to concatenate and print files in reverse.
+	tac is used to concatenate and print files in reverse.
 config BUSYBOX_TAIL
-	bool "tail"
+	bool "tail (7.1 kb)"
 	default y
 	help
-	  tail is used to print the last specified number of lines
-	  from files.
+	tail is used to print the last specified number of lines
+	from files.
 
 config BUSYBOX_FEATURE_FANCY_TAIL
 	bool "Enable -q, -s, -v, and -F options"
 	default y
 	depends on BUSYBOX_TAIL
 	help
-	  These options are provided by GNU tail, but
-	  are not specific in the SUSv3 standard:
-	    -q      Never output headers giving file names
-	    -s SEC  Wait SEC seconds between reads with -f
-	    -v      Always output headers giving file names
-	    -F      Same as -f, but keep retrying
+	These options are provided by GNU tail, but
+	are not specified in the SUSv3 standard:
+		-q      Never output headers giving file names
+		-s SEC  Wait SEC seconds between reads with -f
+		-v      Always output headers giving file names
+		-F      Same as -f, but keep retrying
 config BUSYBOX_TEE
-	bool "tee"
+	bool "tee (4.3 kb)"
 	default y
 	help
-	  tee is used to read from standard input and write
-	  to standard output and files.
+	tee is used to read from standard input and write
+	to standard output and files.
 
 config BUSYBOX_FEATURE_TEE_USE_BLOCK_IO
 	bool "Enable block I/O (larger/faster) instead of byte I/O"
 	default y
 	depends on BUSYBOX_TEE
 	help
-	  Enable this option for a faster tee, at expense of size.
+	Enable this option for a faster tee, at expense of size.
 config BUSYBOX_TEST
-	bool "test"
+	bool "test (3.6 kb)"
 	default y
 	help
-	  test is used to check file types and compare values,
-	  returning an appropriate exit code. The bash shell
-	  has test built in, ash can build it in optionally.
+	test is used to check file types and compare values,
+	returning an appropriate exit code. The bash shell
+	has test built in, ash can build it in optionally.
 
 config BUSYBOX_TEST1
 	bool "test as ["
 	default y
 	help
-	  Provide test command in the "[ EXPR ]" form
+	Provide test command in the "[ EXPR ]" form
 
 config BUSYBOX_TEST2
 	bool "test as [["
 	default y
 	help
-	  Provide test command in the "[[ EXPR ]]" form
+	Provide test command in the "[[ EXPR ]]" form
 
 config BUSYBOX_FEATURE_TEST_64
 	bool "Extend test to 64 bit"
 	default y
 	depends on BUSYBOX_TEST || BUSYBOX_TEST1 || BUSYBOX_TEST2 || BUSYBOX_ASH_TEST || BUSYBOX_HUSH_TEST
 	help
-	  Enable 64-bit support in test.
+	Enable 64-bit support in test.
 config BUSYBOX_TIMEOUT
-	bool "timeout"
+	bool "timeout (5.5 kb)"
 	default y
 	help
-	  Runs a program and watches it. If it does not terminate in
-	  specified number of seconds, it is sent a signal.
+	Runs a program and watches it. If it does not terminate in
+	specified number of seconds, it is sent a signal.
 config BUSYBOX_TOUCH
-	bool "touch"
+	bool "touch (5.8 kb)"
 	default y
 	help
-	  touch is used to create or change the access and/or
-	  modification timestamp of specified files.
+	touch is used to create or change the access and/or
+	modification timestamp of specified files.
 
 config BUSYBOX_FEATURE_TOUCH_NODEREF
 	bool "Add support for -h"
 	default y
 	depends on BUSYBOX_TOUCH
 	help
-	  Enable touch to have the -h option.
-	  This requires libc support for lutimes() function.
+	Enable touch to have the -h option.
+	This requires libc support for lutimes() function.
 
 config BUSYBOX_FEATURE_TOUCH_SUSV3
 	bool "Add support for SUSV3 features (-d -t -r)"
 	default y
 	depends on BUSYBOX_TOUCH
 	help
-	  Enable touch to use a reference file or a given date/time argument.
+	Enable touch to use a reference file or a given date/time argument.
 config BUSYBOX_TR
-	bool "tr"
+	bool "tr (5.5 kb)"
 	default y
 	help
-	  tr is used to squeeze, and/or delete characters from standard
-	  input, writing to standard output.
+	tr is used to squeeze, and/or delete characters from standard
+	input, writing to standard output.
 
 config BUSYBOX_FEATURE_TR_CLASSES
 	bool "Enable character classes (such as [:upper:])"
 	default y
 	depends on BUSYBOX_TR
 	help
-	  Enable character classes, enabling commands such as:
-	  tr [:upper:] [:lower:] to convert input into lowercase.
+	Enable character classes, enabling commands such as:
+	tr [:upper:] [:lower:] to convert input into lowercase.
 
 config BUSYBOX_FEATURE_TR_EQUIV
 	bool "Enable equivalence classes"
 	default y
 	depends on BUSYBOX_TR
 	help
-	  Enable equivalence classes, which essentially add the enclosed
-	  character to the current set. For instance, tr [=a=] xyz would
-	  replace all instances of 'a' with 'xyz'. This option is mainly
-	  useful for cases when no other way of expressing a character
-	  is possible.
+	Enable equivalence classes, which essentially add the enclosed
+	character to the current set. For instance, tr [=a=] xyz would
+	replace all instances of 'a' with 'xyz'. This option is mainly
+	useful for cases when no other way of expressing a character
+	is possible.
 config BUSYBOX_TRUE
-	bool "true"
+	bool "true (tiny)"
 	default y
 	help
-	  true returns an exit code of TRUE (0).
+	true returns an exit code of TRUE (0).
 config BUSYBOX_TRUNCATE
-	bool "truncate"
+	bool "truncate (4.7 kb)"
 	default y
 	help
-	  truncate truncates files to a given size. If a file does
-	  not exist, it is created unless told otherwise.
+	truncate truncates files to a given size. If a file does
+	not exist, it is created unless told otherwise.
 config BUSYBOX_TTY
-	bool "tty"
+	bool "tty (3.3 kb)"
 	default y
 	help
-	  tty is used to print the name of the current terminal to
-	  standard output.
+	tty is used to print the name of the current terminal to
+	standard output.
 config BUSYBOX_UNAME
-	bool "uname"
+	bool "uname (3.7 kb)"
 	default y
 	help
-	  uname is used to print system information.
+	uname is used to print system information.
 
 config BUSYBOX_UNAME_OSNAME
 	string "Operating system name"
 	default "GNU/Linux"
 	depends on BUSYBOX_UNAME
 	help
-	  Sets the operating system name reported by uname -o.  The
-	  default is "
+	Sets the operating system name reported by uname -o.  The
+	default is "
+
+config BUSYBOX_BB_ARCH
+	bool "arch (1.6 kb)"
+	default y
+	help
+	Same as uname -m.
 config BUSYBOX_UNIQ
-	bool "uniq"
+	bool "uniq (4.8 kb)"
 	default y
 	help
-	  uniq is used to remove duplicate lines from a sorted file.
+	uniq is used to remove duplicate lines from a sorted file.
 config BUSYBOX_UNLINK
-	bool "unlink"
+	bool "unlink (3.5 kb)"
 	default y
 	help
-	  unlink deletes a file by calling unlink()
+	unlink deletes a file by calling unlink()
 config BUSYBOX_USLEEP
-	bool "usleep"
+	bool "usleep (1.1 kb)"
 	default y
 	help
-	  usleep is used to pause for a specified number of microseconds.
+	usleep is used to pause for a specified number of microseconds.
 config BUSYBOX_UUDECODE
-	bool "uudecode"
+	bool "uudecode (5.9 kb)"
 	default y
 	help
-	  uudecode is used to decode a uuencoded file.
+	uudecode is used to decode a uuencoded file.
 config BUSYBOX_BASE64
-	bool "base64"
+	bool "base64 (5 kb)"
 	default y
 	help
-	  Base64 encode and decode
+	Base64 encode and decode
 config BUSYBOX_UUENCODE
-	bool "uuencode"
+	bool "uuencode (4.6 kb)"
 	default y
 	help
-	  uuencode is used to uuencode a file.
+	uuencode is used to uuencode a file.
 config BUSYBOX_WC
-	bool "wc"
+	bool "wc (4.4 kb)"
 	default y
 	help
-	  wc is used to print the number of bytes, words, and lines,
-	  in specified files.
+	wc is used to print the number of bytes, words, and lines,
+	in specified files.
 
 config BUSYBOX_FEATURE_WC_LARGE
 	bool "Support very large counts"
 	default y
 	depends on BUSYBOX_WC
 	help
-	  Use "unsigned long long" for counter variables.
+	Use "unsigned long long" for counter variables.
 config BUSYBOX_WHO
-      bool "who"
-      default y
-      depends on BUSYBOX_FEATURE_UTMP
-      help
-        who is used to show who is logged on.
+	bool "who (3.7 kb)"
+	default y
+	depends on BUSYBOX_FEATURE_UTMP
+	help
+	Print users currently logged on.
 
 config BUSYBOX_W
-      bool "w"
-      default y
-      depends on BUSYBOX_FEATURE_UTMP
-      help
-        w is used to show who is logged on.
+	bool "w (3.7 kb)"
+	default y
+	depends on BUSYBOX_FEATURE_UTMP
+	help
+	Print users currently logged on.
 
 config BUSYBOX_USERS
-      bool "users"
-      default y
-      depends on BUSYBOX_FEATURE_UTMP
-      help
-        Print users currently logged on.
+	bool "users (3.2 kb)"
+	default y
+	depends on BUSYBOX_FEATURE_UTMP
+	help
+	Print users currently logged on.
 config BUSYBOX_WHOAMI
-	bool "whoami"
+	bool "whoami (2.9 kb)"
 	default y
 	help
-	  whoami is used to print the username of the current
-	  user id (same as id -un).
+	whoami is used to print the username of the current
+	user id (same as id -un).
 config BUSYBOX_YES
-	bool "yes"
+	bool "yes (956 bytes)"
 	default y
 	help
-	  yes is used to repeatedly output a specific string, or
-	  the default string `y'.
+	yes is used to repeatedly output a specific string, or
+	the default string 'y'.
 
 comment "Common options"
 
@@ -915,9 +895,9 @@ config BUSYBOX_FEATURE_VERBOSE
 	bool "Support verbose options (usually -v) for various applets"
 	default y
 	help
-	  Enable cp -v, rm -v and similar messages.
-	  Also enables long option (--verbose) if it exists.
-	  Without this option, -v is accepted but ignored.
+	Enable cp -v, rm -v and similar messages.
+	Also enables long option (--verbose) if it exists.
+	Without this option, -v is accepted but ignored.
 
 comment "Common options for cp and mv"
 	depends on BUSYBOX_CP || BUSYBOX_MV
@@ -927,7 +907,7 @@ config BUSYBOX_FEATURE_PRESERVE_HARDLINKS
 	default y
 	depends on BUSYBOX_CP || BUSYBOX_MV
 	help
-	  Allow cp and mv to preserve hard links.
+	Allow cp and mv to preserve hard links.
 
 comment "Common options for df, du, ls"
 	depends on BUSYBOX_DF || BUSYBOX_DU || BUSYBOX_LS
@@ -937,6 +917,6 @@ config BUSYBOX_FEATURE_HUMAN_READABLE
 	default y
 	depends on BUSYBOX_DF || BUSYBOX_DU || BUSYBOX_LS
 	help
-	  Allow df, du, and ls to have human readable output.
+	Allow df, du, and ls to have human readable output.
 
 endmenu
diff --git a/config/busybox/debianutils/Config.in b/config/busybox/debianutils/Config.in
index 12015e095..5720e8d0c 100644
--- a/config/busybox/debianutils/Config.in
+++ b/config/busybox/debianutils/Config.in
@@ -7,24 +7,24 @@
 menu "Debian Utilities"
 
 config BUSYBOX_PIPE_PROGRESS
-	bool "pipe_progress"
+	bool "pipe_progress (225 bytes)"
 	default y
 	help
-	  Display a dot to indicate pipe activity.
+	Display a dot to indicate pipe activity.
 config BUSYBOX_RUN_PARTS
-	bool "run-parts"
+	bool "run-parts (5.6 kb)"
 	default y
 	help
-	  run-parts is a utility designed to run all the scripts in a directory.
+	run-parts is a utility designed to run all the scripts in a directory.
 
-	  It is useful to set up a directory like cron.daily, where you need to
-	  execute all the scripts in that directory.
+	It is useful to set up a directory like cron.daily, where you need to
+	execute all the scripts in that directory.
 
-	  In this implementation of run-parts some features (such as report
-	  mode) are not implemented.
+	In this implementation of run-parts some features (such as report
+	mode) are not implemented.
 
-	  Unless you know that run-parts is used in some of your scripts
-	  you can safely say N here.
+	Unless you know that run-parts is used in some of your scripts
+	you can safely say N here.
 
 config BUSYBOX_FEATURE_RUN_PARTS_LONG_OPTIONS
 	bool "Enable long options"
@@ -36,16 +36,16 @@ config BUSYBOX_FEATURE_RUN_PARTS_FANCY
 	default y
 	depends on BUSYBOX_RUN_PARTS
 	help
-	  Support additional options:
-	  -l --list print the names of the all matching files (not
-	            limited to executables), but don't actually run them.
+	Support additional options:
+	-l --list print the names of the all matching files (not
+	limited to executables), but don't actually run them.
 config BUSYBOX_START_STOP_DAEMON
-	bool "start-stop-daemon"
+	bool "start-stop-daemon (12 kb)"
 	default y
 	help
-	  start-stop-daemon is used to control the creation and
-	  termination of system-level processes, usually the ones
-	  started during the startup of the system.
+	start-stop-daemon is used to control the creation and
+	termination of system-level processes, usually the ones
+	started during the startup of the system.
 
 config BUSYBOX_FEATURE_START_STOP_DAEMON_LONG_OPTIONS
 	bool "Enable long options"
@@ -57,14 +57,14 @@ config BUSYBOX_FEATURE_START_STOP_DAEMON_FANCY
 	default y
 	depends on BUSYBOX_START_STOP_DAEMON
 	help
-	  -o|--oknodo ignored since we exit with 0 anyway
-	  -v|--verbose
-	  -N|--nicelevel N
+	-o|--oknodo ignored since we exit with 0 anyway
+	-v|--verbose
+	-N|--nicelevel N
 config BUSYBOX_WHICH
-	bool "which"
+	bool "which (3.7 kb)"
 	default y
 	help
-	  which is used to find programs in your PATH and
-	  print out their pathnames.
+	which is used to find programs in your PATH and
+	print out their pathnames.
 
 endmenu
diff --git a/config/busybox/e2fsprogs/Config.in b/config/busybox/e2fsprogs/Config.in
index 19d14973a..1aceb053e 100644
--- a/config/busybox/e2fsprogs/Config.in
+++ b/config/busybox/e2fsprogs/Config.in
@@ -7,29 +7,29 @@
 menu "Linux Ext2 FS Progs"
 
 config BUSYBOX_CHATTR
-	bool "chattr"
+	bool "chattr (3.2 kb)"
 	default y
 	help
-	  chattr changes the file attributes on a second extended file system.
+	chattr changes the file attributes on a second extended file system.
 config BUSYBOX_FSCK
-	bool "fsck"
+	bool "fsck (6.7 kb)"
 	default y
 	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.
+	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 BUSYBOX_LSATTR
-	bool "lsattr"
+	bool "lsattr (5 kb)"
 	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  lsattr lists the file attributes on a second extended file system.
+	lsattr lists the file attributes on a second extended file system.
 config BUSYBOX_TUNE2FS
-	bool "tune2fs"
+	bool "tune2fs (4.4 kb)"
 	default n  # off: it is too limited compared to upstream version
 	help
-	  tune2fs allows the system administrator to adjust various tunable
-	  filesystem parameters on Linux ext2/ext3 filesystems.
+	tune2fs allows the system administrator to adjust various tunable
+	filesystem parameters on Linux ext2/ext3 filesystems.
 
 ### config E2FSCK
 ###	bool "e2fsck"
diff --git a/config/busybox/editors/Config.in b/config/busybox/editors/Config.in
index 30da5d05e..36ce65970 100644
--- a/config/busybox/editors/Config.in
+++ b/config/busybox/editors/Config.in
@@ -7,43 +7,42 @@
 menu "Editors"
 
 config BUSYBOX_AWK
-	bool "awk"
+	bool "awk (22 kb)"
 	default y
 	help
-	  Awk is used as a pattern scanning and processing language. This is
-	  the BusyBox implementation of that programming language.
+	Awk is used as a pattern scanning and processing language.
 
 config BUSYBOX_FEATURE_AWK_LIBM
 	bool "Enable math functions (requires libm)"
 	default y
 	depends on BUSYBOX_AWK
 	help
-	  Enable math functions of the Awk programming language.
-	  NOTE: This will require libm to be present for linking.
+	Enable math functions of the Awk programming language.
+	NOTE: This requires libm to be present for linking.
 
 config BUSYBOX_FEATURE_AWK_GNU_EXTENSIONS
 	bool "Enable a few GNU extensions"
 	default y
 	depends on BUSYBOX_AWK
 	help
-	  Enable a few features from gawk:
-	  * command line option -e AWK_PROGRAM
-	  * simultaneous use of -f and -e on the command line.
-	    This enables the use of awk library files.
-	    Ex: awk -f mylib.awk -e '{print myfunction($1);}' ...
+	Enable a few features from gawk:
+	* command line option -e AWK_PROGRAM
+	* simultaneous use of -f and -e on the command line.
+	This enables the use of awk library files.
+	Example: awk -f mylib.awk -e '{print myfunction($1);}' ...
 config BUSYBOX_CMP
-	bool "cmp"
+	bool "cmp (5.4 kb)"
 	default y
 	help
-	  cmp is used to compare two files and returns the result
-	  to standard output.
+	cmp is used to compare two files and returns the result
+	to standard output.
 config BUSYBOX_DIFF
-	bool "diff"
+	bool "diff (13 kb)"
 	default y
 	help
-	  diff compares two files or directories and outputs the
-	  differences between them in a form that can be given to
-	  the patch command.
+	diff compares two files or directories and outputs the
+	differences between them in a form that can be given to
+	the patch command.
 
 config BUSYBOX_FEATURE_DIFF_LONG_OPTIONS
 	bool "Enable long options"
@@ -55,34 +54,34 @@ config BUSYBOX_FEATURE_DIFF_DIR
 	default y
 	depends on BUSYBOX_DIFF
 	help
-	  This option enables support for directory and subdirectory
-	  comparison.
+	This option enables support for directory and subdirectory
+	comparison.
 config BUSYBOX_ED
-	bool "ed"
+	bool "ed (25 kb)"
 	default y
 	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.
+	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 BUSYBOX_PATCH
-	bool "patch"
+	bool "patch (9.1 kb)"
 	default y
 	help
-	  Apply a unified diff formatted patch.
+	Apply a unified diff formatted patch.
 config BUSYBOX_SED
-	bool "sed"
+	bool "sed (12 kb)"
 	default y
 	help
-	  sed is used to perform text transformations on a file
-	  or input from a pipeline.
+	sed is used to perform text transformations on a file
+	or input from a pipeline.
 config BUSYBOX_VI
-	bool "vi"
+	bool "vi (22 kb)"
 	default y
 	help
-	  'vi' is a text editor. More specifically, it is the One True
-	  text editor <grin>. It does, however, have a rather steep
-	  learning curve. If you are not already comfortable with 'vi'
-	  you may wish to use something else.
+	'vi' is a text editor. More specifically, it is the One True
+	text editor <grin>. It does, however, have a rather steep
+	learning curve. If you are not already comfortable with 'vi'
+	you may wish to use something else.
 
 config BUSYBOX_FEATURE_VI_MAX_LEN
 	int "Maximum screen width"
@@ -90,77 +89,77 @@ config BUSYBOX_FEATURE_VI_MAX_LEN
 	default 4096
 	depends on BUSYBOX_VI
 	help
-	  Contrary to what you may think, this is not eating much.
-	  Make it smaller than 4k only if you are very limited on memory.
+	Contrary to what you may think, this is not eating much.
+	Make it smaller than 4k only if you are very limited on memory.
 
 config BUSYBOX_FEATURE_VI_8BIT
 	bool "Allow to display 8-bit chars (otherwise shows dots)"
 	default n
 	depends on BUSYBOX_VI
 	help
-	  If your terminal can display characters with high bit set,
-	  you may want to enable this. Note: vi is not Unicode-capable.
-	  If your terminal combines several 8-bit bytes into one character
-	  (as in Unicode mode), this will not work properly.
+	If your terminal can display characters with high bit set,
+	you may want to enable this. Note: vi is not Unicode-capable.
+	If your terminal combines several 8-bit bytes into one character
+	(as in Unicode mode), this will not work properly.
 
 config BUSYBOX_FEATURE_VI_COLON
 	bool "Enable \":\" colon commands (no \"ex\" mode)"
 	default y
 	depends on BUSYBOX_VI
 	help
-	  Enable a limited set of colon commands. This does not
-	  provide an "ex" mode.
+	Enable a limited set of colon commands. This does not
+	provide an "ex" mode.
 
 config BUSYBOX_FEATURE_VI_YANKMARK
 	bool "Enable yank/put commands and mark cmds"
 	default y
 	depends on BUSYBOX_VI
 	help
-	  This will enable you to use yank and put, as well as mark.
+	This enables you to use yank and put, as well as mark.
 
 config BUSYBOX_FEATURE_VI_SEARCH
 	bool "Enable search and replace cmds"
 	default y
 	depends on BUSYBOX_VI
 	help
-	  Select this if you wish to be able to do search and replace.
+	Select this if you wish to be able to do search and replace.
 
 config BUSYBOX_FEATURE_VI_REGEX_SEARCH
 	bool "Enable regex in search and replace"
 	default n   # Uses GNU regex, which may be unavailable. FIXME
 	depends on BUSYBOX_FEATURE_VI_SEARCH
 	help
-	  Use extended regex search.
+	Use extended regex search.
 
 config BUSYBOX_FEATURE_VI_USE_SIGNALS
 	bool "Catch signals"
 	default y
 	depends on BUSYBOX_VI
 	help
-	  Selecting this option will make vi signal aware. This will support
-	  SIGWINCH to deal with Window Changes, catch ^Z and ^C and alarms.
+	Selecting this option will make vi signal aware. This will support
+	SIGWINCH to deal with Window Changes, catch ^Z and ^C and alarms.
 
 config BUSYBOX_FEATURE_VI_DOT_CMD
 	bool "Remember previous cmd and \".\" cmd"
 	default y
 	depends on BUSYBOX_VI
 	help
-	  Make vi remember the last command and be able to repeat it.
+	Make vi remember the last command and be able to repeat it.
 
 config BUSYBOX_FEATURE_VI_READONLY
 	bool "Enable -R option and \"view\" mode"
 	default y
 	depends on BUSYBOX_VI
 	help
-	  Enable the read-only command line option, which allows the user to
-	  open a file in read-only mode.
+	Enable the read-only command line option, which allows the user to
+	open a file in read-only mode.
 
 config BUSYBOX_FEATURE_VI_SETOPTS
 	bool "Enable settable options, ai ic showmatch"
 	default y
 	depends on BUSYBOX_VI
 	help
-	  Enable the editor to set some (ai, ic, showmatch) options.
+	Enable the editor to set some (ai, ic, showmatch) options.
 
 config BUSYBOX_FEATURE_VI_SET
 	bool "Support :set"
@@ -172,37 +171,37 @@ config BUSYBOX_FEATURE_VI_WIN_RESIZE
 	default y
 	depends on BUSYBOX_VI
 	help
-	  Behave nicely with terminals that get resized.
+	Behave nicely with terminals that get resized.
 
 config BUSYBOX_FEATURE_VI_ASK_TERMINAL
 	bool "Use 'tell me cursor position' ESC sequence to measure window"
 	default y
 	depends on BUSYBOX_VI
 	help
-	  If terminal size can't be retrieved and $LINES/$COLUMNS are not set,
-	  this option makes vi perform a last-ditch effort to find it:
-	  position cursor to 999,999 and ask terminal to report real
-	  cursor position using "ESC [ 6 n" escape sequence, then read stdin.
-	  This is not clean but helps a lot on serial lines and such.
+	If terminal size can't be retrieved and $LINES/$COLUMNS are not set,
+	this option makes vi perform a last-ditch effort to find it:
+	position cursor to 999,999 and ask terminal to report real
+	cursor position using "ESC [ 6 n" escape sequence, then read stdin.
+	This is not clean but helps a lot on serial lines and such.
 
 config BUSYBOX_FEATURE_VI_UNDO
 	bool "Support undo command \"u\""
 	default y
 	depends on BUSYBOX_VI
 	help
-	  Support the 'u' command to undo insertion, deletion, and replacement
-	  of text.
+	Support the 'u' command to undo insertion, deletion, and replacement
+	of text.
 
 config BUSYBOX_FEATURE_VI_UNDO_QUEUE
 	bool "Enable undo operation queuing"
 	default y
 	depends on BUSYBOX_FEATURE_VI_UNDO
 	help
-	  The vi undo functions can use an intermediate queue to greatly lower
-	  malloc() calls and overhead. When the maximum size of this queue is
-	  reached, the contents of the queue are committed to the undo stack.
-	  This increases the size of the undo code and allows some undo
-	  operations (especially un-typing/backspacing) to be far more useful.
+	The vi undo functions can use an intermediate queue to greatly lower
+	malloc() calls and overhead. When the maximum size of this queue is
+	reached, the contents of the queue are committed to the undo stack.
+	This increases the size of the undo code and allows some undo
+	operations (especially un-typing/backspacing) to be far more useful.
 
 config BUSYBOX_FEATURE_VI_UNDO_QUEUE_MAX
 	int "Maximum undo character queue size"
@@ -210,20 +209,20 @@ config BUSYBOX_FEATURE_VI_UNDO_QUEUE_MAX
 	range 32 65536
 	depends on BUSYBOX_FEATURE_VI_UNDO_QUEUE
 	help
-	  This option sets the number of bytes used at runtime for the queue.
-	  Smaller values will create more undo objects and reduce the amount
-	  of typed or backspaced characters that are grouped into one undo
-	  operation; larger values increase the potential size of each undo
-	  and will generally malloc() larger objects and less frequently.
-	  Unless you want more (or less) frequent "undo points" while typing,
-	  you should probably leave this unchanged.
+	This option sets the number of bytes used at runtime for the queue.
+	Smaller values will create more undo objects and reduce the amount
+	of typed or backspaced characters that are grouped into one undo
+	operation; larger values increase the potential size of each undo
+	and will generally malloc() larger objects and less frequently.
+	Unless you want more (or less) frequent "undo points" while typing,
+	you should probably leave this unchanged.
 
 config BUSYBOX_FEATURE_ALLOW_EXEC
 	bool "Allow vi and awk to execute shell commands"
 	default y
 	depends on BUSYBOX_VI || BUSYBOX_AWK
 	help
-	  Enables vi and awk features which allow user to execute
-	  shell commands (using system() C call).
+	Enables vi and awk features which allow user to execute
+	shell commands (using system() C call).
 
 endmenu
diff --git a/config/busybox/findutils/Config.in b/config/busybox/findutils/Config.in
index 1a6a5d343..10c52cf85 100644
--- a/config/busybox/findutils/Config.in
+++ b/config/busybox/findutils/Config.in
@@ -7,36 +7,36 @@
 menu "Finding Utilities"
 
 config BUSYBOX_FIND
-	bool "find"
+	bool "find (14 kb)"
 	default y
 	help
-	  find is used to search your system to find specified files.
+	find is used to search your system to find specified files.
 
 config BUSYBOX_FEATURE_FIND_PRINT0
 	bool "Enable -print0: NUL-terminated output"
 	default y
 	depends on BUSYBOX_FIND
 	help
-	  Causes output names to be separated by a NUL character
-	  rather than a newline. This allows names that contain
-	  newlines and other whitespace to be more easily
-	  interpreted by other programs.
+	Causes output names to be separated by a NUL character
+	rather than a newline. This allows names that contain
+	newlines and other whitespace to be more easily
+	interpreted by other programs.
 
 config BUSYBOX_FEATURE_FIND_MTIME
 	bool "Enable -mtime: modified time matching"
 	default y
 	depends on BUSYBOX_FIND
 	help
-	  Allow searching based on the modification time of
-	  files, in days.
+	Allow searching based on the modification time of
+	files, in days.
 
 config BUSYBOX_FEATURE_FIND_MMIN
 	bool "Enable -mmin: modified time matching by minutes"
 	default y
 	depends on BUSYBOX_FIND
 	help
-	  Allow searching based on the modification time of
-	  files, in minutes.
+	Allow searching based on the modification time of
+	files, in minutes.
 
 config BUSYBOX_FEATURE_FIND_PERM
 	bool "Enable -perm: permissions matching"
@@ -48,8 +48,8 @@ config BUSYBOX_FEATURE_FIND_TYPE
 	default y
 	depends on BUSYBOX_FIND
 	help
-	  Enable searching based on file type (file,
-	  directory, socket, device, etc.).
+	Enable searching based on file type (file,
+	directory, socket, device, etc.).
 
 config BUSYBOX_FEATURE_FIND_XDEV
 	bool "Enable -xdev: 'stay in filesystem'"
@@ -66,8 +66,8 @@ config BUSYBOX_FEATURE_FIND_NEWER
 	default y
 	depends on BUSYBOX_FIND
 	help
-	  Support the 'find -newer' option for finding any files which have
-	  modification time that is more recent than the specified FILE.
+	Support the 'find -newer' option for finding any files which have
+	modification time that is more recent than the specified FILE.
 
 config BUSYBOX_FEATURE_FIND_INUM
 	bool "Enable -inum: inode number matching"
@@ -79,18 +79,18 @@ config BUSYBOX_FEATURE_FIND_EXEC
 	default y
 	depends on BUSYBOX_FIND
 	help
-	  Support the 'find -exec' option for executing commands based upon
-	  the files matched.
+	Support the 'find -exec' option for executing commands based upon
+	the files matched.
 
 config BUSYBOX_FEATURE_FIND_EXEC_PLUS
 	bool "Enable -exec ... {} +"
 	default y
 	depends on BUSYBOX_FEATURE_FIND_EXEC
 	help
-	  Support the 'find -exec ... {} +' option for executing commands
-	  for all matched files at once.
-	  Without this option, -exec + is a synonym for -exec ;
-	  (IOW: it works correctly, but without expected speedup)
+	Support the 'find -exec ... {} +' option for executing commands
+	for all matched files at once.
+	Without this option, -exec + is a synonym for -exec ;
+	(IOW: it works correctly, but without expected speedup)
 
 config BUSYBOX_FEATURE_FIND_USER
 	bool "Enable -user: username/uid matching"
@@ -107,23 +107,23 @@ config BUSYBOX_FEATURE_FIND_NOT
 	default y
 	depends on BUSYBOX_FIND
 	help
-	  Support the '!' operator to invert the test results.
-	  If 'Enable full-blown desktop' is enabled, then will also support
-	  the non-POSIX notation '-not'.
+	Support the '!' operator to invert the test results.
+	If 'Enable full-blown desktop' is enabled, then will also support
+	the non-POSIX notation '-not'.
 
 config BUSYBOX_FEATURE_FIND_DEPTH
 	bool "Enable -depth"
 	default y
 	depends on BUSYBOX_FIND
 	help
-	  Process each directory's contents before the directory itself.
+	Process each directory's contents before the directory itself.
 
 config BUSYBOX_FEATURE_FIND_PAREN
 	bool "Enable parens in options"
 	default y
 	depends on BUSYBOX_FIND
 	help
-	  Enable usage of parens '(' to specify logical order of arguments.
+	Enable usage of parens '(' to specify logical order of arguments.
 
 config BUSYBOX_FEATURE_FIND_SIZE
 	bool "Enable -size: file size matching"
@@ -135,115 +135,125 @@ config BUSYBOX_FEATURE_FIND_PRUNE
 	default y
 	depends on BUSYBOX_FIND
 	help
-	  If the file is a directory, don't descend into it. Useful for
-	  exclusion .svn and CVS directories.
+	If the file is a directory, don't descend into it. Useful for
+	exclusion .svn and CVS directories.
 
 config BUSYBOX_FEATURE_FIND_DELETE
 	bool "Enable -delete: delete files/dirs"
 	default y
 	depends on BUSYBOX_FIND && BUSYBOX_FEATURE_FIND_DEPTH
 	help
-	  Support the 'find -delete' option for deleting files and directories.
-	  WARNING: This option can do much harm if used wrong. Busybox will not
-	  try to protect the user from doing stupid things. Use with care.
+	Support the 'find -delete' option for deleting files and directories.
+	WARNING: This option can do much harm if used wrong. Busybox will not
+	try to protect the user from doing stupid things. Use with care.
 
 config BUSYBOX_FEATURE_FIND_PATH
 	bool "Enable -path: match pathname with shell pattern"
 	default y
 	depends on BUSYBOX_FIND
 	help
-	  The -path option matches whole pathname instead of just filename.
+	The -path option matches whole pathname instead of just filename.
 
 config BUSYBOX_FEATURE_FIND_REGEX
 	bool "Enable -regex: match pathname with regex"
 	default y
 	depends on BUSYBOX_FIND
 	help
-	  The -regex option matches whole pathname against regular expression.
+	The -regex option matches whole pathname against regular expression.
 
 config BUSYBOX_FEATURE_FIND_CONTEXT
 	bool "Enable -context: security context matching"
 	default n
 	depends on BUSYBOX_FIND && BUSYBOX_SELINUX
 	help
-	  Support the 'find -context' option for matching security context.
+	Support the 'find -context' option for matching security context.
 
 config BUSYBOX_FEATURE_FIND_LINKS
 	bool "Enable -links: link count matching"
 	default y
 	depends on BUSYBOX_FIND
 	help
-	  Support the 'find -links' option for matching number of links.
+	Support the 'find -links' option for matching number of links.
 config BUSYBOX_GREP
-	bool "grep"
+	bool "grep (8.5 kb)"
 	default y
 	help
-	  grep is used to search files for a specified pattern.
+	grep is used to search files for a specified pattern.
 
 config BUSYBOX_EGREP
-	bool "egrep"
+	bool "egrep (7.6 kb)"
 	default y
 	help
-	  Alias to "grep -E"
+	Alias to "grep -E".
 
 config BUSYBOX_FGREP
-	bool "fgrep"
+	bool "fgrep (7.6 kb)"
 	default y
 	help
-	  Alias to "grep -F"
+	Alias to "grep -F".
 
 config BUSYBOX_FEATURE_GREP_CONTEXT
 	bool "Enable before and after context flags (-A, -B and -C)"
 	default y
 	depends on BUSYBOX_GREP || BUSYBOX_EGREP || BUSYBOX_FGREP
 	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).
+	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 BUSYBOX_XARGS
-	bool "xargs"
+	bool "xargs (6.7 kb)"
 	default y
 	help
-	  xargs is used to execute a specified command for
-	  every item from standard input.
+	xargs is used to execute a specified command for
+	every item from standard input.
 
 config BUSYBOX_FEATURE_XARGS_SUPPORT_CONFIRMATION
 	bool "Enable -p: prompt and confirmation"
 	default y
 	depends on BUSYBOX_XARGS
 	help
-	  Support -p: prompt the user whether to run each command
-	  line and read a line from the terminal.
+	Support -p: prompt the user whether to run each command
+	line and read a line from the terminal.
 
 config BUSYBOX_FEATURE_XARGS_SUPPORT_QUOTES
 	bool "Enable single and double quotes and backslash"
 	default y
 	depends on BUSYBOX_XARGS
 	help
-	  Support quoting in the input.
+	Support quoting in the input.
 
 config BUSYBOX_FEATURE_XARGS_SUPPORT_TERMOPT
 	bool "Enable -x: exit if -s or -n is exceeded"
 	default y
 	depends on BUSYBOX_XARGS
 	help
-	  Support -x: exit if the command size (see the -s or -n option)
-	  is exceeded.
+	Support -x: exit if the command size (see the -s or -n option)
+	is exceeded.
 
 config BUSYBOX_FEATURE_XARGS_SUPPORT_ZERO_TERM
 	bool "Enable -0: NUL-terminated input"
 	default y
 	depends on BUSYBOX_XARGS
 	help
-	  Support -0: input items are terminated by a NUL character
-	  instead of whitespace, and the quotes and backslash
-	  are not special.
+	Support -0: input items are terminated by a NUL character
+	instead of whitespace, and the quotes and backslash
+	are not special.
 
 config BUSYBOX_FEATURE_XARGS_SUPPORT_REPL_STR
 	bool "Enable -I STR: string to replace"
 	default y
 	depends on BUSYBOX_XARGS
 	help
-	  Support -I STR and -i[STR] options.
+	Support -I STR and -i[STR] options.
+
+config BUSYBOX_FEATURE_XARGS_SUPPORT_PARALLEL
+	bool "Enable -P N: processes to run in parallel"
+	default y
+	depends on BUSYBOX_XARGS
+
+config BUSYBOX_FEATURE_XARGS_SUPPORT_ARGS_FILE
+	bool "Enable -a FILE: use FILE instead of stdin"
+	default y
+	depends on BUSYBOX_XARGS
 
 endmenu
diff --git a/config/busybox/init/Config.in b/config/busybox/init/Config.in
index 4c9e13671..74a2147a2 100644
--- a/config/busybox/init/Config.in
+++ b/config/busybox/init/Config.in
@@ -7,113 +7,113 @@
 menu "Init Utilities"
 
 config BUSYBOX_BOOTCHARTD
-	bool "bootchartd"
+	bool "bootchartd (10 kb)"
 	default y
 	help
-	  bootchartd is commonly used to profile the boot process
-	  for the purpose of speeding it up. In this case, it is started
-	  by the kernel as the init process. This is configured by adding
-	  the init=/sbin/bootchartd option to the kernel command line.
+	bootchartd is commonly used to profile the boot process
+	for the purpose of speeding it up. In this case, it is started
+	by the kernel as the init process. This is configured by adding
+	the init=/sbin/bootchartd option to the kernel command line.
 
-	  It can also be used to monitor the resource usage of a specific
-	  application or the running system in general. In this case,
-	  bootchartd is started interactively by running bootchartd start
-	  and stopped using bootchartd stop.
+	It can also be used to monitor the resource usage of a specific
+	application or the running system in general. In this case,
+	bootchartd is started interactively by running bootchartd start
+	and stopped using bootchartd stop.
 
 config BUSYBOX_FEATURE_BOOTCHARTD_BLOATED_HEADER
 	bool "Compatible, bloated header"
 	default y
 	depends on BUSYBOX_BOOTCHARTD
 	help
-	  Create extended header file compatible with "big" bootchartd.
-	  "Big" bootchartd is a shell script and it dumps some
-	  "convenient" info int the header, such as:
-	    title = Boot chart for `hostname` (`date`)
-	    system.uname = `uname -srvm`
-	    system.release = `cat /etc/DISTRO-release`
-	    system.cpu = `grep '^model name' /proc/cpuinfo | head -1` ($cpucount)
-	    system.kernel.options = `cat /proc/cmdline`
-	  This data is not mandatory for bootchart graph generation,
-	  and is considered bloat. Nevertheless, this option
-	  makes bootchartd applet to dump a subset of it.
+	Create extended header file compatible with "big" bootchartd.
+	"Big" bootchartd is a shell script and it dumps some
+	"convenient" info int the header, such as:
+		title = Boot chart for `hostname` (`date`)
+		system.uname = `uname -srvm`
+		system.release = `cat /etc/DISTRO-release`
+		system.cpu = `grep '^model name' /proc/cpuinfo | head -1` ($cpucount)
+		system.kernel.options = `cat /proc/cmdline`
+	This data is not mandatory for bootchart graph generation,
+	and is considered bloat. Nevertheless, this option
+	makes bootchartd applet to dump a subset of it.
 
 config BUSYBOX_FEATURE_BOOTCHARTD_CONFIG_FILE
 	bool "Support bootchartd.conf"
 	default y
 	depends on BUSYBOX_BOOTCHARTD
 	help
-	  Enable reading and parsing of $PWD/bootchartd.conf
-	  and /etc/bootchartd.conf files.
+	Enable reading and parsing of $PWD/bootchartd.conf
+	and /etc/bootchartd.conf files.
 config BUSYBOX_HALT
-	bool "halt"
+	bool "halt (3.7 kb)"
 	default y
 	help
-	  Stop all processes and halt the system.
+	Stop all processes and halt the system.
 
 config BUSYBOX_POWEROFF
-	bool "poweroff"
+	bool "poweroff (3.7 kb)"
 	default y
 	help
-	  Stop all processes and power off the system.
+	Stop all processes and power off the system.
 
 config BUSYBOX_REBOOT
-	bool "reboot"
+	bool "reboot (3.7 kb)"
 	default y
 	help
-	  Stop all processes and reboot the system.
+	Stop all processes and reboot the system.
 
 config BUSYBOX_FEATURE_CALL_TELINIT
 	bool "Call telinit on shutdown and reboot"
 	default y
 	depends on (BUSYBOX_HALT || BUSYBOX_POWEROFF || BUSYBOX_REBOOT) && !BUSYBOX_INIT
 	help
-	  Call an external program (normally telinit) to facilitate
-	  a switch to a proper runlevel.
+	Call an external program (normally telinit) to facilitate
+	a switch to a proper runlevel.
 
-	  This option is only available if you selected halt and friends,
-	  but did not select init.
+	This option is only available if you selected halt and friends,
+	but did not select init.
 
 config BUSYBOX_TELINIT_PATH
 	string "Path to telinit executable"
 	default "/sbin/telinit"
 	depends on BUSYBOX_FEATURE_CALL_TELINIT
 	help
-	  When busybox halt and friends have to call external telinit
-	  to facilitate proper shutdown, this path is to be used when
-	  locating telinit executable.
+	When busybox halt and friends have to call external telinit
+	to facilitate proper shutdown, this path is to be used when
+	locating telinit executable.
 config BUSYBOX_INIT
-	bool "init"
+	bool "init (9.3 kb)"
 	default y
 	select BUSYBOX_FEATURE_SYSLOG
 	help
-	  init is the first program run when the system boots.
+	init is the first program run when the system boots.
 
 config BUSYBOX_LINUXRC
 	bool "linuxrc: support running init from initrd (not initramfs)"
 	default y
 	select BUSYBOX_FEATURE_SYSLOG
 	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.
+	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.
 
-	  This does not apply to initramfs, which runs /init as PID 1 and
-	  requires no special support.
+	This does not apply to initramfs, which runs /init as PID 1 and
+	requires no special support.
 
 config BUSYBOX_FEATURE_USE_INITTAB
 	bool "Support reading an inittab file"
 	default y
 	depends on BUSYBOX_INIT || BUSYBOX_LINUXRC
 	help
-	  Allow init to read an inittab file when the system boot.
+	Allow init to read an inittab file when the system boot.
 
 config BUSYBOX_FEATURE_KILL_REMOVED
 	bool "Support killing processes that have been removed from inittab"
 	default n
 	depends on BUSYBOX_FEATURE_USE_INITTAB
 	help
-	  When respawn entries are removed from inittab and a SIGHUP is
-	  sent to init, this option will make init kill the processes
-	  that have been removed.
+	When respawn entries are removed from inittab and a SIGHUP is
+	sent to init, this option will make init kill the processes
+	that have been removed.
 
 config BUSYBOX_FEATURE_KILL_DELAY
 	int "How long to wait between TERM and KILL (0 - send TERM only)" if FEATURE_KILL_REMOVED
@@ -121,34 +121,34 @@ config BUSYBOX_FEATURE_KILL_DELAY
 	default 0
 	depends on BUSYBOX_FEATURE_KILL_REMOVED
 	help
-	  With nonzero setting, init sends TERM, forks, child waits N
-	  seconds, sends KILL and exits. Setting it too high is unwise
-	  (child will hang around for too long and could actually kill
-	  the wrong process!)
+	With nonzero setting, init sends TERM, forks, child waits N
+	seconds, sends KILL and exits. Setting it too high is unwise
+	(child will hang around for too long and could actually kill
+	the wrong process!)
 
 config BUSYBOX_FEATURE_INIT_SCTTY
 	bool "Run commands with leading dash with controlling tty"
 	default y
 	depends on BUSYBOX_INIT || BUSYBOX_LINUXRC
 	help
-	  If this option is enabled, init will try to give a controlling
-	  tty to any command which has leading hyphen (often it's "-/bin/sh").
-	  More precisely, init will do "ioctl(STDIN_FILENO, TIOCSCTTY, 0)".
-	  If device attached to STDIN_FILENO can be a ctty but is not yet
-	  a ctty for other session, it will become this process' ctty.
-	  This is not the traditional init behavour, but is often what you want
-	  in an embedded system where the console is only accessed during
-	  development or for maintenance.
-	  NB: using cttyhack applet may work better.
+	If this option is enabled, init will try to give a controlling
+	tty to any command which has leading hyphen (often it's "-/bin/sh").
+	More precisely, init will do "ioctl(STDIN_FILENO, TIOCSCTTY, 0)".
+	If device attached to STDIN_FILENO can be a ctty but is not yet
+	a ctty for other session, it will become this process' ctty.
+	This is not the traditional init behavour, but is often what you want
+	in an embedded system where the console is only accessed during
+	development or for maintenance.
+	NB: using cttyhack applet may work better.
 
 config BUSYBOX_FEATURE_INIT_SYSLOG
 	bool "Enable init to write to syslog"
 	default y
 	depends on BUSYBOX_INIT || BUSYBOX_LINUXRC
 	help
-	  If selected, some init messages are sent to syslog.
-	  Otherwise, they are sent to VT #5 if linux virtual tty is detected
-	  (if not, no separate logging is done).
+	If selected, some init messages are sent to syslog.
+	Otherwise, they are sent to VT #5 if linux virtual tty is detected
+	(if not, no separate logging is done).
 
 config BUSYBOX_FEATURE_INIT_QUIET
 	bool "Be quiet on boot (no 'init started:' message)"
@@ -160,36 +160,36 @@ config BUSYBOX_FEATURE_INIT_COREDUMPS
 	default n	# not Y because this is a debug option
 	depends on BUSYBOX_INIT || BUSYBOX_LINUXRC
 	help
-	  If this option is enabled and the file /.init_enable_core
-	  exists, then init will call setrlimit() to allow unlimited
-	  core file sizes. If this option is disabled, processes
-	  will not generate any core files.
+	If this option is enabled and the file /.init_enable_core
+	exists, then init will call setrlimit() to allow unlimited
+	core file sizes. If this option is disabled, processes
+	will not generate any core files.
 
 config BUSYBOX_INIT_TERMINAL_TYPE
 	string "Initial terminal type"
 	default "linux"
 	depends on BUSYBOX_INIT || BUSYBOX_LINUXRC
 	help
-	  This is the initial value set by init for the TERM environment
-	  variable. This variable is used by programs which make use of
-	  extended terminal capabilities.
+	This is the initial value set by init for the TERM environment
+	variable. This variable is used by programs which make use of
+	extended terminal capabilities.
 
-	  Note that on Linux, init attempts to detect serial terminal and
-	  sets TERM to "vt102" if one is found.
+	Note that on Linux, init attempts to detect serial terminal and
+	sets TERM to "vt102" if one is found.
 
 config BUSYBOX_FEATURE_INIT_MODIFY_CMDLINE
 	bool "Clear init's command line"
 	default y
 	depends on BUSYBOX_INIT || BUSYBOX_LINUXRC
 	help
-	  When launched as PID 1 and after parsing its arguments, init
-	  wipes all the arguments but argv[0] and rewrites argv[0] to
-	  contain only "init", so that its command line appears solely as
-	  "init" in tools such as ps.
-	  If this option is set to Y, init will keep its original behavior,
-	  otherwise, all the arguments including argv[0] will be preserved,
-	  be they parsed or ignored by init.
-	  The original command-line used to launch init can then be
-	  retrieved in /proc/1/cmdline on Linux, for example.
+	When launched as PID 1 and after parsing its arguments, init
+	wipes all the arguments but argv[0] and rewrites argv[0] to
+	contain only "init", so that its command line appears solely as
+	"init" in tools such as ps.
+	If this option is set to Y, init will keep its original behavior,
+	otherwise, all the arguments including argv[0] will be preserved,
+	be they parsed or ignored by init.
+	The original command-line used to launch init can then be
+	retrieved in /proc/1/cmdline on Linux, for example.
 
 endmenu
diff --git a/config/busybox/klibc-utils/Config.in b/config/busybox/klibc-utils/Config.in
new file mode 100644
index 000000000..76264d245
--- /dev/null
+++ b/config/busybox/klibc-utils/Config.in
@@ -0,0 +1,43 @@
+# DO NOT EDIT. This file is generated from Config.src
+#
+# For a description of the syntax of this configuration file,
+# see scripts/kbuild/config-language.txt.
+#
+
+menu "klibc-utils"
+
+config BUSYBOX_MINIPS
+	bool "minips (11 kb)"
+	default n  # for god's sake, just use "ps" name in your scripts
+	help
+	Alias to "ps".
+config BUSYBOX_NUKE
+	bool "nuke"
+	default y
+	help
+	Alias to "rm -rf".
+config BUSYBOX_RESUME
+	bool "resume"
+	default y
+	help
+	Resume from saved "suspend-to-disk" image
+config BUSYBOX_RUN_INIT
+	bool "run-init"
+	default y
+	select BUSYBOX_PLATFORM_LINUX
+	help
+	The run-init utility is used from initramfs to select a new
+	root device. Under initramfs, you have to use this instead of
+	pivot_root.
+
+	Booting with initramfs extracts a gzipped cpio archive into rootfs
+	(which is a variant of ramfs/tmpfs). Because rootfs can't be moved
+	or unmounted, pivot_root will not work from initramfs. Instead,
+	run-init deletes everything out of rootfs (including itself),
+	does a mount --move that overmounts rootfs with the new root, and
+	then execs the specified init program.
+
+	util-linux has a similar tool, switch-root.
+	run-init differs by also having a "-d CAPS_TO_DROP" option.
+
+endmenu
diff --git a/config/busybox/libbb/Config.in b/config/busybox/libbb/Config.in
index 600f089ef..ed57cdce2 100644
--- a/config/busybox/libbb/Config.in
+++ b/config/busybox/libbb/Config.in
@@ -4,59 +4,59 @@
 # see scripts/kbuild/config-language.txt.
 #
 
-menu "Busybox Library Tuning"
+comment "Library Tuning"
 
 config BUSYBOX_FEATURE_USE_BSS_TAIL
 	bool "Use the end of BSS page"
 	default n
 	help
-	  Attempt to reclaim a small unused part of BSS.
-
-	  Executables have the following parts:
-	  = read-only executable code and constants, also known as "text"
-	  = read-write data
-	  = non-initialized (zeroed on demand) data, also known as "bss"
-
-	  At link time, "text" is padded to a full page. At runtime, all "text"
-	  pages are mapped RO and executable.
-	  "Data" starts on the next page boundary, but is not padded
-	  to a full page at the end. "Bss" starts wherever "data" ends.
-	  At runtime, "data" pages are mapped RW and they are file-backed
-	  (this includes a small portion of "bss" which may live in the last
-	  partial page of "data").
-	  Pages which are fully in "bss" are mapped to anonymous memory.
-
-	  "Bss" end is usually not page-aligned. There is an unused space
-	  in the last page. Linker marks its start with the "_end" symbol.
-
-	  This option will attempt to use that space for bb_common_bufsiz1[]
-	  array. If it fits after _end, it will be used, and COMMON_BUFSIZE
-	  will be enlarged from its guaranteed minimum size of 1 kbyte.
-	  This may require recompilation a second time, since value of _end
-	  is known only after final link.
-
-	  If you are getting a build error like this:
-	        appletlib.c:(.text.main+0xd): undefined reference to '_end'
-	  disable this option.
+	Attempt to reclaim a small unused part of BSS.
+
+	Executables have the following parts:
+	= read-only executable code and constants, also known as "text"
+	= read-write data
+	= non-initialized (zeroed on demand) data, also known as "bss"
+
+	At link time, "text" is padded to a full page. At runtime, all "text"
+	pages are mapped RO and executable.
+
+	"Data" starts on the next page boundary, but is not padded
+	to a full page at the end. "Bss" starts wherever "data" ends.
+	At runtime, "data" pages are mapped RW and they are file-backed
+	(this includes a small portion of "bss" which may live in the last
+	partial page of "data").
+	Pages which are fully in "bss" are mapped to anonymous memory.
+
+	"Bss" end is usually not page-aligned. There is an unused space
+	in the last page. Linker marks its start with the "_end" symbol.
+
+	This option will attempt to use that space for bb_common_bufsiz1[]
+	array. If it fits after _end, it will be used, and COMMON_BUFSIZE
+	will be enlarged from its guaranteed minimum size of 1 kbyte.
+	This may require recompilation a second time, since value of _end
+	is known only after final link.
+
+	If you are getting a build error like this:
+		appletlib.c:(.text.main+0xd): undefined reference to '_end'
+	disable this option.
 config BUSYBOX_FEATURE_RTMINMAX
 	bool "Support RTMIN[+n] and RTMAX[-n] signal names"
 	default y
 	help
-	  Support RTMIN[+n] and RTMAX[-n] signal names
-	  in kill, killall etc. This costs ~250 bytes.
+	Support RTMIN[+n] and RTMAX[-n] signal names
+	in kill, killall etc. This costs ~250 bytes.
 
 choice
 	prompt "Buffer allocation policy"
 	default BUSYBOX_FEATURE_BUFFERS_USE_MALLOC
 	help
-	  There are 3 ways BusyBox can handle buffer allocations:
-	  - Use malloc. This costs code size for the call to xmalloc.
-	  - Put them on stack. For some very small machines with limited stack
-	    space, this can be deadly. For most folks, this works just fine.
-	  - Put them in BSS. This works beautifully for computers with a real
-	    MMU (and OS support), but wastes runtime RAM for uCLinux. This
-	    behavior was the only one available for BusyBox versions 0.48 and
-	    earlier.
+	There are 3 ways busybox can handle buffer allocations:
+	- Use malloc. This costs code size for the call to xmalloc.
+	- Put them on stack. For some very small machines with limited stack
+	space, this can be deadly. For most folks, this works just fine.
+	- Put them in BSS. This works beautifully for computers with a real
+	MMU (and OS support), but wastes runtime RAM for uCLinux. This
+	behavior was the only one available for versions 0.48 and earlier.
 
 config BUSYBOX_FEATURE_BUFFERS_USE_MALLOC
 	bool "Allocate with Malloc"
@@ -74,52 +74,52 @@ config BUSYBOX_PASSWORD_MINLEN
 	default 6
 	range 5 32
 	help
-	  Minimum allowable password length.
+	Minimum allowable password length.
 
 config BUSYBOX_MD5_SMALL
 	int "MD5: Trade bytes for speed (0:fast, 3:slow)"
 	default 1  # all "fast or small" options default to small
 	range 0 3
 	help
-	  Trade binary size versus speed for the md5sum algorithm.
-	  Approximate values running uClibc and hashing
-	  linux-2.4.4.tar.bz2 were:
-	                    user times (sec)  text size (386)
-	  0 (fastest)         1.1                6144
-	  1                   1.4                5392
-	  2                   3.0                5088
-	  3 (smallest)        5.1                4912
+	Trade binary size versus speed for the md5sum algorithm.
+	Approximate values running uClibc and hashing
+	linux-2.4.4.tar.bz2 were:
+	value               user times (sec)  text size (386)
+	0 (fastest)         1.1                6144
+	1                   1.4                5392
+	2                   3.0                5088
+	3 (smallest)        5.1                4912
 
 config BUSYBOX_SHA3_SMALL
 	int "SHA3: Trade bytes for speed (0:fast, 1:slow)"
 	default 1  # all "fast or small" options default to small
 	range 0 1
 	help
-	  Trade binary size versus speed for the sha3sum algorithm.
-	  SHA3_SMALL=0 compared to SHA3_SMALL=1 (approximate):
-	  64-bit x86: +270 bytes of code, 45% faster
-	  32-bit x86: +450 bytes of code, 75% faster
+	Trade binary size versus speed for the sha3sum algorithm.
+	SHA3_SMALL=0 compared to SHA3_SMALL=1 (approximate):
+	64-bit x86: +270 bytes of code, 45% faster
+	32-bit x86: +450 bytes of code, 75% faster
 
 config BUSYBOX_FEATURE_FAST_TOP
 	bool "Faster /proc scanning code (+100 bytes)"
 	default n  # all "fast or small" options default to small
 	help
-	  This option makes top (and ps) ~20% faster (or 20% less CPU hungry),
-	  but code size is slightly bigger.
+	This option makes top and ps ~20% faster (or 20% less CPU hungry),
+	but code size is slightly bigger.
 
 config BUSYBOX_FEATURE_ETC_NETWORKS
 	bool "Support /etc/networks"
 	default n
 	help
-	  Enable support for network names in /etc/networks. This is
-	  a rarely used feature which allows you to use names
-	  instead of IP/mask pairs in route command.
+	Enable support for network names in /etc/networks. This is
+	a rarely used feature which allows you to use names
+	instead of IP/mask pairs in route command.
 
 config BUSYBOX_FEATURE_EDITING
 	bool "Command line editing"
 	default y
 	help
-	  Enable line editing (mainly for shell command line).
+	Enable line editing (mainly for shell command line).
 
 config BUSYBOX_FEATURE_EDITING_MAX_LEN
 	int "Maximum length of input"
@@ -127,17 +127,17 @@ config BUSYBOX_FEATURE_EDITING_MAX_LEN
 	default 1024
 	depends on BUSYBOX_FEATURE_EDITING
 	help
-	  Line editing code uses on-stack buffers for storage.
-	  You may want to decrease this parameter if your target machine
-	  benefits from smaller stack usage.
+	Line editing code uses on-stack buffers for storage.
+	You may want to decrease this parameter if your target machine
+	benefits from smaller stack usage.
 
 config BUSYBOX_FEATURE_EDITING_VI
 	bool "vi-style line editing commands"
 	default n
 	depends on BUSYBOX_FEATURE_EDITING
 	help
-	  Enable vi-style line editing. In shells, this mode can be
-	  turned on and off with "set -o vi" and "set +o vi".
+	Enable vi-style line editing. In shells, this mode can be
+	turned on and off with "set -o vi" and "set +o vi".
 
 config BUSYBOX_FEATURE_EDITING_HISTORY
 	int "History size"
@@ -146,29 +146,29 @@ config BUSYBOX_FEATURE_EDITING_HISTORY
 	default 255
 	depends on BUSYBOX_FEATURE_EDITING
 	help
-	  Specify command history size (0 - disable).
+	Specify command history size (0 - disable).
 
 config BUSYBOX_FEATURE_EDITING_SAVEHISTORY
 	bool "History saving"
 	default y
 	depends on BUSYBOX_FEATURE_EDITING
 	help
-	  Enable history saving in shells.
+	Enable history saving in shells.
 
 config BUSYBOX_FEATURE_EDITING_SAVE_ON_EXIT
 	bool "Save history on shell exit, not after every command"
 	default n
 	depends on BUSYBOX_FEATURE_EDITING_SAVEHISTORY
 	help
-	  Save history on shell exit, not after every command.
+	Save history on shell exit, not after every command.
 
 config BUSYBOX_FEATURE_REVERSE_SEARCH
 	bool "Reverse history search"
 	default y
 	depends on BUSYBOX_FEATURE_EDITING
 	help
-	  Enable readline-like Ctrl-R combination for reverse history search.
-	  Increases code by about 0.5k.
+	Enable readline-like Ctrl-R combination for reverse history search.
+	Increases code by about 0.5k.
 
 config BUSYBOX_FEATURE_TAB_COMPLETION
 	bool "Tab completion"
@@ -185,236 +185,237 @@ config BUSYBOX_FEATURE_EDITING_FANCY_PROMPT
 	default y
 	depends on BUSYBOX_FEATURE_EDITING
 	help
-	  Setting this option allows for prompts to use things like \w and
-	  \$ and escape codes.
+	Setting this option allows for prompts to use things like \w and
+	\$ and escape codes.
 
 config BUSYBOX_FEATURE_EDITING_ASK_TERMINAL
 	bool "Query cursor position from terminal"
 	default n
 	depends on BUSYBOX_FEATURE_EDITING
 	help
-	  Allow usage of "ESC [ 6 n" sequence. Terminal answers back with
-	  current cursor position. This information is used to make line
-	  editing more robust in some cases.
-	  If you are not sure whether your terminals respond to this code
-	  correctly, or want to save on code size (about 400 bytes),
-	  then do not turn this option on.
+	Allow usage of "ESC [ 6 n" sequence. Terminal answers back with
+	current cursor position. This information is used to make line
+	editing more robust in some cases.
+	If you are not sure whether your terminals respond to this code
+	correctly, or want to save on code size (about 400 bytes),
+	then do not turn this option on.
 
 config BUSYBOX_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.
+	Enable this if your system has locale support and you would like
+	busybox to support locale settings.
 
 config BUSYBOX_UNICODE_SUPPORT
 	bool "Support Unicode"
 	default y
 	help
-	  This makes various applets aware that one byte is not
-	  one character on screen.
+	This makes various applets aware that one byte is not
+	one character on screen.
 
-	  Busybox aims to eventually work correctly with Unicode displays.
-	  Any older encodings are not guaranteed to work.
-	  Probably by the time when busybox will be fully Unicode-clean,
-	  other encodings will be mainly of historic interest.
+	Busybox aims to eventually work correctly with Unicode displays.
+	Any older encodings are not guaranteed to work.
+	Probably by the time when busybox will be fully Unicode-clean,
+	other encodings will be mainly of historic interest.
 
 config BUSYBOX_UNICODE_USING_LOCALE
 	bool "Use libc routines for Unicode (else uses internal ones)"
 	default n
 	depends on BUSYBOX_UNICODE_SUPPORT && BUSYBOX_LOCALE_SUPPORT
 	help
-	  With this option on, Unicode support is implemented using libc
-	  routines. Otherwise, internal implementation is used.
-	  Internal implementation is smaller.
+	With this option on, Unicode support is implemented using libc
+	routines. Otherwise, internal implementation is used.
+	Internal implementation is smaller.
 
 config BUSYBOX_FEATURE_CHECK_UNICODE_IN_ENV
 	bool "Check $LC_ALL, $LC_CTYPE and $LANG environment variables"
 	default n
 	depends on BUSYBOX_UNICODE_SUPPORT && !BUSYBOX_UNICODE_USING_LOCALE
 	help
-	  With this option on, Unicode support is activated
-	  only if locale-related variables have the value of the form
-	  "xxxx.utf8"
+	With this option on, Unicode support is activated
+	only if locale-related variables have the value of the form
+	"xxxx.utf8"
 
-	  Otherwise, Unicode support will be always enabled and active.
+	Otherwise, Unicode support will be always enabled and active.
 
 config BUSYBOX_SUBST_WCHAR
 	int "Character code to substitute unprintable characters with"
 	depends on BUSYBOX_UNICODE_SUPPORT
 	default 63
 	help
-	  Typical values are 63 for '?' (works with any output device),
-	  30 for ASCII substitute control code,
-	  65533 (0xfffd) for Unicode replacement character.
+	Typical values are 63 for '?' (works with any output device),
+	30 for ASCII substitute control code,
+	65533 (0xfffd) for Unicode replacement character.
 
 config BUSYBOX_LAST_SUPPORTED_WCHAR
 	int "Range of supported Unicode characters"
 	depends on BUSYBOX_UNICODE_SUPPORT
 	default 767
 	help
-	  Any character with Unicode value bigger than this is assumed
-	  to be non-printable on output device. Many applets replace
-	  such characters with substitution character.
-
-	  The idea is that many valid printable Unicode chars
-	  nevertheless are not displayed correctly. Think about
-	  combining charachers, double-wide hieroglyphs, obscure
-	  characters in dozens of ancient scripts...
-	  Many terminals, terminal emulators, xterms etc will fail
-	  to handle them correctly. Choose the smallest value
-	  which suits your needs.
-
-	  Typical values are:
-	  126 - ASCII only
-	  767 (0x2ff) - there are no combining chars in [0..767] range
+	Any character with Unicode value bigger than this is assumed
+	to be non-printable on output device. Many applets replace
+	such characters with substitution character.
+
+	The idea is that many valid printable Unicode chars
+	nevertheless are not displayed correctly. Think about
+	combining charachers, double-wide hieroglyphs, obscure
+	characters in dozens of ancient scripts...
+	Many terminals, terminal emulators, xterms etc will fail
+	to handle them correctly. Choose the smallest value
+	which suits your needs.
+
+	Typical values are:
+	126 - ASCII only
+	767 (0x2ff) - there are no combining chars in [0..767] range
 			(the range includes Latin 1, Latin Ext. A and B),
 			code is ~700 bytes smaller for this case.
-	  4351 (0x10ff) - there are no double-wide chars in [0..4351] range,
+	4351 (0x10ff) - there are no double-wide chars in [0..4351] range,
 			code is ~300 bytes smaller for this case.
-	  12799 (0x31ff) - nearly all non-ideographic characters are
+	12799 (0x31ff) - nearly all non-ideographic characters are
 			available in [0..12799] range, including
 			East Asian scripts like katakana, hiragana, hangul,
 			bopomofo...
-	  0 - off, any valid printable Unicode character will be printed.
+	0 - off, any valid printable Unicode character will be printed.
 
 config BUSYBOX_UNICODE_COMBINING_WCHARS
 	bool "Allow zero-width Unicode characters on output"
 	default n
 	depends on BUSYBOX_UNICODE_SUPPORT
 	help
-	  With this option off, any Unicode char with width of 0
-	  is substituted on output.
+	With this option off, any Unicode char with width of 0
+	is substituted on output.
 
 config BUSYBOX_UNICODE_WIDE_WCHARS
 	bool "Allow wide Unicode characters on output"
 	default n
 	depends on BUSYBOX_UNICODE_SUPPORT
 	help
-	  With this option off, any Unicode char with width > 1
-	  is substituted on output.
+	With this option off, any Unicode char with width > 1
+	is substituted on output.
 
 config BUSYBOX_UNICODE_BIDI_SUPPORT
 	bool "Bidirectional character-aware line input"
 	default n
 	depends on BUSYBOX_UNICODE_SUPPORT && !BUSYBOX_UNICODE_USING_LOCALE
 	help
-	  With this option on, right-to-left Unicode characters
-	  are treated differently on input (e.g. cursor movement).
+	With this option on, right-to-left Unicode characters
+	are treated differently on input (e.g. cursor movement).
 
 config BUSYBOX_UNICODE_NEUTRAL_TABLE
 	bool "In bidi input, support non-ASCII neutral chars too"
 	default n
 	depends on BUSYBOX_UNICODE_BIDI_SUPPORT
 	help
-	  In most cases it's enough to treat only ASCII non-letters
-	  (i.e. punctuation, numbers and space) as characters
-	  with neutral directionality.
-	  With this option on, more extensive (and bigger) table
-	  of neutral chars will be used.
+	In most cases it's enough to treat only ASCII non-letters
+	(i.e. punctuation, numbers and space) as characters
+	with neutral directionality.
+	With this option on, more extensive (and bigger) table
+	of neutral chars will be used.
 
 config BUSYBOX_UNICODE_PRESERVE_BROKEN
 	bool "Make it possible to enter sequences of chars which are not Unicode"
 	default n
 	depends on BUSYBOX_UNICODE_SUPPORT
 	help
-	  With this option on, on line-editing input (such as used by shells)
-	  invalid UTF-8 bytes are not substituted with the selected
-	  substitution character.
-	  For example, this means that entering 'l', 's', ' ', 0xff, [Enter]
-	  at shell prompt will list file named 0xff (single char name
-	  with char value 255), not file named '?'.
+	With this option on, on line-editing input (such as used by shells)
+	invalid UTF-8 bytes are not substituted with the selected
+	substitution character.
+	For example, this means that entering 'l', 's', ' ', 0xff, [Enter]
+	at shell prompt will list file named 0xff (single char name
+	with char value 255), not file named '?'.
 
 config BUSYBOX_FEATURE_NON_POSIX_CP
 	bool "Non-POSIX, but safer, copying to special nodes"
 	default y
 	help
-	  With this option, "cp file symlink" will delete symlink
-	  and create a regular file. This does not conform to POSIX,
-	  but prevents a symlink attack.
-	  Similarly, "cp file device" will not send file's data
-	  to the device. (To do that, use "cat file >device")
+	With this option, "cp file symlink" will delete symlink
+	and create a regular file. This does not conform to POSIX,
+	but prevents a symlink attack.
+	Similarly, "cp file device" will not send file's data
+	to the device. (To do that, use "cat file >device")
 
 config BUSYBOX_FEATURE_VERBOSE_CP_MESSAGE
 	bool "Give more precise messages when copy fails (cp, mv etc)"
 	default n
 	help
-	  Error messages with this feature enabled:
-	    $ cp file /does_not_exist/file
-	    cp: cannot create '/does_not_exist/file': Path does not exist
-	    $ cp file /vmlinuz/file
-	    cp: cannot stat '/vmlinuz/file': Path has non-directory component
-	  If this feature is not enabled, they will be, respectively:
-	    cp: cannot create '/does_not_exist/file': No such file or directory
-	    cp: cannot stat '/vmlinuz/file': Not a directory
-	  This will cost you ~60 bytes.
+	Error messages with this feature enabled:
+
+	$ cp file /does_not_exist/file
+	cp: cannot create '/does_not_exist/file': Path does not exist
+	$ cp file /vmlinuz/file
+	cp: cannot stat '/vmlinuz/file': Path has non-directory component
+
+	If this feature is not enabled, they will be, respectively:
+
+	cp: cannot create '/does_not_exist/file': No such file or directory
+	cp: cannot stat '/vmlinuz/file': Not a directory
+
+	This will cost you ~60 bytes.
 
 config BUSYBOX_FEATURE_USE_SENDFILE
 	bool "Use sendfile system call"
 	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  When enabled, busybox will use the kernel sendfile() function
-	  instead of read/write loops to copy data between file descriptors
-	  (for example, cp command does this a lot).
-	  If sendfile() doesn't work, copying code falls back to read/write
-	  loop. sendfile() was originally implemented for faster I/O
-	  from files to sockets, but since Linux 2.6.33 it was extended
-	  to work for many more file types.
+	When enabled, busybox will use the kernel sendfile() function
+	instead of read/write loops to copy data between file descriptors
+	(for example, cp command does this a lot).
+	If sendfile() doesn't work, copying code falls back to read/write
+	loop. sendfile() was originally implemented for faster I/O
+	from files to sockets, but since Linux 2.6.33 it was extended
+	to work for many more file types.
 
 config BUSYBOX_FEATURE_COPYBUF_KB
 	int "Copy buffer size, in kilobytes"
 	range 1 1024
 	default 4
 	help
-	  Size of buffer used by cp, mv, install, wget etc.
-	  Buffers which are 4 kb or less will be allocated on stack.
-	  Bigger buffers will be allocated with mmap, with fallback to 4 kb
-	  stack buffer if mmap fails.
+	Size of buffer used by cp, mv, install, wget etc.
+	Buffers which are 4 kb or less will be allocated on stack.
+	Bigger buffers will be allocated with mmap, with fallback to 4 kb
+	stack buffer if mmap fails.
 
 config BUSYBOX_FEATURE_SKIP_ROOTFS
 	bool "Skip rootfs in mount table"
 	default y
 	help
-	  Ignore rootfs entry in mount table.
+	Ignore rootfs entry in mount table.
 
-	  In Linux, kernel has a special filesystem, rootfs, which is initially
-	  mounted on /. It contains initramfs data, if kernel is configured
-	  to have one. Usually, another file system is mounted over / early
-	  in boot process, and therefore most tools which manipulate
-	  mount table, such as df, will skip rootfs entry.
+	In Linux, kernel has a special filesystem, rootfs, which is initially
+	mounted on /. It contains initramfs data, if kernel is configured
+	to have one. Usually, another file system is mounted over / early
+	in boot process, and therefore most tools which manipulate
+	mount table, such as df, will skip rootfs entry.
 
-	  However, some systems do not mount anything on /.
-	  If you need to configure busybox for one of these systems,
-	  you may find it useful to turn this option off to make df show
-	  initramfs statistics.
+	However, some systems do not mount anything on /.
+	If you need to configure busybox for one of these systems,
+	you may find it useful to turn this option off to make df show
+	initramfs statistics.
 
-	  Otherwise, choose Y.
+	Otherwise, choose Y.
 
 config BUSYBOX_MONOTONIC_SYSCALL
 	bool "Use clock_gettime(CLOCK_MONOTONIC) syscall"
 	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  Use clock_gettime(CLOCK_MONOTONIC) syscall for measuring
-	  time intervals (time, ping, traceroute etc need this).
-	  Probably requires Linux 2.6+. If not selected, gettimeofday
-	  will be used instead (which gives wrong results if date/time
-	  is reset).
+	Use clock_gettime(CLOCK_MONOTONIC) syscall for measuring
+	time intervals (time, ping, traceroute etc need this).
+	Probably requires Linux 2.6+. If not selected, gettimeofday
+	will be used instead (which gives wrong results if date/time
+	is reset).
 
 config BUSYBOX_IOCTL_HEX2STR_ERROR
 	bool "Use ioctl names rather than hex values in error messages"
 	default y
 	help
-	  Use ioctl names rather than hex values in error messages
-	  (e.g. VT_DISALLOCATE rather than 0x5608). If disabled this
-	  saves about 1400 bytes.
+	Use ioctl names rather than hex values in error messages
+	(e.g. VT_DISALLOCATE rather than 0x5608). If disabled this
+	saves about 1400 bytes.
 
 config BUSYBOX_FEATURE_HWIB
 	bool "Support infiniband HW"
 	default y
 	help
-	  Support for printing infiniband addresses in
-	  network applets.
-
-endmenu
+	Support for printing infiniband addresses in network applets.
diff --git a/config/busybox/loginutils/Config.in b/config/busybox/loginutils/Config.in
index 11dd33b1b..6c8617a77 100644
--- a/config/busybox/loginutils/Config.in
+++ b/config/busybox/loginutils/Config.in
@@ -10,147 +10,139 @@ config BUSYBOX_FEATURE_SHADOWPASSWDS
 	bool "Support shadow passwords"
 	default y
 	help
-	  Build support for shadow password in /etc/shadow. This file is only
-	  readable by root and thus the encrypted passwords are no longer
-	  publicly readable.
+	Build support for shadow password in /etc/shadow. This file is only
+	readable by root and thus the encrypted passwords are no longer
+	publicly readable.
 
 config BUSYBOX_USE_BB_PWD_GRP
 	bool "Use internal password and group functions rather than system functions"
 	default y
 	help
-	  If you leave this disabled, busybox will use the system's password
-	  and group functions. And if you are using the GNU C library
-	  (glibc), you will then need to install the /etc/nsswitch.conf
-	  configuration file and the required /lib/libnss_* libraries in
-	  order for the password and group functions to work. This generally
-	  makes your embedded system quite a bit larger.
-
-	  Enabling this option will cause busybox to directly access the
-	  system's /etc/password, /etc/group files (and your system will be
-	  smaller, and I will get fewer emails asking about how glibc NSS
-	  works). When this option is enabled, you will not be able to use
-	  PAM to access remote LDAP password servers and whatnot. And if you
-	  want hostname resolution to work with glibc, you still need the
-	  /lib/libnss_* libraries.
-
-	  If you need to use glibc's nsswitch.conf mechanism
-	  (e.g. if user/group database is NOT stored in /etc/passwd etc),
-	  you must NOT use this option.
-
-	  If you enable this option, it will add about 1.5k.
+	If you leave this disabled, busybox will use the system's password
+	and group functions. And if you are using the GNU C library
+	(glibc), you will then need to install the /etc/nsswitch.conf
+	configuration file and the required /lib/libnss_* libraries in
+	order for the password and group functions to work. This generally
+	makes your embedded system quite a bit larger.
+
+	Enabling this option will cause busybox to directly access the
+	system's /etc/password, /etc/group files (and your system will be
+	smaller, and I will get fewer emails asking about how glibc NSS
+	works). When this option is enabled, you will not be able to use
+	PAM to access remote LDAP password servers and whatnot. And if you
+	want hostname resolution to work with glibc, you still need the
+	/lib/libnss_* libraries.
+
+	If you need to use glibc's nsswitch.conf mechanism
+	(e.g. if user/group database is NOT stored in /etc/passwd etc),
+	you must NOT use this option.
+
+	If you enable this option, it will add about 1.5k.
 
 config BUSYBOX_USE_BB_SHADOW
 	bool "Use internal shadow password functions"
 	default y
 	depends on BUSYBOX_USE_BB_PWD_GRP && BUSYBOX_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
-	  (glibc), you will then need to install the /etc/nsswitch.conf
-	  configuration file and the required /lib/libnss_* libraries in
-	  order for the shadow password functions to work. This generally
-	  makes your embedded system quite a bit larger.
-
-	  Enabling this option will cause busybox to directly access the
-	  system's /etc/shadow file when handling shadow passwords. This
-	  makes your system smaller (and I will get fewer emails asking about
-	  how glibc NSS works). When this option is enabled, you will not be
-	  able to use PAM to access shadow passwords from remote LDAP
-	  password servers and whatnot.
+	If you leave this disabled, busybox will use the system's shadow
+	password handling functions. And if you are using the GNU C library
+	(glibc), you will then need to install the /etc/nsswitch.conf
+	configuration file and the required /lib/libnss_* libraries in
+	order for the shadow password functions to work. This generally
+	makes your embedded system quite a bit larger.
+
+	Enabling this option will cause busybox to directly access the
+	system's /etc/shadow file when handling shadow passwords. This
+	makes your system smaller (and I will get fewer emails asking about
+	how glibc NSS works). When this option is enabled, you will not be
+	able to use PAM to access shadow passwords from remote LDAP
+	password servers and whatnot.
 
 config BUSYBOX_USE_BB_CRYPT
 	bool "Use internal crypt functions"
 	default y
 	help
-	  Busybox has internal DES and MD5 crypt functions.
-	  They produce results which are identical to corresponding
-	  standard C library functions.
+	Busybox has internal DES and MD5 crypt functions.
+	They produce results which are identical to corresponding
+	standard C library functions.
 
-	  If you leave this disabled, busybox will use the system's
-	  crypt functions. Most C libraries use large (~70k)
-	  static buffers there, and also combine them with more general
-	  DES encryption/decryption.
+	If you leave this disabled, busybox will use the system's
+	crypt functions. Most C libraries use large (~70k)
+	static buffers there, and also combine them with more general
+	DES encryption/decryption.
 
-	  For busybox, having large static buffers is undesirable,
-	  especially on NOMMU machines. Busybox also doesn't need
-	  DES encryption/decryption and can do with smaller code.
+	For busybox, having large static buffers is undesirable,
+	especially on NOMMU machines. Busybox also doesn't need
+	DES encryption/decryption and can do with smaller code.
 
-	  If you enable this option, it will add about 4.8k of code
-	  if you are building dynamically linked executable.
-	  In static build, it makes code _smaller_ by about 1.2k,
-	  and likely many kilobytes less of bss.
+	If you enable this option, it will add about 4.8k of code
+	if you are building dynamically linked executable.
+	In static build, it makes code _smaller_ by about 1.2k,
+	and likely many kilobytes less of bss.
 
 config BUSYBOX_USE_BB_CRYPT_SHA
 	bool "Enable SHA256/512 crypt functions"
 	default y
 	depends on BUSYBOX_USE_BB_CRYPT
 	help
-	  Enable this if you have passwords starting with "$5$" or "$6$"
-	  in your /etc/passwd or /etc/shadow files. These passwords
-	  are hashed using SHA256 and SHA512 algorithms. Support for them
-	  was added to glibc in 2008.
-	  With this option off, login will fail password check for any
-	  user which has password encrypted with these algorithms.
+	Enable this if you have passwords starting with "$5$" or "$6$"
+	in your /etc/passwd or /etc/shadow files. These passwords
+	are hashed using SHA256 and SHA512 algorithms. Support for them
+	was added to glibc in 2008.
+	With this option off, login will fail password check for any
+	user which has password encrypted with these algorithms.
 
 config BUSYBOX_ADD_SHELL
-       bool "add-shell"
-       default y if BUSYBOX_DESKTOP
-       help
-         Add shells to /etc/shells.
+	bool "add-shell (2.8 kb)"
+	default y if BUSYBOX_DESKTOP
+	help
+	Add shells to /etc/shells.
 
 config BUSYBOX_REMOVE_SHELL
-       bool "remove-shell"
-       default y if BUSYBOX_DESKTOP
-       help
-         Remove shells from /etc/shells.
+	bool "remove-shell (2.7 kb)"
+	default y if BUSYBOX_DESKTOP
+	help
+	Remove shells from /etc/shells.
 config BUSYBOX_ADDGROUP
-	bool "addgroup"
+	bool "addgroup (8.2 kb)"
 	default y
+	select BUSYBOX_LONG_OPTS
 	help
-	  Utility for creating a new group account.
-
-config BUSYBOX_FEATURE_ADDGROUP_LONG_OPTIONS
-	bool "Enable long options"
-	default y
-	depends on BUSYBOX_ADDGROUP && BUSYBOX_LONG_OPTS
+	Utility for creating a new group account.
 
 config BUSYBOX_FEATURE_ADDUSER_TO_GROUP
 	bool "Support adding users to groups"
 	default y
 	depends on BUSYBOX_ADDGROUP
 	help
-	  If called with two non-option arguments,
-	  addgroup will add an existing user to an
-	  existing group.
+	If called with two non-option arguments,
+	addgroup will add an existing user to an
+	existing group.
 config BUSYBOX_ADDUSER
-	bool "adduser"
+	bool "adduser (15 kb)"
 	default y
+	select BUSYBOX_LONG_OPTS
 	help
-	  Utility for creating a new user account.
-
-config BUSYBOX_FEATURE_ADDUSER_LONG_OPTIONS
-	bool "Enable long options"
-	default y
-	depends on BUSYBOX_ADDUSER && BUSYBOX_LONG_OPTS
+	Utility for creating a new user account.
 
 config BUSYBOX_FEATURE_CHECK_NAMES
 	bool "Enable sanity check on user/group names in adduser and addgroup"
 	default n
 	depends on BUSYBOX_ADDUSER || BUSYBOX_ADDGROUP
 	help
-	  Enable sanity check on user and group names in adduser and addgroup.
-	  To avoid problems, the user or group name should consist only of
-	  letters, digits, underscores, periods, at signs and dashes,
-	  and not start with a dash (as defined by IEEE Std 1003.1-2001).
-	  For compatibility with Samba machine accounts "$" is also supported
-	  at the end of the user or group name.
+	Enable sanity check on user and group names in adduser and addgroup.
+	To avoid problems, the user or group name should consist only of
+	letters, digits, underscores, periods, at signs and dashes,
+	and not start with a dash (as defined by IEEE Std 1003.1-2001).
+	For compatibility with Samba machine accounts "$" is also supported
+	at the end of the user or group name.
 
 config BUSYBOX_LAST_ID
 	int "Last valid uid or gid for adduser and addgroup"
 	depends on BUSYBOX_ADDUSER || BUSYBOX_ADDGROUP
 	default 60000
 	help
-	  Last valid uid or gid for adduser and addgroup
+	Last valid uid or gid for adduser and addgroup
 
 config BUSYBOX_FIRST_SYSTEM_ID
 	int "First valid system uid or gid for adduser and addgroup"
@@ -158,7 +150,7 @@ config BUSYBOX_FIRST_SYSTEM_ID
 	range 0 BUSYBOX_LAST_ID
 	default 100
 	help
-	  First valid system uid or gid for adduser and addgroup
+	First valid system uid or gid for adduser and addgroup
 
 config BUSYBOX_LAST_SYSTEM_ID
 	int "Last valid system uid or gid for adduser and addgroup"
@@ -166,144 +158,144 @@ config BUSYBOX_LAST_SYSTEM_ID
 	range BUSYBOX_FIRST_SYSTEM_ID BUSYBOX_LAST_ID
 	default 999
 	help
-	  Last valid system uid or gid for adduser and addgroup
+	Last valid system uid or gid for adduser and addgroup
 config BUSYBOX_CHPASSWD
-	bool "chpasswd"
+	bool "chpasswd (18 kb)"
 	default y
 	help
-	  Reads a file of user name and password pairs from standard input
-	  and uses this information to update a group of existing users.
+	Reads a file of user name and password pairs from standard input
+	and uses this information to update a group of existing users.
 
 config BUSYBOX_FEATURE_DEFAULT_PASSWD_ALGO
 	string "Default encryption method (passwd -a, cryptpw -m, chpasswd -c ALG)"
 	default "des"
 	depends on BUSYBOX_PASSWD || BUSYBOX_CRYPTPW || BUSYBOX_CHPASSWD
 	help
-	  Possible choices are "d[es]", "m[d5]", "s[ha256]" or "sha512".
+	Possible choices are "d[es]", "m[d5]", "s[ha256]" or "sha512".
 config BUSYBOX_CRYPTPW
-	bool "cryptpw"
+	bool "cryptpw (14 kb)"
 	default y
 	help
-	  Encrypts the given password with the crypt(3) libc function
-	  using the given salt.
+	Encrypts the given password with the crypt(3) libc function
+	using the given salt.
 
 config BUSYBOX_MKPASSWD
-	bool "mkpasswd"
+	bool "mkpasswd (15 kb)"
 	default y
 	help
-	  Encrypts the given password with the crypt(3) libc function
-	  using the given salt. Debian has this utility under mkpasswd
-	  name. Busybox provides mkpasswd as an alias for cryptpw.
+	Encrypts the given password with the crypt(3) libc function
+	using the given salt. Debian has this utility under mkpasswd
+	name. Busybox provides mkpasswd as an alias for cryptpw.
 config BUSYBOX_DELUSER
-	bool "deluser"
+	bool "deluser (8.4 kb)"
 	default y
 	help
-	  Utility for deleting a user account.
+	Utility for deleting a user account.
 
 config BUSYBOX_DELGROUP
-	bool "delgroup"
+	bool "delgroup (5.6 kb)"
 	default y
 	help
-	  Utility for deleting a group account.
+	Utility for deleting a group account.
 
 config BUSYBOX_FEATURE_DEL_USER_FROM_GROUP
 	bool "Support removing users from groups"
 	default y
 	depends on BUSYBOX_DELGROUP
 	help
-	  If called with two non-option arguments, deluser
-	  or delgroup will remove an user from a specified group.
+	If called with two non-option arguments, deluser
+	or delgroup will remove an user from a specified group.
 config BUSYBOX_GETTY
-	bool "getty"
+	bool "getty (10 kb)"
 	default y
 	select BUSYBOX_FEATURE_SYSLOG
 	help
-	  getty lets you log in on a tty. It is normally invoked by init.
-
-	  Note that you can save a few bytes by disabling it and
-	  using login applet directly.
-	  If you need to reset tty attributes before calling login,
-	  this script approximates getty:
-
-	  exec </dev/$1 >/dev/$1 2>&1 || exit 1
-	  reset
-	  stty sane; stty ispeed 38400; stty ospeed 38400
-	  printf "%s login: " "`hostname`"
-	  read -r login
-	  exec /bin/login "$login"
+	getty lets you log in on a tty. It is normally invoked by init.
+
+	Note that you can save a few bytes by disabling it and
+	using login applet directly.
+	If you need to reset tty attributes before calling login,
+	this script approximates getty:
+
+	exec </dev/$1 >/dev/$1 2>&1 || exit 1
+	reset
+	stty sane; stty ispeed 38400; stty ospeed 38400
+	printf "%s login: " "`hostname`"
+	read -r login
+	exec /bin/login "$login"
 config BUSYBOX_LOGIN
-	bool "login"
+	bool "login (24 kb)"
 	default y
 	select BUSYBOX_FEATURE_SYSLOG
 	help
-	  login is used when signing onto a system.
+	login is used when signing onto a system.
 
-	  Note that Busybox binary must be setuid root for this applet to
-	  work properly.
+	Note that busybox binary must be setuid root for this applet to
+	work properly.
 
 config BUSYBOX_LOGIN_SESSION_AS_CHILD
 	bool "Run logged in session in a child process"
 	default y if BUSYBOX_PAM
 	depends on BUSYBOX_LOGIN
 	help
-	  Run the logged in session in a child process.  This allows
-	  login to clean up things such as utmp entries or PAM sessions
-	  when the login session is complete.  If you use PAM, you
-	  almost always would want this to be set to Y, else PAM session
-	  will not be cleaned up.
+	Run the logged in session in a child process.  This allows
+	login to clean up things such as utmp entries or PAM sessions
+	when the login session is complete.  If you use PAM, you
+	almost always would want this to be set to Y, else PAM session
+	will not be cleaned up.
 
 config BUSYBOX_LOGIN_SCRIPTS
 	bool "Support login scripts"
 	depends on BUSYBOX_LOGIN
 	default y
 	help
-	  Enable this if you want login to execute $LOGIN_PRE_SUID_SCRIPT
-	  just prior to switching from root to logged-in user.
+	Enable this if you want login to execute $LOGIN_PRE_SUID_SCRIPT
+	just prior to switching from root to logged-in user.
 
 config BUSYBOX_FEATURE_NOLOGIN
 	bool "Support /etc/nologin"
 	default y
 	depends on BUSYBOX_LOGIN
 	help
-	  The file /etc/nologin is used by (some versions of) login(1).
-	  If it exists, non-root logins are prohibited.
+	The file /etc/nologin is used by (some versions of) login(1).
+	If it exists, non-root logins are prohibited.
 
 config BUSYBOX_FEATURE_SECURETTY
 	bool "Support /etc/securetty"
 	default y
 	depends on BUSYBOX_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.
+	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 BUSYBOX_PASSWD
-	bool "passwd"
+	bool "passwd (21 kb)"
 	default y
 	select BUSYBOX_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
-	  may change the password for any account. The administrator of a group
-	  may change the password for the group.
+	passwd changes passwords for user and group accounts. A normal user
+	may only change the password for his/her own account, the super user
+	may change the password for any account. The administrator of a group
+	may change the password for the group.
 
-	  Note that Busybox binary must be setuid root for this applet to
-	  work properly.
+	Note that busybox binary must be setuid root for this applet to
+	work properly.
 
 config BUSYBOX_FEATURE_PASSWD_WEAK_CHECK
 	bool "Check new passwords for weakness"
 	default y
 	depends on BUSYBOX_PASSWD
 	help
-	  With this option passwd will refuse new passwords which are "weak".
+	With this option passwd will refuse new passwords which are "weak".
 config BUSYBOX_SU
-	bool "su"
+	bool "su (19 kb)"
 	default y
 	select BUSYBOX_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.
-	  Note that busybox binary must be setuid root for this applet to
-	  work properly.
+	su is used to become another user during a login session.
+	Invoked without a username, su defaults to becoming the super user.
+	Note that busybox binary must be setuid root for this applet to
+	work properly.
 
 config BUSYBOX_FEATURE_SU_SYSLOG
 	bool "Log to syslog all attempts to use su"
@@ -320,19 +312,19 @@ config BUSYBOX_FEATURE_SU_BLANK_PW_NEEDS_SECURE_TTY
 	default n
 	depends on BUSYBOX_SU
 config BUSYBOX_SULOGIN
-	bool "sulogin"
+	bool "sulogin (17 kb)"
 	default y
 	select BUSYBOX_FEATURE_SYSLOG
 	help
-	  sulogin is invoked when the system goes into single user
-	  mode (this is done through an entry in inittab).
+	sulogin is invoked when the system goes into single user
+	mode (this is done through an entry in inittab).
 config BUSYBOX_VLOCK
-	bool "vlock"
+	bool "vlock (17 kb)"
 	default y
 	help
-	  Build the "vlock" applet which allows you to lock (virtual) terminals.
+	Build the "vlock" applet which allows you to lock (virtual) terminals.
 
-	  Note that Busybox binary must be setuid root for this applet to
-	  work properly.
+	Note that busybox binary must be setuid root for this applet to
+	work properly.
 
 endmenu
diff --git a/config/busybox/mailutils/Config.in b/config/busybox/mailutils/Config.in
index 5cc8bc322..8c7adb2f8 100644
--- a/config/busybox/mailutils/Config.in
+++ b/config/busybox/mailutils/Config.in
@@ -2,50 +2,50 @@
 menu "Mail Utilities"
 
 config BUSYBOX_MAKEMIME
-	bool "makemime"
+	bool "makemime (5.9 kb)"
 	default y
 	help
-	  Create MIME-formatted messages.
+	Create MIME-formatted messages.
 config BUSYBOX_POPMAILDIR
-	bool "popmaildir"
+	bool "popmaildir (10 kb)"
 	default y
 	help
-	  Simple yet powerful POP3 mail popper. Delivers content
-	  of remote mailboxes to local Maildir.
+	Simple yet powerful POP3 mail popper. Delivers content
+	of remote mailboxes to local Maildir.
 
 config BUSYBOX_FEATURE_POPMAILDIR_DELIVERY
 	bool "Allow message filters and custom delivery program"
 	default y
 	depends on BUSYBOX_POPMAILDIR
 	help
-	  Allow to use a custom program to filter the content
-	  of the message before actual delivery (-F "prog [args...]").
-	  Allow to use a custom program for message actual delivery
-	  (-M "prog [args...]").
+	Allow to use a custom program to filter the content
+	of the message before actual delivery (-F "prog [args...]").
+	Allow to use a custom program for message actual delivery
+	(-M "prog [args...]").
 config BUSYBOX_REFORMIME
-	bool "reformime"
+	bool "reformime (7.5 kb)"
 	default y
 	help
-	  Parse MIME-formatted messages.
+	Parse MIME-formatted messages.
 
 config BUSYBOX_FEATURE_REFORMIME_COMPAT
 	bool "Accept and ignore options other than -x and -X"
 	default y
 	depends on BUSYBOX_REFORMIME
 	help
-	  Accept (for compatibility only) and ignore options
-	  other than -x and -X.
+	Accept (for compatibility only) and ignore options
+	other than -x and -X.
 config BUSYBOX_SENDMAIL
-	bool "sendmail"
+	bool "sendmail (14 kb)"
 	default y
 	help
-	  Barebones sendmail.
+	Barebones sendmail.
 
 config BUSYBOX_FEATURE_MIME_CHARSET
 	string "Default charset"
 	default "us-ascii"
 	depends on BUSYBOX_MAKEMIME || BUSYBOX_REFORMIME || BUSYBOX_SENDMAIL
 	help
-	  Default charset of the message.
+	Default charset of the message.
 
 endmenu
diff --git a/config/busybox/miscutils/Config.in b/config/busybox/miscutils/Config.in
index 6255c42f3..15f31a0cc 100644
--- a/config/busybox/miscutils/Config.in
+++ b/config/busybox/miscutils/Config.in
@@ -7,38 +7,38 @@
 menu "Miscellaneous Utilities"
 
 config BUSYBOX_ADJTIMEX
-	bool "adjtimex"
+	bool "adjtimex (4.5 kb)"
 	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  Adjtimex reads and optionally sets adjustment parameters for
-	  the Linux clock adjustment algorithm.
+	Adjtimex reads and optionally sets adjustment parameters for
+	the Linux clock adjustment algorithm.
 config BUSYBOX_BBCONFIG
-	bool "bbconfig"
+	bool "bbconfig (9.7 kb)"
 	default n
 	help
-	  The bbconfig applet will print the config file with which
-	  busybox was built.
+	The bbconfig applet will print the config file with which
+	busybox was built.
 
 config BUSYBOX_FEATURE_COMPRESS_BBCONFIG
 	bool "Compress bbconfig data"
 	default y
 	depends on BUSYBOX_BBCONFIG
 	help
-	  Store bbconfig data in compressed form, uncompress them on-the-fly
-	  before output.
+	Store bbconfig data in compressed form, uncompress them on-the-fly
+	before output.
 
-	  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.
+	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 BUSYBOX_BEEP
-	bool "beep"
+	bool "beep (3 kb)"
 	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  The beep applets beeps in a given freq/Hz.
+	The beep applets beeps in a given freq/Hz.
 
 config BUSYBOX_FEATURE_BEEP_FREQ
 	int "default frequency"
@@ -46,7 +46,7 @@ config BUSYBOX_FEATURE_BEEP_FREQ
 	default 4000
 	depends on BUSYBOX_BEEP
 	help
-	  Frequency for default beep.
+	Frequency for default beep.
 
 config BUSYBOX_FEATURE_BEEP_LENGTH_MS
 	int "default length"
@@ -54,343 +54,362 @@ config BUSYBOX_FEATURE_BEEP_LENGTH_MS
 	default 30
 	depends on BUSYBOX_BEEP
 	help
-	  Length in ms for default beep.
+	Length in ms for default beep.
 config BUSYBOX_CHAT
-	bool "chat"
+	bool "chat (6.6 kb)"
 	default y
 	help
-	  Simple chat utility.
+	Simple chat utility.
 
 config BUSYBOX_FEATURE_CHAT_NOFAIL
 	bool "Enable NOFAIL expect strings"
 	depends on BUSYBOX_CHAT
 	default y
 	help
-	  When enabled expect strings which are started with a dash trigger
-	  no-fail mode. That is when expectation is not met within timeout
-	  the script is not terminated but sends next SEND string and waits
-	  for next EXPECT string. This allows to compose far more flexible
-	  scripts.
+	When enabled expect strings which are started with a dash trigger
+	no-fail mode. That is when expectation is not met within timeout
+	the script is not terminated but sends next SEND string and waits
+	for next EXPECT string. This allows to compose far more flexible
+	scripts.
 
 config BUSYBOX_FEATURE_CHAT_TTY_HIFI
 	bool "Force STDIN to be a TTY"
 	depends on BUSYBOX_CHAT
 	default n
 	help
-	  Original chat always treats STDIN as a TTY device and sets for it
-	  so-called raw mode. This option turns on such behaviour.
+	Original chat always treats STDIN as a TTY device and sets for it
+	so-called raw mode. This option turns on such behaviour.
 
 config BUSYBOX_FEATURE_CHAT_IMPLICIT_CR
 	bool "Enable implicit Carriage Return"
 	depends on BUSYBOX_CHAT
 	default y
 	help
-	  When enabled make chat to terminate all SEND strings with a "\r"
-	  unless "\c" is met anywhere in the string.
+	When enabled make chat to terminate all SEND strings with a "\r"
+	unless "\c" is met anywhere in the string.
 
 config BUSYBOX_FEATURE_CHAT_SWALLOW_OPTS
 	bool "Swallow options"
 	depends on BUSYBOX_CHAT
 	default y
 	help
-	  Busybox chat require no options. To make it not fail when used
-	  in place of original chat (which has a bunch of options) turn
-	  this on.
+	Busybox chat require no options. To make it not fail when used
+	in place of original chat (which has a bunch of options) turn
+	this on.
 
 config BUSYBOX_FEATURE_CHAT_SEND_ESCAPES
 	bool "Support weird SEND escapes"
 	depends on BUSYBOX_CHAT
 	default y
 	help
-	  Original chat uses some escape sequences in SEND arguments which
-	  are not sent to device but rather performs special actions.
-	  E.g. "\K" means to send a break sequence to device.
-	  "\d" delays execution for a second, "\p" -- for a 1/100 of second.
-	  Before turning this option on think twice: do you really need them?
+	Original chat uses some escape sequences in SEND arguments which
+	are not sent to device but rather performs special actions.
+	E.g. "\K" means to send a break sequence to device.
+	"\d" delays execution for a second, "\p" -- for a 1/100 of second.
+	Before turning this option on think twice: do you really need them?
 
 config BUSYBOX_FEATURE_CHAT_VAR_ABORT_LEN
 	bool "Support variable-length ABORT conditions"
 	depends on BUSYBOX_CHAT
 	default y
 	help
-	  Original chat uses fixed 50-bytes length ABORT conditions. Say N here.
+	Original chat uses fixed 50-bytes length ABORT conditions. Say N here.
 
 config BUSYBOX_FEATURE_CHAT_CLR_ABORT
 	bool "Support revoking of ABORT conditions"
 	depends on BUSYBOX_CHAT
 	default y
 	help
-	  Support CLR_ABORT directive.
+	Support CLR_ABORT directive.
 config BUSYBOX_CONSPY
-	bool "conspy"
+	bool "conspy (10 kb)"
 	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  A text-mode VNC like program for Linux virtual terminals.
-	  example:  conspy NUM      shared access to console num
-	  or        conspy -nd NUM  screenshot of console num
-	  or        conspy -cs NUM  poor man's GNU screen like
+	A text-mode VNC like program for Linux virtual terminals.
+	example:  conspy NUM      shared access to console num
+	or        conspy -nd NUM  screenshot of console num
+	or        conspy -cs NUM  poor man's GNU screen like
 config BUSYBOX_CROND
-	bool "crond"
+	bool "crond (13 kb)"
 	default y
 	select BUSYBOX_FEATURE_SYSLOG
 	help
-	  Crond is a background daemon that parses individual crontab
-	  files and executes commands on behalf of the users in question.
-	  This is a port of dcron from slackware. It uses files of the
-	  format /var/spool/cron/crontabs/<username> files, for example:
-	      $ cat /var/spool/cron/crontabs/root
-	      # Run daily cron jobs at 4:40 every day:
-	      40 4 * * * /etc/cron/daily > /dev/null 2>&1
+	Crond is a background daemon that parses individual crontab
+	files and executes commands on behalf of the users in question.
+	This is a port of dcron from slackware. It uses files of the
+	format /var/spool/cron/crontabs/<username> files, for example:
+		$ cat /var/spool/cron/crontabs/root
+		# Run daily cron jobs at 4:40 every day:
+		40 4 * * * /etc/cron/daily > /dev/null 2>&1
 
 config BUSYBOX_FEATURE_CROND_D
-	bool "Support option -d to redirect output to stderr"
+	bool "Support -d (redirect output to stderr)"
 	depends on BUSYBOX_CROND
 	default y
 	help
-	  -d N sets loglevel (0:most verbose) and directs all output to stderr.
+	-d N sets loglevel (0:most verbose) and directs all output to stderr.
 
 config BUSYBOX_FEATURE_CROND_CALL_SENDMAIL
 	bool "Report command output via email (using sendmail)"
 	default y
 	depends on BUSYBOX_CROND
 	help
-	  Command output will be sent to corresponding user via email.
+	Command output will be sent to corresponding user via email.
+
+config BUSYBOX_FEATURE_CROND_SPECIAL_TIMES
+	bool "Support special times (@reboot, @daily, etc) in crontabs"
+	default y
+	depends on BUSYBOX_CROND
+	help
+	string        meaning
+	------        -------
+	@reboot       Run once, at startup
+	@yearly       Run once a year:  "0 0 1 1 *"
+	@annually     Same as @yearly:  "0 0 1 1 *"
+	@monthly      Run once a month: "0 0 1 * *"
+	@weekly       Run once a week:  "0 0 * * 0"
+	@daily        Run once a day:   "0 0 * * *"
+	@midnight     Same as @daily:   "0 0 * * *"
+	@hourly       Run once an hour: "0 * * * *"
 
 config BUSYBOX_FEATURE_CROND_DIR
 	string "crond spool directory"
 	default "/var/spool/cron"
 	depends on BUSYBOX_CROND || BUSYBOX_CRONTAB
 	help
-	  Location of crond spool.
+	Location of crond spool.
 config BUSYBOX_CRONTAB
-	bool "crontab"
+	bool "crontab (9.7 kb)"
 	default y
 	help
-	  Crontab manipulates the crontab for a particular user. Only
-	  the superuser may specify a different user and/or crontab directory.
-	  Note that Busybox binary must be setuid root for this applet to
-	  work properly.
+	Crontab manipulates the crontab for a particular user. Only
+	the superuser may specify a different user and/or crontab directory.
+	Note that busybox binary must be setuid root for this applet to
+	work properly.
 config BUSYBOX_DC
-	bool "dc"
+	bool "dc (4.2 kb)"
 	default y
 	help
-	  Dc is a reverse-polish desk calculator which supports unlimited
-	  precision arithmetic.
+	Dc is a reverse-polish desk calculator which supports unlimited
+	precision arithmetic.
 
 config BUSYBOX_FEATURE_DC_LIBM
 	bool "Enable power and exp functions (requires libm)"
 	default y
 	depends on BUSYBOX_DC
 	help
-	  Enable power and exp functions.
-	  NOTE: This will require libm to be present for linking.
+	Enable power and exp functions.
+	NOTE: This will require libm to be present for linking.
 config BUSYBOX_DEVFSD
 	bool "devfsd (obsolete)"
 	default n
 	select BUSYBOX_PLATFORM_LINUX
 	select BUSYBOX_FEATURE_SYSLOG
 	help
-	  This is deprecated and should NOT be used anymore.
-	  Use linux >= 2.6 (optionally with hotplug) and mdev instead!
-	  See docs/mdev.txt for detailed instructions on how to use mdev
-	  instead.
+	This is deprecated and should NOT be used anymore.
+	Use linux >= 2.6 (optionally with hotplug) and mdev instead!
+	See docs/mdev.txt for detailed instructions on how to use mdev
+	instead.
 
-	  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:
-	  "CLEAR_CONFIG", "INCLUDE", "OPTIONAL_INCLUDE", "RESTORE",
-	  "PERMISSIONS", "EXECUTE", "COPY", "IGNORE",
-	  "MKOLDCOMPAT", "MKNEWCOMPAT","RMOLDCOMPAT", "RMNEWCOMPAT".
+	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:
+	"CLEAR_CONFIG", "INCLUDE", "OPTIONAL_INCLUDE", "RESTORE",
+	"PERMISSIONS", "EXECUTE", "COPY", "IGNORE",
+	"MKOLDCOMPAT", "MKNEWCOMPAT","RMOLDCOMPAT", "RMNEWCOMPAT".
 
-	  But only if they are written UPPERCASE!!!!!!!!
+	But only if they are written UPPERCASE!!!!!!!!
 
 config BUSYBOX_DEVFSD_MODLOAD
 	bool "Adds support for MODLOAD keyword in devsfd.conf"
 	default y
 	depends on BUSYBOX_DEVFSD
 	help
-	  This actually doesn't work with busybox modutils but needs
-	  the external modutils.
+	This actually doesn't work with busybox modutils but needs
+	the external modutils.
 
 config BUSYBOX_DEVFSD_FG_NP
 	bool "Enable the -fg and -np options"
 	default y
 	depends on BUSYBOX_DEVFSD
 	help
-	  -fg  Run the daemon in the foreground.
-	  -np  Exit after parsing the configuration file.
-	       Do not poll for events.
+	-fg  Run the daemon in the foreground.
+	-np  Exit after parsing config. Do not poll for events.
 
 config BUSYBOX_DEVFSD_VERBOSE
 	bool "Increases logging (and size)"
 	default y
 	depends on BUSYBOX_DEVFSD
 	help
-	  Increases logging to stderr or syslog.
+	Increases logging to stderr or syslog.
 
 config BUSYBOX_FEATURE_DEVFS
 	bool "Use devfs names for all devices (obsolete)"
 	default n
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  This is obsolete and should NOT be used anymore.
-	  Use linux >= 2.6 (optionally with hotplug) and mdev instead!
+	This is obsolete and should NOT be used anymore.
+	Use linux >= 2.6 (optionally with hotplug) and mdev instead!
 
-	  For legacy systems -- if there is no way around devfsd -- 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.
+	For legacy systems -- if there is no way around devfsd -- 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 BUSYBOX_DEVMEM
-	bool "devmem"
+	bool "devmem (2.5 kb)"
 	default y
 	help
-	  devmem is a small program that reads and writes from physical
-	  memory using /dev/mem.
+	devmem is a small program that reads and writes from physical
+	memory using /dev/mem.
 config BUSYBOX_FBSPLASH
-	bool "fbsplash"
+	bool "fbsplash (27 kb)"
 	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  Shows splash image and progress bar on framebuffer device.
-	  Can be used during boot phase of an embedded device. ~2kb.
-	  Usage:
-	  - use kernel option 'vga=xxx' or otherwise enable fb device.
-	  - put somewhere fbsplash.cfg file and an image in .ppm format.
-	  - $ setsid fbsplash [params] &
+	Shows splash image and progress bar on framebuffer device.
+	Can be used during boot phase of an embedded device.
+	Usage:
+	- use kernel option 'vga=xxx' or otherwise enable fb device.
+	- put somewhere fbsplash.cfg file and an image in .ppm format.
+	- $ setsid fbsplash [params] &
 	    -c: hide cursor
 	    -d /dev/fbN: framebuffer device (if not /dev/fb0)
 	    -s path_to_image_file (can be "-" for stdin)
 	    -i path_to_cfg_file (can be "-" for stdin)
 	    -f path_to_fifo (can be "-" for stdin)
-	  - if you want to run it only in presence of kernel parameter:
+	- if you want to run it only in presence of kernel parameter:
 	    grep -q "fbsplash=on" </proc/cmdline && setsid fbsplash [params] &
-	  - commands for fifo:
+	- commands for fifo:
 	    "NN" (ASCII decimal number) - percentage to show on progress bar
 	    "exit" - well you guessed it
 config BUSYBOX_FLASH_ERASEALL
-	bool "flash_eraseall"
+	bool "flash_eraseall (5.5 kb)"
 	default n  # doesn't build on Ubuntu 8.04
 	help
-	  The flash_eraseall binary from mtd-utils as of git head c4c6a59eb.
-	  This utility is used to erase the whole MTD device.
+	The flash_eraseall binary from mtd-utils as of git head c4c6a59eb.
+	This utility is used to erase the whole MTD device.
 config BUSYBOX_FLASH_LOCK
-	bool "flash_lock"
+	bool "flash_lock (2.1 kb)"
 	default n  # doesn't build on Ubuntu 8.04
 	help
-	  The flash_lock binary from mtd-utils as of git head 5ec0c10d0. This
-	  utility locks part or all of the flash device.
+	The flash_lock binary from mtd-utils as of git head 5ec0c10d0. This
+	utility locks part or all of the flash device.
 
 config BUSYBOX_FLASH_UNLOCK
-	bool "flash_unlock"
+	bool "flash_unlock (1.3 kb)"
 	default n  # doesn't build on Ubuntu 8.04
 	help
-	  The flash_unlock binary from mtd-utils as of git head 5ec0c10d0. This
-	  utility unlocks part or all of the flash device.
+	The flash_unlock binary from mtd-utils as of git head 5ec0c10d0. This
+	utility unlocks part or all of the flash device.
 config BUSYBOX_FLASHCP
-	bool "flashcp"
+	bool "flashcp (5.4 kb)"
 	default n  # doesn't build on Ubuntu 8.04
 	help
-	  The flashcp binary, inspired by mtd-utils as of git head 5eceb74f7.
-	  This utility is used to copy images into a MTD device.
+	The flashcp binary, inspired by mtd-utils as of git head 5eceb74f7.
+	This utility is used to copy images into a MTD device.
 config BUSYBOX_HDPARM
-	bool "hdparm"
+	bool "hdparm (23 kb)"
 	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  Get/Set hard drive parameters. Primarily intended for ATA
-	  drives. Adds about 13k (or around 30k if you enable the
-	  FEATURE_HDPARM_GET_IDENTITY option)....
+	Get/Set hard drive parameters. Primarily intended for ATA
+	drives.
 
 config BUSYBOX_FEATURE_HDPARM_GET_IDENTITY
 	bool "Support obtaining detailed information directly from drives"
 	default y
 	depends on BUSYBOX_HDPARM
 	help
-	  Enable the -I and -i options to obtain detailed information
-	  directly from drives about their capabilities and supported ATA
-	  feature set. If no device name is specified, hdparm will read
-	  identify data from stdin. Enabling this option will add about 16k...
+	Enable the -I and -i options to obtain detailed information
+	directly from drives about their capabilities and supported ATA
+	feature set. If no device name is specified, hdparm will read
+	identify data from stdin. Enabling this option will add about 16k...
 
 config BUSYBOX_FEATURE_HDPARM_HDIO_SCAN_HWIF
 	bool "Register an IDE interface (DANGEROUS)"
 	default y
 	depends on BUSYBOX_HDPARM
 	help
-	  Enable the 'hdparm -R' option to register an IDE interface.
-	  This is dangerous stuff, so you should probably say N.
+	Enable the 'hdparm -R' option to register an IDE interface.
+	This is dangerous stuff, so you should probably say N.
 
 config BUSYBOX_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF
 	bool "Un-register an IDE interface (DANGEROUS)"
 	default y
 	depends on BUSYBOX_HDPARM
 	help
-	  Enable the 'hdparm -U' option to un-register an IDE interface.
-	  This is dangerous stuff, so you should probably say N.
+	Enable the 'hdparm -U' option to un-register an IDE interface.
+	This is dangerous stuff, so you should probably say N.
 
 config BUSYBOX_FEATURE_HDPARM_HDIO_DRIVE_RESET
 	bool "Perform device reset (DANGEROUS)"
 	default y
 	depends on BUSYBOX_HDPARM
 	help
-	  Enable the 'hdparm -w' option to perform a device reset.
-	  This is dangerous stuff, so you should probably say N.
+	Enable the 'hdparm -w' option to perform a device reset.
+	This is dangerous stuff, so you should probably say N.
 
 config BUSYBOX_FEATURE_HDPARM_HDIO_TRISTATE_HWIF
 	bool "Tristate device for hotswap (DANGEROUS)"
 	default y
 	depends on BUSYBOX_HDPARM
 	help
-	  Enable 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.
+	Enable 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 BUSYBOX_FEATURE_HDPARM_HDIO_GETSET_DMA
 	bool "Get/set using_dma flag"
 	default y
 	depends on BUSYBOX_HDPARM
 	help
-	  Enable the 'hdparm -d' option to get/set using_dma flag.
+	Enable the 'hdparm -d' option to get/set using_dma flag.
+config BUSYBOX_HEXEDIT
+	bool "hexedit"
+	default y
+	help
+	Edit file in hexadecimal.
 config BUSYBOX_I2CGET
-	bool "i2cget"
+	bool "i2cget (5.6 kb)"
 	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  Read from I2C/SMBus chip registers.
+	Read from I2C/SMBus chip registers.
 
 config BUSYBOX_I2CSET
-	bool "i2cset"
+	bool "i2cset (6.9 kb)"
 	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  Set I2C registers.
+	Set I2C registers.
 
 config BUSYBOX_I2CDUMP
-	bool "i2cdump"
+	bool "i2cdump (7.2 kb)"
 	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  Examine I2C registers.
+	Examine I2C registers.
 
 config BUSYBOX_I2CDETECT
-	bool "i2cdetect"
+	bool "i2cdetect (7.2 kb)"
 	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  Detect I2C chips.
+	Detect I2C chips.
 
 config BUSYBOX_INOTIFYD
-	bool "inotifyd"
+	bool "inotifyd (3.5 kb)"
 	default n  # doesn't build on Knoppix 5
 	help
-	  Simple inotify daemon. Reports filesystem changes. Requires
-	  kernel >= 2.6.13
+	Simple inotify daemon. Reports filesystem changes. Requires
+	kernel >= 2.6.13
 config BUSYBOX_LESS
-	bool "less"
+	bool "less (15 kb)"
 	default y
 	help
-	  'less' is a pager, meaning that it displays text files. It possesses
-	  a wide array of features, and is an improvement over 'more'.
+	'less' is a pager, meaning that it displays text files. It possesses
+	a wide array of features, and is an improvement over 'more'.
 
 config BUSYBOX_FEATURE_LESS_MAXLINES
 	int "Max number of input lines less will try to eat"
@@ -402,96 +421,96 @@ config BUSYBOX_FEATURE_LESS_BRACKETS
 	default y
 	depends on BUSYBOX_LESS
 	help
-	  This option adds the capability to search for matching left and right
-	  brackets, facilitating programming.
+	This option adds the capability to search for matching left and right
+	brackets, facilitating programming.
 
 config BUSYBOX_FEATURE_LESS_FLAGS
 	bool "Enable -m/-M"
 	default y
 	depends on BUSYBOX_LESS
 	help
-	  The -M/-m flag enables a more sophisticated status line.
+	The -M/-m flag enables a more sophisticated status line.
 
 config BUSYBOX_FEATURE_LESS_TRUNCATE
 	bool "Enable -S"
 	default y
 	depends on BUSYBOX_LESS
 	help
-	  The -S flag causes long lines to be truncated rather than
-	  wrapped.
+	The -S flag causes long lines to be truncated rather than
+	wrapped.
 
 config BUSYBOX_FEATURE_LESS_MARKS
 	bool "Enable marks"
 	default y
 	depends on BUSYBOX_LESS
 	help
-	  Marks enable positions in a file to be stored for easy reference.
+	Marks enable positions in a file to be stored for easy reference.
 
 config BUSYBOX_FEATURE_LESS_REGEXP
 	bool "Enable regular expressions"
 	default y
 	depends on BUSYBOX_LESS
 	help
-	  Enable regular expressions, allowing complex file searches.
+	Enable regular expressions, allowing complex file searches.
 
 config BUSYBOX_FEATURE_LESS_WINCH
 	bool "Enable automatic resizing on window size changes"
 	default y
 	depends on BUSYBOX_LESS
 	help
-	  Makes less track window size changes.
+	Makes less track window size changes.
 
 config BUSYBOX_FEATURE_LESS_ASK_TERMINAL
 	bool "Use 'tell me cursor position' ESC sequence to measure window"
 	default y
 	depends on BUSYBOX_FEATURE_LESS_WINCH
 	help
-	  Makes less track window size changes.
-	  If terminal size can't be retrieved and $LINES/$COLUMNS are not set,
-	  this option makes less perform a last-ditch effort to find it:
-	  position cursor to 999,999 and ask terminal to report real
-	  cursor position using "ESC [ 6 n" escape sequence, then read stdin.
-	  This is not clean but helps a lot on serial lines and such.
+	Makes less track window size changes.
+	If terminal size can't be retrieved and $LINES/$COLUMNS are not set,
+	this option makes less perform a last-ditch effort to find it:
+	position cursor to 999,999 and ask terminal to report real
+	cursor position using "ESC [ 6 n" escape sequence, then read stdin.
+	This is not clean but helps a lot on serial lines and such.
 
 config BUSYBOX_FEATURE_LESS_DASHCMD
 	bool "Enable flag changes ('-' command)"
 	default y
 	depends on BUSYBOX_LESS
 	help
-	  This enables the ability to change command-line flags within
-	  less itself ('-' keyboard command).
+	This enables the ability to change command-line flags within
+	less itself ('-' keyboard command).
 
 config BUSYBOX_FEATURE_LESS_LINENUMS
 	bool "Enable -N (dynamic switching of line numbers)"
 	default y
 	depends on BUSYBOX_FEATURE_LESS_DASHCMD
 config BUSYBOX_LSSCSI
-	bool "lsscsi"
+	bool "lsscsi (2.4 kb)"
 	default y
 	#select PLATFORM_LINUX
 	help
-	  lsscsi is a utility for displaying information about SCSI buses in the
-	  system and devices connected to them.
+	lsscsi is a utility for displaying information about SCSI buses in the
+	system and devices connected to them.
 
-	  This version uses sysfs (/sys/bus/scsi/devices) only.
+	This version uses sysfs (/sys/bus/scsi/devices) only.
 config BUSYBOX_MAKEDEVS
-	bool "makedevs"
+	bool "makedevs (9.3 kb)"
 	default y
 	help
-	  'makedevs' is a utility used to create a batch of devices with
-	  one command.
+	'makedevs' is a utility used to create a batch of devices with
+	one command.
 
-	  There are two choices for command line behaviour, the interface
-	  as used by LEAF/Linux Router Project, or a device table file.
+	There are two choices for command line behaviour, the interface
+	as used by LEAF/Linux Router Project, or a device table file.
 
-	  'leaf' is traditionally what busybox follows, it allows multiple
-	  devices of a particluar type to be created per command.
-	  e.g. /dev/hda[0-9]
-	  Device properties are passed as command line arguments.
+	'leaf' is traditionally what busybox follows, it allows multiple
+	devices of a particluar type to be created per command.
+	e.g. /dev/hda[0-9]
+	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 made with one command.
-	  User/group names are allowed as an alternative to uid/gid.
+	'table' reads device properties from a file or stdin, allowing
+	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"
@@ -506,181 +525,186 @@ config BUSYBOX_FEATURE_MAKEDEVS_TABLE
 
 endchoice
 config BUSYBOX_MAN
-	bool "man"
+	bool "man (27 kb)"
 	default y
 	help
-	  Format and display manual pages.
+	Format and display manual pages.
 config BUSYBOX_MICROCOM
-	bool "microcom"
+	bool "microcom (5.6 kb)"
 	default y
 	help
-	  The poor man's minicom utility for chatting with serial port devices.
+	The poor man's minicom utility for chatting with serial port devices.
 config BUSYBOX_MT
-	bool "mt"
+	bool "mt (2.6 kb)"
 	default y
 	help
-	  mt is used to control tape devices. You can use the mt utility
-	  to advance or rewind a tape past a specified number of archive
-	  files on the tape.
+	mt is used to control tape devices. You can use the mt utility
+	to advance or rewind a tape past a specified number of archive
+	files on the tape.
 config BUSYBOX_NANDWRITE
-	bool "nandwrite"
+	bool "nandwrite (5.9 kb)"
 	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  Write to the specified MTD device, with bad blocks awareness
+	Write to the specified MTD device, with bad blocks awareness
 
 config BUSYBOX_NANDDUMP
-	bool "nanddump"
+	bool "nanddump (6.3 kb)"
 	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  Dump the content of raw NAND chip
+	Dump the content of raw NAND chip
 config BUSYBOX_PARTPROBE
-	bool "partprobe"
+	bool "partprobe (3.6 kb)"
 	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  Ask kernel to rescan partition table.
+	Ask kernel to rescan partition table.
 config BUSYBOX_RAIDAUTORUN
-	bool "raidautorun"
+	bool "raidautorun (1.4 kb)"
 	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  raidautorun tells the kernel md driver to
-	  search and start RAID arrays.
+	raidautorun tells the kernel md driver to
+	search and start RAID arrays.
 config BUSYBOX_READAHEAD
-	bool "readahead"
+	bool "readahead (2 kb)"
 	default y
 	depends on BUSYBOX_LFS
 	select BUSYBOX_PLATFORM_LINUX
 	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.
+	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 bound process is running) it can
-	  significantly speed up system startup.
+	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 bound process 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.
+	As readahead(2) blocks until each file has been read, it is best to
+	run this applet as a background job.
 config BUSYBOX_RFKILL
-	bool "rfkill"
+	bool "rfkill (5.3 kb)"
 	default n # doesn't build on Ubuntu 9.04
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  Enable/disable wireless devices.
+	Enable/disable wireless devices.
 
-	  rfkill list : list all wireless devices
-	  rfkill list bluetooth : list all bluetooth devices
-	  rfkill list 1 : list device corresponding to the given index
-	  rfkill block|unblock wlan : block/unblock all wlan(wifi) devices
+	rfkill list : list all wireless devices
+	rfkill list bluetooth : list all bluetooth devices
+	rfkill list 1 : list device corresponding to the given index
+	rfkill block|unblock wlan : block/unblock all wlan(wifi) devices
 
 config BUSYBOX_RUNLEVEL
-	bool "runlevel"
+	bool "runlevel (518 bytes)"
 	default y
 	depends on BUSYBOX_FEATURE_UTMP
 	help
-	  find the current and previous system runlevel.
+	find the current and previous system 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.
+	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 BUSYBOX_RX
-	bool "rx"
+	bool "rx (2.9 kb)"
 	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  Receive files using the Xmodem protocol.
+	Receive files using the Xmodem protocol.
+config BUSYBOX_SETFATTR
+	bool "setfattr"
+	default y
+	help
+	Set/delete extended attributes on files
 config BUSYBOX_SETSERIAL
-	bool "setserial"
+	bool "setserial (6.6 kb)"
 	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  Retrieve or set Linux serial port.
+	Retrieve or set Linux serial port.
 config BUSYBOX_STRINGS
-	bool "strings"
+	bool "strings (4.3 kb)"
 	default y
 	help
-	  strings prints the printable character sequences for each file
-	  specified.
+	strings prints the printable character sequences for each file
+	specified.
 config BUSYBOX_TIME
-	bool "time"
+	bool "time (7 kb)"
 	default y
 	help
-	  The time command runs the specified program with the given arguments.
-	  When the command finishes, time writes a message to standard output
-	  giving timing statistics about this program run.
+	The time command runs the specified program with the given arguments.
+	When the command finishes, time writes a message to standard output
+	giving timing statistics about this program run.
 config BUSYBOX_TTYSIZE
-	bool "ttysize"
+	bool "ttysize (372 bytes)"
 	default y
 	help
-	  A replacement for "stty size". Unlike stty, can report only width,
-	  only height, or both, in any order. It also does not complain on
-	  error, but returns default 80x24.
-	  Usage in shell scripts: width=`ttysize w`.
+	A replacement for "stty size". Unlike stty, can report only width,
+	only height, or both, in any order. It also does not complain on
+	error, but returns default 80x24.
+	Usage in shell scripts: width=`ttysize w`.
 config BUSYBOX_UBIATTACH
-	bool "ubiattach"
+	bool "ubiattach (4.7 kb)"
 	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  Attach MTD device to an UBI device.
+	Attach MTD device to an UBI device.
 
 config BUSYBOX_UBIDETACH
-	bool "ubidetach"
+	bool "ubidetach (4.6 kb)"
 	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  Detach MTD device from an UBI device.
+	Detach MTD device from an UBI device.
 
 config BUSYBOX_UBIMKVOL
-	bool "ubimkvol"
+	bool "ubimkvol (5.8 kb)"
 	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  Create a UBI volume.
+	Create a UBI volume.
 
 config BUSYBOX_UBIRMVOL
-	bool "ubirmvol"
+	bool "ubirmvol (5.2 kb)"
 	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  Delete a UBI volume.
+	Delete a UBI volume.
 
 config BUSYBOX_UBIRSVOL
-	bool "ubirsvol"
+	bool "ubirsvol (4.6 kb)"
 	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  Resize a UBI volume.
+	Resize a UBI volume.
 
 config BUSYBOX_UBIUPDATEVOL
-	bool "ubiupdatevol"
+	bool "ubiupdatevol (5.6 kb)"
 	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  Update a UBI volume.
+	Update a UBI volume.
 config BUSYBOX_UBIRENAME
-	bool "ubirename"
+	bool "ubirename (2.2 kb)"
 	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  Utility to rename UBI volumes
+	Utility to rename UBI volumes
 config BUSYBOX_VOLNAME
-	bool "volname"
+	bool "volname (1.7 kb)"
 	default y
 	help
-	  Prints a CD-ROM volume name.
+	Prints a CD-ROM volume name.
 config BUSYBOX_WATCHDOG
-	bool "watchdog"
+	bool "watchdog (5.1 kb)"
 	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  The watchdog utility is used with hardware or software watchdog
-	  device drivers. It opens the specified watchdog device special file
-	  and periodically writes a magic character to the device. If the
-	  watchdog applet ever fails to write the magic character within a
-	  certain amount of time, the watchdog device assumes the system has
-	  hung, and will cause the hardware to reboot.
+	The watchdog utility is used with hardware or software watchdog
+	device drivers. It opens the specified watchdog device special file
+	and periodically writes a magic character to the device. If the
+	watchdog applet ever fails to write the magic character within a
+	certain amount of time, the watchdog device assumes the system has
+	hung, and will cause the hardware to reboot.
 
 endmenu
diff --git a/config/busybox/modutils/Config.in b/config/busybox/modutils/Config.in
index 98f0e9b05..27c285a87 100644
--- a/config/busybox/modutils/Config.in
+++ b/config/busybox/modutils/Config.in
@@ -10,89 +10,89 @@ config BUSYBOX_MODPROBE_SMALL
 	bool "Simplified modutils"
 	default y
 	help
-	  Build smaller (~1.5 kbytes), simplified module tools.
+	Build smaller (~1.5 kbytes), simplified module tools.
 
-	  This option by itself does not enable any applets -
-	  you need to select applets individually below.
+	This option by itself does not enable any applets -
+	you need to select applets individually below.
 
-	  With this option modprobe does not require modules.dep file
-	  and does not use /etc/modules.conf file.
-	  It scans module files in /lib/modules/`uname -r` and
-	  determines dependencies and module alias names on the fly.
-	  This may make module loading slower, most notably
-	  when one needs to load module by alias (this requires
-	  scanning through module _bodies_).
+	With this option modprobe does not require modules.dep file
+	and does not use /etc/modules.conf file.
+	It scans module files in /lib/modules/`uname -r` and
+	determines dependencies and module alias names on the fly.
+	This may make module loading slower, most notably
+	when one needs to load module by alias (this requires
+	scanning through module _bodies_).
 
-	  At the first attempt to load a module by alias modprobe
-	  will try to generate modules.dep.bb file in order to speed up
-	  future loads by alias. Failure to do so (read-only /lib/modules,
-	  etc) is not reported, and future modprobes will be slow too.
+	At the first attempt to load a module by alias modprobe
+	will try to generate modules.dep.bb file in order to speed up
+	future loads by alias. Failure to do so (read-only /lib/modules,
+	etc) is not reported, and future modprobes will be slow too.
 
-	  NB: modules.dep.bb file format is not compatible
-	  with modules.dep file as created/used by standard module tools.
+	NB: modules.dep.bb file format is not compatible
+	with modules.dep file as created/used by standard module tools.
 
-	  Additional module parameters can be stored in
-	  /etc/modules/$module_name files.
+	Additional module parameters can be stored in
+	/etc/modules/$module_name files.
 
 config BUSYBOX_DEPMOD
-	bool "depmod"
+	bool "depmod (26 kb)"
 	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  depmod generates modules.dep (and potentially modules.alias
-	  and modules.symbols) that contain dependency information
-	  for modprobe.
+	depmod generates modules.dep (and potentially modules.alias
+	and modules.symbols) that contain dependency information
+	for modprobe.
 config BUSYBOX_INSMOD
-	bool "insmod"
+	bool "insmod (22 kb)"
 	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  insmod is used to load specified modules in the running kernel.
+	insmod is used to load specified modules in the running kernel.
 config BUSYBOX_LSMOD
-	bool "lsmod"
+	bool "lsmod (4.3 kb)"
 	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  lsmod is used to display a list of loaded modules.
+	lsmod is used to display a list of loaded modules.
 
 config BUSYBOX_FEATURE_LSMOD_PRETTY_2_6_OUTPUT
 	bool "Pretty output"
 	default y
 	depends on BUSYBOX_LSMOD && !BUSYBOX_MODPROBE_SMALL
 	help
-	  This option makes output format of lsmod adjusted to
-	  the format of module-init-tools for Linux kernel 2.6.
-	  Increases size somewhat.
+	This option makes output format of lsmod adjusted to
+	the format of module-init-tools for Linux kernel 2.6.
+	Increases size somewhat.
 config BUSYBOX_MODINFO
-	bool "modinfo"
+	bool "modinfo (25 kb)"
 	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  Show information about a Linux Kernel module
+	Show information about a Linux Kernel module
 config BUSYBOX_MODPROBE
-	bool "modprobe"
+	bool "modprobe (29 kb)"
 	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  Handle the loading of modules, and their dependencies on a high
-	  level.
+	Handle the loading of modules, and their dependencies on a high
+	level.
 
 config BUSYBOX_FEATURE_MODPROBE_BLACKLIST
 	bool "Blacklist support"
 	default y
 	depends on BUSYBOX_MODPROBE && !BUSYBOX_MODPROBE_SMALL
 	help
-	  Say 'y' here to enable support for the 'blacklist' command in
-	  modprobe.conf. This prevents the alias resolver to resolve
-	  blacklisted modules. This is useful if you want to prevent your
-	  hardware autodetection scripts to load modules like evdev, frame
-	  buffer drivers etc.
+	Say 'y' here to enable support for the 'blacklist' command in
+	modprobe.conf. This prevents the alias resolver to resolve
+	blacklisted modules. This is useful if you want to prevent your
+	hardware autodetection scripts to load modules like evdev, frame
+	buffer drivers etc.
 config BUSYBOX_RMMOD
-	bool "rmmod"
+	bool "rmmod (3.6 kb)"
 	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  rmmod is used to unload specified modules from the kernel.
+	rmmod is used to unload specified modules from the kernel.
 
 comment "Options common to multiple modutils"
 
@@ -101,145 +101,145 @@ config BUSYBOX_FEATURE_CMDLINE_MODULE_OPTIONS
 	default y
 	depends on BUSYBOX_INSMOD || BUSYBOX_MODPROBE
 	help
-	  Allow insmod and modprobe take module options from the applets'
-	  command line.
+	Allow insmod and modprobe take module options from the applets'
+	command line.
 
 config BUSYBOX_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED
 	bool "Skip loading of already loaded modules"
 	default y
 	depends on BUSYBOX_MODPROBE_SMALL && (BUSYBOX_DEPMOD || BUSYBOX_INSMOD || BUSYBOX_MODPROBE)
 	help
-	  Check if the module is already loaded.
+	Check if the module is already loaded.
 
 config BUSYBOX_FEATURE_2_4_MODULES
 	bool "Support version 2.2/2.4 Linux kernels"
 	default n
 	depends on (BUSYBOX_INSMOD || BUSYBOX_LSMOD || BUSYBOX_MODPROBE || BUSYBOX_RMMOD) && !BUSYBOX_MODPROBE_SMALL
 	help
-	  Support module loading for 2.2.x and 2.4.x Linux kernels.
-	  This increases size considerably. Say N unless you plan
-	  to run ancient kernels.
+	Support module loading for 2.2.x and 2.4.x Linux kernels.
+	This increases size considerably. Say N unless you plan
+	to run ancient kernels.
 
 config BUSYBOX_FEATURE_INSMOD_VERSION_CHECKING
 	bool "Enable module version checking"
 	default n
 	depends on BUSYBOX_FEATURE_2_4_MODULES && (BUSYBOX_INSMOD || BUSYBOX_MODPROBE)
 	help
-	  Support checking of versions for modules. This is used to
-	  ensure that the kernel and module are made for each other.
+	Support checking of versions for modules. This is used to
+	ensure that the kernel and module are made for each other.
 
 config BUSYBOX_FEATURE_INSMOD_KSYMOOPS_SYMBOLS
 	bool "Add module symbols to kernel symbol table"
 	default n
 	depends on BUSYBOX_FEATURE_2_4_MODULES && (BUSYBOX_INSMOD || BUSYBOX_MODPROBE)
 	help
-	  By adding module symbols to the kernel symbol table, Oops messages
-	  occurring within kernel modules can be properly debugged. By enabling
-	  this feature, module symbols will always be added to the kernel symbol
-	  table for proper debugging support. If you are not interested in
-	  Oops messages from kernel modules, say N.
+	By adding module symbols to the kernel symbol table, Oops messages
+	occurring within kernel modules can be properly debugged. By enabling
+	this feature, module symbols will always be added to the kernel symbol
+	table for proper debugging support. If you are not interested in
+	Oops messages from kernel modules, say N.
 
 config BUSYBOX_FEATURE_INSMOD_LOADINKMEM
 	bool "In kernel memory optimization (uClinux only)"
 	default n
 	depends on BUSYBOX_FEATURE_2_4_MODULES && (BUSYBOX_INSMOD || BUSYBOX_MODPROBE)
 	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.
+	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 BUSYBOX_FEATURE_INSMOD_LOAD_MAP
 	bool "Enable insmod load map (-m) option"
 	default n
 	depends on BUSYBOX_FEATURE_2_4_MODULES && BUSYBOX_INSMOD
 	help
-	  Enabling this, one would be able to get a load map
-	  output on stdout. This makes kernel module debugging
-	  easier.
-	  If you don't plan to debug kernel modules, you
-	  don't need this option.
+	Enabling this, one would be able to get a load map
+	output on stdout. This makes kernel module debugging
+	easier.
+	If you don't plan to debug kernel modules, you
+	don't need this option.
 
 config BUSYBOX_FEATURE_INSMOD_LOAD_MAP_FULL
 	bool "Symbols in load map"
 	default y
 	depends on BUSYBOX_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.
+	Without this option, -m will only output section
+	load map. With this option, -m will also output
+	symbols load map.
 
 config BUSYBOX_FEATURE_CHECK_TAINTED_MODULE
 	bool "Support tainted module checking with new kernels"
 	default y
 	depends on (BUSYBOX_LSMOD || BUSYBOX_FEATURE_2_4_MODULES) && !BUSYBOX_MODPROBE_SMALL
 	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.
+	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 BUSYBOX_FEATURE_INSMOD_TRY_MMAP
 	bool "Try to load module from a mmap'ed area"
 	default n
 	depends on (BUSYBOX_INSMOD || BUSYBOX_MODPROBE) && !BUSYBOX_MODPROBE_SMALL
 	help
-	  This option causes module loading code to try to mmap
-	  module first. If it does not work (for example,
-	  it does not work for compressed modules), module will be read
-	  (and unpacked if needed) into a memory block allocated by malloc.
+	This option causes module loading code to try to mmap
+	module first. If it does not work (for example,
+	it does not work for compressed modules), module will be read
+	(and unpacked if needed) into a memory block allocated by malloc.
 
-	  The only case when mmap works but malloc does not is when
-	  you are trying to load a big module on a very memory-constrained
-	  machine. Malloc will momentarily need 2x as much memory as mmap.
+	The only case when mmap works but malloc does not is when
+	you are trying to load a big module on a very memory-constrained
+	machine. Malloc will momentarily need 2x as much memory as mmap.
 
-	  Choosing N saves about 250 bytes of code (on 32-bit x86).
+	Choosing N saves about 250 bytes of code (on 32-bit x86).
 
 config BUSYBOX_FEATURE_MODUTILS_ALIAS
 	bool "Support module.aliases file"
 	default y
 	depends on (BUSYBOX_DEPMOD || BUSYBOX_MODPROBE) && !BUSYBOX_MODPROBE_SMALL
 	help
-	  Generate and parse modules.alias containing aliases for bus
-	  identifiers:
-	    alias pcmcia:m*c*f03fn*pfn*pa*pb*pc*pd* parport_cs
+	Generate and parse modules.alias containing aliases for bus
+	identifiers:
+		alias pcmcia:m*c*f03fn*pfn*pa*pb*pc*pd* parport_cs
 
-	  and aliases for logical modules names e.g.:
-	    alias padlock_aes aes
-	    alias aes_i586 aes
-	    alias aes_generic aes
+	and aliases for logical modules names e.g.:
+		alias padlock_aes aes
+		alias aes_i586 aes
+		alias aes_generic aes
 
-	  Say Y if unsure.
+	Say Y if unsure.
 
 config BUSYBOX_FEATURE_MODUTILS_SYMBOLS
 	bool "Support module.symbols file"
 	default y
 	depends on (BUSYBOX_DEPMOD || BUSYBOX_MODPROBE) && !BUSYBOX_MODPROBE_SMALL
 	help
-	  Generate and parse modules.symbols containing aliases for
-	  symbol_request() kernel calls, such as:
-	    alias symbol:usb_sg_init usbcore
+	Generate and parse modules.symbols containing aliases for
+	symbol_request() kernel calls, such as:
+		alias symbol:usb_sg_init usbcore
 
-	  Say Y if unsure.
+	Say Y if unsure.
 
 config BUSYBOX_DEFAULT_MODULES_DIR
 	string "Default directory containing modules"
 	default "/lib/modules"
 	depends on BUSYBOX_DEPMOD || BUSYBOX_MODPROBE || BUSYBOX_MODINFO
 	help
-	  Directory that contains kernel modules.
-	  Defaults to "/lib/modules"
+	Directory that contains kernel modules.
+	Defaults to "/lib/modules"
 
 config BUSYBOX_DEFAULT_DEPMOD_FILE
 	string "Default name of modules.dep"
 	default "modules.dep"
 	depends on BUSYBOX_DEPMOD || BUSYBOX_MODPROBE || BUSYBOX_MODINFO
 	help
-	  Filename that contains kernel modules dependencies.
-	  Defaults to "modules.dep".
-	  If you configured the "simplified modutils" (MODPROBE_SMALL), a
-	  ".bb" suffix will be added after this name. Do not specify ".bb"
-	  here unless you intend your depmod or modprobe to work on
-	  "modules.dep.bb.bb" or such.
+	Filename that contains kernel modules dependencies.
+	Defaults to "modules.dep".
+	If you configured the "simplified modutils" (MODPROBE_SMALL), a
+	".bb" suffix will be added after this name. Do not specify ".bb"
+	here unless you intend your depmod or modprobe to work on
+	"modules.dep.bb.bb" or such.
 
 endmenu
diff --git a/config/busybox/networking/Config.in b/config/busybox/networking/Config.in
index b859cb9f3..1238c0342 100644
--- a/config/busybox/networking/Config.in
+++ b/config/busybox/networking/Config.in
@@ -10,389 +10,396 @@ config BUSYBOX_FEATURE_IPV6
 	bool "Enable IPv6 support"
 	default y
 	help
-	  Enable IPv6 support in busybox.
-	  This adds IPv6 support in the networking applets.
+	Enable IPv6 support in busybox.
+	This adds IPv6 support in the networking applets.
 
 config BUSYBOX_FEATURE_UNIX_LOCAL
 	bool "Enable Unix domain socket support (usually not needed)"
 	default n
 	help
-	  Enable Unix domain socket support in all busybox networking
-	  applets.  Address of the form local:/path/to/unix/socket
-	  will be recognized.
+	Enable Unix domain socket support in all busybox networking
+	applets.  Address of the form local:/path/to/unix/socket
+	will be recognized.
 
-	  This extension is almost never used in real world usage.
-	  You most likely want to say N.
+	This extension is almost never used in real world usage.
+	You most likely want to say N.
 
 config BUSYBOX_FEATURE_PREFER_IPV4_ADDRESS
 	bool "Prefer IPv4 addresses from DNS queries"
 	default y
 	depends on BUSYBOX_FEATURE_IPV6
 	help
-	  Use IPv4 address of network host if it has one.
+	Use IPv4 address of network host if it has one.
 
-	  If this option is off, the first returned address will be used.
-	  This may cause problems when your DNS server is IPv6-capable and
-	  is returning IPv6 host addresses too. If IPv6 address
-	  precedes IPv4 one in DNS reply, busybox network applets
-	  (e.g. wget) will use IPv6 address. On an IPv6-incapable host
-	  or network applets will fail to connect to the host
-	  using IPv6 address.
+	If this option is off, the first returned address will be used.
+	This may cause problems when your DNS server is IPv6-capable and
+	is returning IPv6 host addresses too. If IPv6 address
+	precedes IPv4 one in DNS reply, busybox network applets
+	(e.g. wget) will use IPv6 address. On an IPv6-incapable host
+	or network applets will fail to connect to the host
+	using IPv6 address.
 
 config BUSYBOX_VERBOSE_RESOLUTION_ERRORS
 	bool "Verbose resolution errors"
 	default n
 	help
-	  Enable if you are not satisfied with simplistic
-	  "can't resolve 'hostname.com'" and want to know more.
-	  This may increase size of your executable a bit.
+	Enable if you are not satisfied with simplistic
+	"can't resolve 'hostname.com'" and want to know more.
+	This may increase size of your executable a bit.
 
 config BUSYBOX_ARP
-	bool "arp"
+	bool "arp (11 kb)"
 	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  Manipulate the system ARP cache.
+	Manipulate the system ARP cache.
 config BUSYBOX_ARPING
-	bool "arping"
+	bool "arping (9.3 kb)"
 	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  Ping hosts by ARP packets.
+	Ping hosts by ARP packets.
 
 config BUSYBOX_BRCTL
-	bool "brctl"
+	bool "brctl (4.7 kb)"
 	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  Manage ethernet bridges.
-	  Supports addbr/delbr and addif/delif.
+	Manage ethernet bridges.
+	Supports addbr/delbr and addif/delif.
 
 config BUSYBOX_FEATURE_BRCTL_FANCY
 	bool "Fancy options"
 	default y
 	depends on BUSYBOX_BRCTL
 	help
-	  Add support for extended option like:
-	    setageing, setfd, sethello, setmaxage,
-	    setpathcost, setportprio, setbridgeprio,
-	    stp
-	  This adds about 600 bytes.
+	Add support for extended option like:
+		setageing, setfd, sethello, setmaxage,
+		setpathcost, setportprio, setbridgeprio,
+		stp
+	This adds about 600 bytes.
 
 config BUSYBOX_FEATURE_BRCTL_SHOW
 	bool "Support show"
 	default y
 	depends on BUSYBOX_BRCTL && BUSYBOX_FEATURE_BRCTL_FANCY
 	help
-	  Add support for option which prints the current config:
-	    show
+	Add support for option which prints the current config:
+		show
 config BUSYBOX_DNSD
-	bool "dnsd"
+	bool "dnsd (9.8 kb)"
 	default y
 	help
-	  Small and static DNS server daemon.
+	Small and static DNS server daemon.
 config BUSYBOX_ETHER_WAKE
-	bool "ether-wake"
+	bool "ether-wake (6.6 kb)"
 	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  Send a magic packet to wake up sleeping machines.
+	Send a magic packet to wake up sleeping machines.
 config BUSYBOX_FTPD
-	bool "ftpd"
+	bool "ftpd (30 kb)"
 	default y
 	help
-	  Simple FTP daemon. You have to run it via inetd.
+	Simple FTP daemon. You have to run it via inetd.
 
 config BUSYBOX_FEATURE_FTPD_WRITE
-	bool "Enable upload commands"
+	bool "Enable -w (upload commands)"
 	default y
 	depends on BUSYBOX_FTPD
 	help
-	  Enable all kinds of FTP upload commands (-w option)
+	Enable -w option. "ftpd -w" will accept upload commands
+	such as STOR, STOU, APPE, DELE, MKD, RMD, rename commands.
 
 config BUSYBOX_FEATURE_FTPD_ACCEPT_BROKEN_LIST
 	bool "Enable workaround for RFC-violating clients"
 	default y
 	depends on BUSYBOX_FTPD
 	help
-	  Some ftp clients (among them KDE's Konqueror) issue illegal
-	  "LIST -l" requests. This option works around such problems.
-	  It might prevent you from listing files starting with "-" and
-	  it increases the code size by ~40 bytes.
-	  Most other ftp servers seem to behave similar to this.
+	Some ftp clients (among them KDE's Konqueror) issue illegal
+	"LIST -l" requests. This option works around such problems.
+	It might prevent you from listing files starting with "-" and
+	it increases the code size by ~40 bytes.
+	Most other ftp servers seem to behave similar to this.
 
 config BUSYBOX_FEATURE_FTPD_AUTHENTICATION
 	bool "Enable authentication"
 	default y
 	depends on BUSYBOX_FTPD
 	help
-	  Enable basic system login as seen in telnet etc.
+	Require login, and change to logged in user's UID:GID before
+	accessing any files. Option "-a USER" allows "anonymous"
+	logins (treats them as if USER logged in).
+
+	If this option is not selected, ftpd runs with the rights
+	of the user it was started under, and does not require login.
+	Take care to not launch it under root.
 config BUSYBOX_FTPGET
-	bool "ftpget"
+	bool "ftpget (8 kb)"
 	default y
 	help
-	  Retrieve a remote file via FTP.
+	Retrieve a remote file via FTP.
 
 config BUSYBOX_FTPPUT
-	bool "ftpput"
+	bool "ftpput (7.7 kb)"
 	default y
 	help
-	  Store a remote file via FTP.
+	Store a remote file via FTP.
 
 config BUSYBOX_FEATURE_FTPGETPUT_LONG_OPTIONS
 	bool "Enable long options in ftpget/ftpput"
 	default y
 	depends on BUSYBOX_LONG_OPTS && (BUSYBOX_FTPGET || BUSYBOX_FTPPUT)
 config BUSYBOX_HOSTNAME
-	bool "hostname"
+	bool "hostname (5.6 kb)"
 	default y
 	help
-	  Show or set the system's host name.
+	Show or set the system's host name.
 
 config BUSYBOX_DNSDOMAINNAME
-	bool "dnsdomainname"
+	bool "dnsdomainname (3.6 kb)"
 	default y
 	help
-	  Alias to "hostname -d".
+	Alias to "hostname -d".
 config BUSYBOX_HTTPD
-	bool "httpd"
+	bool "httpd (32 kb)"
 	default y
 	help
-	  HTTP server.
+	HTTP server.
 
 config BUSYBOX_FEATURE_HTTPD_RANGES
 	bool "Support 'Ranges:' header"
 	default y
 	depends on BUSYBOX_HTTPD
 	help
-	  Makes httpd emit "Accept-Ranges: bytes" header and understand
-	  "Range: bytes=NNN-[MMM]" header. Allows for resuming interrupted
-	  downloads, seeking in multimedia players etc.
+	Makes httpd emit "Accept-Ranges: bytes" header and understand
+	"Range: bytes=NNN-[MMM]" header. Allows for resuming interrupted
+	downloads, seeking in multimedia players etc.
 
 config BUSYBOX_FEATURE_HTTPD_SETUID
 	bool "Enable -u <user> option"
 	default y
 	depends on BUSYBOX_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.
+	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.
 
 config BUSYBOX_FEATURE_HTTPD_BASIC_AUTH
-	bool "Enable Basic http Authentication"
+	bool "Enable HTTP authentication"
 	default y
 	depends on BUSYBOX_HTTPD
 	help
-	  Utilizes password settings from /etc/httpd.conf for basic
-	  authentication on a per url basis.
-	  Example for httpd.conf file:
-	  /adm:toor:PaSsWd
+	Utilizes password settings from /etc/httpd.conf for basic
+	authentication on a per url basis.
+	Example for httpd.conf file:
+	/adm:toor:PaSsWd
 
 config BUSYBOX_FEATURE_HTTPD_AUTH_MD5
-	bool "Support MD5 crypted passwords for http Authentication"
+	bool "Support MD5-encrypted passwords in HTTP authentication"
 	default y
 	depends on BUSYBOX_FEATURE_HTTPD_BASIC_AUTH
 	help
-	  Enables encrypted passwords, and wildcard user/passwords
-	  in httpd.conf file.
-	  User '*' means 'any system user name is ok',
-	  password of '*' means 'use system password for this user'
-	  Examples:
-	  /adm:toor:$1$P/eKnWXS$aI1aPGxT.dJD5SzqAKWrF0
-	  /adm:root:*
-	  /wiki:*:*
+	Enables encrypted passwords, and wildcard user/passwords
+	in httpd.conf file.
+	User '*' means 'any system user name is ok',
+	password of '*' means 'use system password for this user'
+	Examples:
+	/adm:toor:$1$P/eKnWXS$aI1aPGxT.dJD5SzqAKWrF0
+	/adm:root:*
+	/wiki:*:*
 
 config BUSYBOX_FEATURE_HTTPD_CGI
 	bool "Support Common Gateway Interface (CGI)"
 	default y
 	depends on BUSYBOX_HTTPD
 	help
-	  This option allows scripts and executables to be invoked
-	  when specific URLs are requested.
+	This option allows scripts and executables to be invoked
+	when specific URLs are requested.
 
 config BUSYBOX_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR
 	bool "Support running scripts through an interpreter"
 	default y
 	depends on BUSYBOX_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 additional line in your
-	  httpd.conf file:
-	  *.php:/path/to/your/php
+	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 additional line in your
+	httpd.conf file:
+	*.php:/path/to/your/php
 
 config BUSYBOX_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV
 	bool "Set REMOTE_PORT environment variable for CGI"
 	default y
 	depends on BUSYBOX_FEATURE_HTTPD_CGI
 	help
-	  Use of this option can assist scripts in generating
-	  references that contain a unique port number.
+	Use of this option can assist scripts in generating
+	references that contain a unique port number.
 
 config BUSYBOX_FEATURE_HTTPD_ENCODE_URL_STR
 	bool "Enable -e option (useful for CGIs written as shell scripts)"
 	default y
 	depends on BUSYBOX_HTTPD
 	help
-	  This option allows html encoding of arbitrary strings for display
-	  by the browser. Output goes to stdout.
-	  For example, httpd -e "<Hello World>" produces
-	  "&#60Hello&#32World&#62".
+	This option allows html encoding of arbitrary strings for display
+	by the browser. Output goes to stdout.
+	For example, httpd -e "<Hello World>" produces
+	"&#60Hello&#32World&#62".
 
 config BUSYBOX_FEATURE_HTTPD_ERROR_PAGES
 	bool "Support custom error pages"
 	default y
 	depends on BUSYBOX_HTTPD
 	help
-	  This option allows you to define custom error pages in
-	  the configuration file instead of the default HTTP status
-	  error pages. For instance, if you add the line:
-	        E404:/path/e404.html
-	  in the config file, the server will respond the specified
-	  '/path/e404.html' file instead of the terse '404 NOT FOUND'
-	  message.
+	This option allows you to define custom error pages in
+	the configuration file instead of the default HTTP status
+	error pages. For instance, if you add the line:
+		E404:/path/e404.html
+	in the config file, the server will respond the specified
+	'/path/e404.html' file instead of the terse '404 NOT FOUND'
+	message.
 
 config BUSYBOX_FEATURE_HTTPD_PROXY
 	bool "Support reverse proxy"
 	default y
 	depends on BUSYBOX_HTTPD
 	help
-	  This option allows you to define URLs that will be forwarded
-	  to another HTTP server. To setup add the following line to the
-	  configuration file
-	        P:/url/:http://hostname[:port]/new/path/
-	  Then a request to /url/myfile will be forwarded to
-	  http://hostname[:port]/new/path/myfile.
+	This option allows you to define URLs that will be forwarded
+	to another HTTP server. To setup add the following line to the
+	configuration file
+		P:/url/:http://hostname[:port]/new/path/
+	Then a request to /url/myfile will be forwarded to
+	http://hostname[:port]/new/path/myfile.
 
 config BUSYBOX_FEATURE_HTTPD_GZIP
 	bool "Support GZIP content encoding"
 	default y
 	depends on BUSYBOX_HTTPD
 	help
-	  Makes httpd send files using GZIP content encoding if the
-	  client supports it and a pre-compressed <file>.gz exists.
+	Makes httpd send files using GZIP content encoding if the
+	client supports it and a pre-compressed <file>.gz exists.
 config BUSYBOX_IFCONFIG
-	bool "ifconfig"
+	bool "ifconfig (12 kb)"
 	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  Ifconfig is used to configure the kernel-resident network interfaces.
+	Ifconfig is used to configure the kernel-resident network interfaces.
 
 config BUSYBOX_FEATURE_IFCONFIG_STATUS
 	bool "Enable status reporting output (+7k)"
 	default y
 	depends on BUSYBOX_IFCONFIG
 	help
-	  If ifconfig is called with no arguments it will display the status
-	  of the currently active interfaces.
+	If ifconfig is called with no arguments it will display the status
+	of the currently active interfaces.
 
 config BUSYBOX_FEATURE_IFCONFIG_SLIP
 	bool "Enable slip-specific options \"keepalive\" and \"outfill\""
 	default y
 	depends on BUSYBOX_IFCONFIG
 	help
-	  Allow "keepalive" and "outfill" support for SLIP. If you're not
-	  planning on using serial lines, leave this unchecked.
+	Allow "keepalive" and "outfill" support for SLIP. If you're not
+	planning on using serial lines, leave this unchecked.
 
 config BUSYBOX_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ
 	bool "Enable options \"mem_start\", \"io_addr\", and \"irq\""
 	default y
 	depends on BUSYBOX_IFCONFIG
 	help
-	  Allow the start address for shared memory, start address for I/O,
-	  and/or the interrupt line used by the specified device.
+	Allow the start address for shared memory, start address for I/O,
+	and/or the interrupt line used by the specified device.
 
 config BUSYBOX_FEATURE_IFCONFIG_HW
 	bool "Enable option \"hw\" (ether only)"
 	default y
 	depends on BUSYBOX_IFCONFIG
 	help
-	  Set the hardware address of this interface, if the device driver
-	  supports  this  operation. Currently, we only support the 'ether'
-	  class.
+	Set the hardware address of this interface, if the device driver
+	supports  this  operation. Currently, we only support the 'ether'
+	class.
 
 config BUSYBOX_FEATURE_IFCONFIG_BROADCAST_PLUS
 	bool "Set the broadcast automatically"
 	default y
 	depends on BUSYBOX_IFCONFIG
 	help
-	  Setting this will make ifconfig attempt to find the broadcast
-	  automatically if the value '+' is used.
+	Setting this will make ifconfig attempt to find the broadcast
+	automatically if the value '+' is used.
 config BUSYBOX_IFENSLAVE
-	bool "ifenslave"
+	bool "ifenslave (13 kb)"
 	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  Userspace application to bind several interfaces
-	  to a logical interface (use with kernel bonding driver).
+	Userspace application to bind several interfaces
+	to a logical interface (use with kernel bonding driver).
 config BUSYBOX_IFPLUGD
-	bool "ifplugd"
+	bool "ifplugd (9.9 kb)"
 	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  Network interface plug detection daemon.
+	Network interface plug detection daemon.
 config BUSYBOX_IFUP
-	bool "ifup"
+	bool "ifup (17 kb)"
 	default y
 	help
-	  Activate 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 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
-	  enable these additional options. It is up to you to supply either
-	  "ifconfig", "route" and "run-parts" or the "ip" command, either
-	  via busybox or via standalone utilities.
+	Activate 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 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
+	enable these additional options. It is up to you to supply either
+	"ifconfig", "route" and "run-parts" or the "ip" command, either
+	via busybox or via standalone utilities.
 
 config BUSYBOX_IFDOWN
-	bool "ifdown"
+	bool "ifdown (15 kb)"
 	default y
 	help
-	  Deactivate the specified interfaces.
+	Deactivate the specified interfaces.
 
 config BUSYBOX_IFUPDOWN_IFSTATE_PATH
 	string "Absolute path to ifstate file"
 	default "/var/run/ifstate"
 	depends on BUSYBOX_IFUP || BUSYBOX_IFDOWN
 	help
-	  ifupdown keeps state information in a file called ifstate.
-	  Typically it is located in /var/run/ifstate, however
-	  some distributions tend to put it in other places
-	  (debian, for example, uses /etc/network/run/ifstate).
-	  This config option defines location of ifstate.
+	ifupdown keeps state information in a file called ifstate.
+	Typically it is located in /var/run/ifstate, however
+	some distributions tend to put it in other places
+	(debian, for example, uses /etc/network/run/ifstate).
+	This config option defines location of ifstate.
 
 config BUSYBOX_FEATURE_IFUPDOWN_IP
 	bool "Use ip tool (else ifconfig/route is used)"
 	default y
 	depends on BUSYBOX_IFUP || BUSYBOX_IFDOWN
 	help
-	  Use the iproute "ip" command to implement "ifup" and "ifdown", rather
-	  than the default of using the older "ifconfig" and "route" utilities.
+	Use the iproute "ip" command to implement "ifup" and "ifdown", rather
+	than the default of using the older "ifconfig" and "route" utilities.
 
-	  If Y: you must install either the full-blown iproute2 package
-	  or enable "ip" applet in Busybox, or the "ifup" and "ifdown" applets
-	  will not work.
+	If Y: you must install either the full-blown iproute2 package
+	or enable "ip" applet in busybox, or the "ifup" and "ifdown" applets
+	will not work.
 
-	  If N: you must install either the full-blown ifconfig and route
-	  utilities, or enable these applets in Busybox.
+	If N: you must install either the full-blown ifconfig and route
+	utilities, or enable these applets in busybox.
 
 config BUSYBOX_FEATURE_IFUPDOWN_IPV4
 	bool "Support IPv4"
 	default y
 	depends on BUSYBOX_IFUP || BUSYBOX_IFDOWN
 	help
-	  If you want ifup/ifdown to talk IPv4, leave this on.
+	If you want ifup/ifdown to talk IPv4, leave this on.
 
 config BUSYBOX_FEATURE_IFUPDOWN_IPV6
 	bool "Support IPv6"
 	default y
 	depends on (BUSYBOX_IFUP || BUSYBOX_IFDOWN) && BUSYBOX_FEATURE_IPV6
 	help
-	  If you need support for IPv6, turn this option on.
+	If you need support for IPv6, turn this option on.
 
 
 config BUSYBOX_FEATURE_IFUPDOWN_MAPPING
@@ -400,188 +407,207 @@ config BUSYBOX_FEATURE_IFUPDOWN_MAPPING
 	default y
 	depends on BUSYBOX_IFUP || BUSYBOX_IFDOWN
 	help
-	  This enables support for the "mapping" stanza, unless you have
-	  a weird network setup you don't need it.
+	This enables support for the "mapping" stanza, unless you have
+	a weird network setup you don't need it.
 
 config BUSYBOX_FEATURE_IFUPDOWN_EXTERNAL_DHCP
 	bool "Support external DHCP clients"
 	default n
 	depends on BUSYBOX_IFUP || BUSYBOX_IFDOWN
 	help
-	  This enables support for the external dhcp clients. Clients are
-	  tried in the following order: dhcpcd, dhclient, pump and udhcpc.
-	  Otherwise, if udhcpc applet is enabled, it is used.
-	  Otherwise, ifup/ifdown will have no support for DHCP.
+	This enables support for the external dhcp clients. Clients are
+	tried in the following order: dhcpcd, dhclient, pump and udhcpc.
+	Otherwise, if udhcpc applet is enabled, it is used.
+	Otherwise, ifup/ifdown will have no support for DHCP.
 config BUSYBOX_INETD
-	bool "inetd"
+	bool "inetd (18 kb)"
 	default y
 	select BUSYBOX_FEATURE_SYSLOG
 	help
-	  Internet superserver daemon
+	Internet superserver daemon
 
 config BUSYBOX_FEATURE_INETD_SUPPORT_BUILTIN_ECHO
-	bool "Support echo service"
+	bool "Support echo service on port 7"
 	default y
 	depends on BUSYBOX_INETD
 	help
-	  Echo received data internal inetd service
+	Internal service which echoes data back.
+	Activated by configuration lines like these:
+		echo stream tcp nowait root internal
+		echo dgram  udp wait   root internal
 
 config BUSYBOX_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD
-	bool "Support discard service"
+	bool "Support discard service on port 8"
 	default y
 	depends on BUSYBOX_INETD
 	help
-	  Internet /dev/null internal inetd service
+	Internal service which discards all input.
+	Activated by configuration lines like these:
+		discard stream tcp nowait root internal
+		discard dgram  udp wait   root internal
 
 config BUSYBOX_FEATURE_INETD_SUPPORT_BUILTIN_TIME
-	bool "Support time service"
+	bool "Support time service on port 37"
 	default y
 	depends on BUSYBOX_INETD
 	help
-	  Return 32 bit time since 1900 internal inetd service
+	Internal service which returns big-endian 32-bit number
+	of seconds passed since 1900-01-01. The number wraps around
+	on overflow.
+	Activated by configuration lines like these:
+		time stream tcp nowait root internal
+		time dgram  udp wait   root internal
 
 config BUSYBOX_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME
-	bool "Support daytime service"
+	bool "Support daytime service on port 13"
 	default y
 	depends on BUSYBOX_INETD
 	help
-	  Return human-readable time internal inetd service
+	Internal service which returns human-readable time.
+	Activated by configuration lines like these:
+		daytime stream tcp nowait root internal
+		daytime dgram  udp wait   root internal
 
 config BUSYBOX_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN
-	bool "Support chargen service"
+	bool "Support chargen service on port 19"
 	default y
 	depends on BUSYBOX_INETD
 	help
-	  Familiar character generator internal inetd service
+	Internal service which generates endless stream
+	of all ASCII chars beetween space and char 126.
+	Activated by configuration lines like these:
+		chargen stream tcp nowait root internal
+		chargen dgram  udp wait   root internal
 
 config BUSYBOX_FEATURE_INETD_RPC
 	bool "Support RPC services"
 	default n  # very rarely used, and needs Sun RPC support in libc
 	depends on BUSYBOX_INETD
-	select BUSYBOX_FEATURE_HAVE_RPC
 	help
-	  Support Sun-RPC based services
+	Support Sun-RPC based services
 config BUSYBOX_IP
-	bool "ip"
+	bool "ip (34 kb)"
 	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  The "ip" applet is a TCP/IP interface configuration and routing
-	  utility. You generally don't need "ip" to use busybox with
-	  TCP/IP.
+	The "ip" applet is a TCP/IP interface configuration and routing
+	utility.
+	Short forms (enabled below) are busybox-specific extensions.
+	The standard "ip" utility does not provide them. If you are
+	trying to be portable, it's better to use "ip CMD" forms.
 
 config BUSYBOX_IPADDR
-	bool "ipaddr"
+	bool "ipaddr (14 kb)"
 	default y
 	select BUSYBOX_FEATURE_IP_ADDRESS
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  Support short form of ip addr: ipaddr
+	Short form of "ip addr"
 
 config BUSYBOX_IPLINK
-	bool "iplink"
+	bool "iplink (16 kb)"
 	default y
 	select BUSYBOX_FEATURE_IP_LINK
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  Support short form of ip link: iplink
+	Short form of "ip link"
 
 config BUSYBOX_IPROUTE
-	bool "iproute"
+	bool "iproute (15 kb)"
 	default y
 	select BUSYBOX_FEATURE_IP_ROUTE
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  Support short form of ip route: iproute
+	Short form of "ip route"
 
 config BUSYBOX_IPTUNNEL
-	bool "iptunnel"
+	bool "iptunnel (9.6 kb)"
 	default y
 	select BUSYBOX_FEATURE_IP_TUNNEL
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  Support short form of ip tunnel: iptunnel
+	Short form of "ip tunnel"
 
 config BUSYBOX_IPRULE
-	bool "iprule"
+	bool "iprule (10 kb)"
 	default y
 	select BUSYBOX_FEATURE_IP_RULE
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  Support short form of ip rule: iprule
+	Short form of "ip rule"
 
 config BUSYBOX_IPNEIGH
-	bool "ipneigh"
+	bool "ipneigh (8.3 kb)"
 	default y
 	select BUSYBOX_FEATURE_IP_NEIGH
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  Support short form of ip neigh: ipneigh
+	Short form of "ip neigh"
 
 config BUSYBOX_FEATURE_IP_ADDRESS
 	bool "ip address"
 	default y
 	depends on BUSYBOX_IP || BUSYBOX_IPADDR
 	help
-	  Address manipulation support for the "ip" applet.
+	Address manipulation support for the "ip" applet.
 
 config BUSYBOX_FEATURE_IP_LINK
 	bool "ip link"
 	default y
 	depends on BUSYBOX_IP || BUSYBOX_IPLINK
 	help
-	  Configure network devices with "ip".
+	Configure network devices with "ip".
 
 config BUSYBOX_FEATURE_IP_ROUTE
 	bool "ip route"
 	default y
 	depends on BUSYBOX_IP || BUSYBOX_IPROUTE
 	help
-	  Add support for routing table management to "ip".
+	Add support for routing table management to "ip".
 
 config BUSYBOX_FEATURE_IP_ROUTE_DIR
 	string "ip route configuration directory"
 	default "/etc/iproute2"
 	depends on BUSYBOX_FEATURE_IP_ROUTE
 	help
-	  Location of the "ip" applet routing configuration.
+	Location of the "ip" applet routing configuration.
 
 config BUSYBOX_FEATURE_IP_TUNNEL
 	bool "ip tunnel"
 	default y
 	depends on BUSYBOX_IP || BUSYBOX_IPTUNNEL
 	help
-	  Add support for tunneling commands to "ip".
+	Add support for tunneling commands to "ip".
 
 config BUSYBOX_FEATURE_IP_RULE
 	bool "ip rule"
 	default y
 	depends on BUSYBOX_IP || BUSYBOX_IPRULE
 	help
-	  Add support for rule commands to "ip".
+	Add support for rule commands to "ip".
 
 config BUSYBOX_FEATURE_IP_NEIGH
 	bool "ip neighbor"
 	default y
 	depends on BUSYBOX_IP || BUSYBOX_IPNEIGH
 	help
-	  Add support for neighbor commands to "ip".
+	Add support for neighbor commands to "ip".
 
 config BUSYBOX_FEATURE_IP_RARE_PROTOCOLS
 	bool "Support displaying rarely used link types"
 	default n
 	depends on BUSYBOX_IP || BUSYBOX_IPADDR || BUSYBOX_IPLINK || BUSYBOX_IPROUTE || BUSYBOX_IPTUNNEL || BUSYBOX_IPRULE || BUSYBOX_IPNEIGH
 	help
-	  If you are not going to use links of type "frad", "econet",
-	  "bif" etc, you probably don't need to enable this.
-	  Ethernet, wireless, infrared, ppp/slip, ip tunnelling
-	  link types are supported without this option selected.
+	If you are not going to use links of type "frad", "econet",
+	"bif" etc, you probably don't need to enable this.
+	Ethernet, wireless, infrared, ppp/slip, ip tunnelling
+	link types are supported without this option selected.
 config BUSYBOX_IPCALC
-	bool "ipcalc"
+	bool "ipcalc (4.3 kb)"
 	default y
 	help
-	  ipcalc takes an IP address and netmask and calculates the
-	  resulting broadcast, network, and host range.
+	ipcalc takes an IP address and netmask and calculates the
+	resulting broadcast, network, and host range.
 
 config BUSYBOX_FEATURE_IPCALC_LONG_OPTIONS
 	bool "Enable long options"
@@ -593,304 +619,315 @@ config BUSYBOX_FEATURE_IPCALC_FANCY
 	default y
 	depends on BUSYBOX_IPCALC
 	help
-	  Adds the options hostname, prefix and silent to the output of
-	  "ipcalc".
+	Adds the options hostname, prefix and silent to the output of
+	"ipcalc".
 config BUSYBOX_FAKEIDENTD
-	bool "fakeidentd"
+	bool "fakeidentd (8.9 kb)"
 	default y
 	select BUSYBOX_FEATURE_SYSLOG
 	help
-	  fakeidentd listens on the ident port and returns a predefined
-	  fake value on any query.
+	fakeidentd listens on the ident port and returns a predefined
+	fake value on any query.
 config BUSYBOX_NAMEIF
-	bool "nameif"
+	bool "nameif (6.6 kb)"
 	default y
 	select BUSYBOX_PLATFORM_LINUX
 	select BUSYBOX_FEATURE_SYSLOG
 	help
-	  nameif is used to rename network interface by its MAC address.
-	  Renamed interfaces MUST be in the down state.
-	  It is possible to use a file (default: /etc/mactab)
-	  with list of new interface names and MACs.
-	  Maximum interface name length: IFNAMSIZ = 16
-	  File fields are separated by space or tab.
-	  File format:
-	  # Comment
-	  new_interface_name    XX:XX:XX:XX:XX:XX
+	nameif is used to rename network interface by its MAC address.
+	Renamed interfaces MUST be in the down state.
+	It is possible to use a file (default: /etc/mactab)
+	with list of new interface names and MACs.
+	Maximum interface name length: IFNAMSIZ = 16
+	File fields are separated by space or tab.
+	File format:
+		# Comment
+		new_interface_name  XX:XX:XX:XX:XX:XX
 
 config BUSYBOX_FEATURE_NAMEIF_EXTENDED
 	bool "Extended nameif"
 	default y
 	depends on BUSYBOX_NAMEIF
 	help
-	  This extends the nameif syntax to support the bus_info, driver,
-	  phyaddr selectors. The syntax is compatible to the normal nameif.
-	  File format:
-	    new_interface_name  driver=asix bus=usb-0000:00:08.2-3
-	    new_interface_name  bus=usb-0000:00:08.2-3 00:80:C8:38:91:B5
-	    new_interface_name  phy_address=2 00:80:C8:38:91:B5
-	    new_interface_name  mac=00:80:C8:38:91:B5
-	    new_interface_name  00:80:C8:38:91:B5
+	This extends the nameif syntax to support the bus_info, driver,
+	phyaddr selectors. The syntax is compatible to the normal nameif.
+	File format:
+		new_interface_name  driver=asix bus=usb-0000:00:08.2-3
+		new_interface_name  bus=usb-0000:00:08.2-3 00:80:C8:38:91:B5
+		new_interface_name  phy_address=2 00:80:C8:38:91:B5
+		new_interface_name  mac=00:80:C8:38:91:B5
+		new_interface_name  00:80:C8:38:91:B5
 config BUSYBOX_NBDCLIENT
-	bool "nbd-client"
+	bool "nbd-client (4.6 kb)"
 	default y
 	help
-	  Network block device client
+	Network block device client
 config BUSYBOX_NC
-	bool "nc"
+	bool "nc (11 kb)"
 	default y
 	help
-	  A simple Unix utility which reads and writes data across network
-	  connections.
+	A simple Unix utility which reads and writes data across network
+	connections.
+
+config BUSYBOX_NETCAT
+	bool "netcat (11 kb)"
+	default n
+	help
+	Alias to nc.
 
 config BUSYBOX_NC_SERVER
 	bool "Netcat server options (-l)"
 	default y
-	depends on BUSYBOX_NC
+	depends on BUSYBOX_NC || BUSYBOX_NETCAT
 	help
-	  Allow netcat to act as a server.
+	Allow netcat to act as a server.
 
 config BUSYBOX_NC_EXTRA
 	bool "Netcat extensions (-eiw and -f FILE)"
 	default y
-	depends on BUSYBOX_NC
+	depends on BUSYBOX_NC || BUSYBOX_NETCAT
 	help
-	  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).
+	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 BUSYBOX_NC_110_COMPAT
 	bool "Netcat 1.10 compatibility (+2.5k)"
-	default n  # off specially for Rob
-	depends on BUSYBOX_NC
+	default y
+	depends on BUSYBOX_NC || BUSYBOX_NETCAT
 	help
-	  This option makes nc closely follow original nc-1.10.
-	  The code is about 2.5k bigger. It enables
-	  -s ADDR, -n, -u, -v, -o FILE, -z options, but loses
-	  busybox-specific extensions: -f FILE.
+	This option makes nc closely follow original nc-1.10.
+	The code is about 2.5k bigger. It enables
+	-s ADDR, -n, -u, -v, -o FILE, -z options, but loses
+	busybox-specific extensions: -f FILE.
 config BUSYBOX_NETSTAT
-	bool "netstat"
+	bool "netstat (10 kb)"
 	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  netstat prints information about the Linux networking subsystem.
+	netstat prints information about the Linux networking subsystem.
 
 config BUSYBOX_FEATURE_NETSTAT_WIDE
 	bool "Enable wide output"
 	default y
 	depends on BUSYBOX_NETSTAT
 	help
-	  Add support for wide columns. Useful when displaying IPv6 addresses
-	  (-W option).
+	Add support for wide columns. Useful when displaying IPv6 addresses
+	(-W option).
 
 config BUSYBOX_FEATURE_NETSTAT_PRG
 	bool "Enable PID/Program name output"
 	default y
 	depends on BUSYBOX_NETSTAT
 	help
-	  Add support for -p flag to print out PID and program name.
-	  +700 bytes of code.
+	Add support for -p flag to print out PID and program name.
+	+700 bytes of code.
 config BUSYBOX_NSLOOKUP
-	bool "nslookup"
+	bool "nslookup (4.5 kb)"
 	default y
 	help
-	  nslookup is a tool to query Internet name servers.
+	nslookup is a tool to query Internet name servers.
 config BUSYBOX_NTPD
-	bool "ntpd"
+	bool "ntpd (17 kb)"
 	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  The NTP client/server daemon.
+	The NTP client/server daemon.
 
 config BUSYBOX_FEATURE_NTPD_SERVER
 	bool "Make ntpd usable as a NTP server"
 	default y
 	depends on BUSYBOX_NTPD
 	help
-	  Make ntpd usable as a NTP server. If you disable this option
-	  ntpd will be usable only as a NTP client.
+	Make ntpd usable as a NTP server. If you disable this option
+	ntpd will be usable only as a NTP client.
 
 config BUSYBOX_FEATURE_NTPD_CONF
 	bool "Make ntpd understand /etc/ntp.conf"
 	default y
 	depends on BUSYBOX_NTPD
 	help
-	  Make ntpd look in /etc/ntp.conf for peers. Only "server address"
-	  is supported.
+	Make ntpd look in /etc/ntp.conf for peers. Only "server address"
+	is supported.
 config BUSYBOX_PING
-	bool "ping"
+	bool "ping (9.5 kb)"
 	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  ping uses the ICMP protocol's mandatory ECHO_REQUEST datagram to
-	  elicit an ICMP ECHO_RESPONSE from a host or gateway.
+	ping uses the ICMP protocol's mandatory ECHO_REQUEST datagram to
+	elicit an ICMP ECHO_RESPONSE from a host or gateway.
 
 config BUSYBOX_PING6
-	bool "ping6"
+	bool "ping6 (10 kb)"
 	default y
 	depends on BUSYBOX_FEATURE_IPV6
 	help
-	  This will give you a ping that can talk IPv6.
+	Alias to "ping -6".
 
 config BUSYBOX_FEATURE_FANCY_PING
 	bool "Enable fancy ping output"
 	default y
 	depends on BUSYBOX_PING || BUSYBOX_PING6
 	help
-	  Make the output from the ping applet include statistics, and at the
-	  same time provide full support for ICMP packets.
+	With this option off, ping will say "HOST is alive!"
+	or terminate with SIGALRM in 5 seconds otherwise.
+	No command-line options will be recognized.
 config BUSYBOX_PSCAN
-	bool "pscan"
+	bool "pscan (6.6 kb)"
 	default y
 	help
-	  Simple network port scanner.
+	Simple network port scanner.
 config BUSYBOX_ROUTE
-	bool "route"
+	bool "route (8.9 kb)"
 	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  Route displays or manipulates the kernel's IP routing tables.
+	Route displays or manipulates the kernel's IP routing tables.
 config BUSYBOX_SLATTACH
-	bool "slattach"
+	bool "slattach (6.1 kb)"
 	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  slattach is a small utility to attach network interfaces to serial
-	  lines.
+	slattach configures serial line as SLIP network interface.
 config BUSYBOX_SSL_CLIENT
-	bool "ssl_client"
+	bool "ssl_client (23 kb)"
 	default y
 	select BUSYBOX_TLS
 	help
-	  This tool pipes data to/from a socket, TLS-encrypting it.
+	This tool pipes data to/from a socket, TLS-encrypting it.
 config BUSYBOX_TCPSVD
-	bool "tcpsvd"
+	bool "tcpsvd (13 kb)"
 	default y
 	help
-	  tcpsvd listens on a TCP port and runs a program for each new
-	  connection.
+	tcpsvd listens on a TCP port and runs a program for each new
+	connection.
 
 config BUSYBOX_UDPSVD
-	bool "udpsvd"
+	bool "udpsvd (13 kb)"
 	default y
 	help
-	  udpsvd listens on an UDP port and runs a program for each new
-	  connection.
+	udpsvd listens on an UDP port and runs a program for each new
+	connection.
 config BUSYBOX_TELNET
-	bool "telnet"
+	bool "telnet (8.7 kb)"
 	default y
 	help
-	  Telnet is an interface to the TELNET protocol, but is also commonly
-	  used to test other simple protocols.
+	Telnet is an interface to the TELNET protocol, but is also commonly
+	used to test other simple protocols.
 
 config BUSYBOX_FEATURE_TELNET_TTYPE
 	bool "Pass TERM type to remote host"
 	default y
 	depends on BUSYBOX_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.
+	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 BUSYBOX_FEATURE_TELNET_AUTOLOGIN
 	bool "Pass USER type to remote host"
 	default y
 	depends on BUSYBOX_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.
+	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' options.
 
 config BUSYBOX_FEATURE_TELNET_WIDTH
 	bool "Enable window size autodetection"
 	default y
 	depends on BUSYBOX_TELNET
 config BUSYBOX_TELNETD
-	bool "telnetd"
+	bool "telnetd (12 kb)"
 	default y
 	select BUSYBOX_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
-	  sends passwords in plain text. If you can't afford the space for an
-	  SSH daemon and you trust your network, you may say 'y' here. As a
-	  more secure alternative, you should seriously consider installing the
-	  very small Dropbear SSH daemon instead:
+	A daemon for the TELNET protocol, allowing you to log onto the host
+	running the daemon. Please keep in mind that the TELNET protocol
+	sends passwords in plain text. If you can't afford the space for an
+	SSH daemon and you trust your network, you may say 'y' here. As a
+	more secure alternative, you should seriously consider installing the
+	very small Dropbear SSH daemon instead:
 		http://matt.ucc.asn.au/dropbear/dropbear.html
 
-	  Note that for busybox telnetd to work you need several things:
-	  First of all, your kernel needs:
+	Note that for busybox telnetd to work you need several things:
+	First of all, your kernel needs:
 		  CONFIG_UNIX98_PTYS=y
 
-	  Next, you need a /dev/pts directory on your root filesystem:
+	Next, you need a /dev/pts directory on your root filesystem:
 
 		  $ ls -ld /dev/pts
 		  drwxr-xr-x  2 root root 0 Sep 23 13:21 /dev/pts/
 
-	  Next you need the pseudo terminal master multiplexer /dev/ptmx:
+	Next you need the pseudo terminal master multiplexer /dev/ptmx:
 
 		  $ ls -la /dev/ptmx
 		  crw-rw-rw-  1 root tty 5, 2 Sep 23 13:55 /dev/ptmx
 
-	  Any /dev/ttyp[0-9]* files you may have can be removed.
-	  Next, you need to mount the devpts filesystem on /dev/pts using:
+	Any /dev/ttyp[0-9]* files you may have can be removed.
+	Next, you need to mount the devpts filesystem on /dev/pts using:
 
 		  mount -t devpts devpts /dev/pts
 
-	  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:
+	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
 		chmod 4755 /bin/busybox
 
-	  with all that done, telnetd _should_ work....
+	with all that done, telnetd _should_ work....
 
 config BUSYBOX_FEATURE_TELNETD_STANDALONE
 	bool "Support standalone telnetd (not inetd only)"
 	default y
 	depends on BUSYBOX_TELNETD
 	help
-	  Selecting this will make telnetd able to run standalone.
+	Selecting this will make telnetd able to run standalone.
 
 config BUSYBOX_FEATURE_TELNETD_INETD_WAIT
 	bool "Support -w SEC option (inetd wait mode)"
 	default y
 	depends on BUSYBOX_FEATURE_TELNETD_STANDALONE
 	help
-	  This option allows you to run telnetd in "inet wait" mode.
-	  Example inetd.conf line (note "wait", not usual "nowait"):
+	This option allows you to run telnetd in "inet wait" mode.
+	Example inetd.conf line (note "wait", not usual "nowait"):
 
-	  telnet stream tcp wait root /bin/telnetd telnetd -w10
+	telnet stream tcp wait root /bin/telnetd telnetd -w10
 
-	  In this example, inetd passes _listening_ socket_ as fd 0
-	  to telnetd when connection appears.
-	  telnetd will wait for connections until all existing
-	  connections are closed, and no new connections
-	  appear during 10 seconds. Then it exits, and inetd continues
-	  to listen for new connections.
+	In this example, inetd passes _listening_ socket_ as fd 0
+	to telnetd when connection appears.
+	telnetd will wait for connections until all existing
+	connections are closed, and no new connections
+	appear during 10 seconds. Then it exits, and inetd continues
+	to listen for new connections.
 
-	  This option is rarely used. "tcp nowait" is much more usual
-	  way of running tcp services, including telnetd.
-	  You most probably want to say N here.
+	This option is rarely used. "tcp nowait" is much more usual
+	way of running tcp services, including telnetd.
+	You most probably want to say N here.
 config BUSYBOX_TFTP
-	bool "tftp"
+	bool "tftp (12 kb)"
 	default y
 	help
-	  This enables the Trivial File Transfer Protocol client program. TFTP
-	  is usually used for simple, small transfers such as a root image
-	  for a network-enabled bootloader.
+	Trivial File Transfer Protocol client. TFTP is usually used
+	for simple, small transfers such as a root image
+	for a network-enabled bootloader.
+
+config BUSYBOX_FEATURE_TFTP_PROGRESS_BAR
+	bool "Enable progress bar"
+	default y
+	depends on BUSYBOX_TFTP
 
 config BUSYBOX_TFTPD
-	bool "tftpd"
+	bool "tftpd (10 kb)"
 	default y
 	help
-	  This enables the Trivial File Transfer Protocol server program.
-	  It expects that stdin is a datagram socket and a packet
-	  is already pending on it. It will exit after one transfer.
-	  In other words: it should be run from inetd in nowait mode,
-	  or from udpsvd. Example: "udpsvd -E 0 69 tftpd DIR"
+	Trivial File Transfer Protocol server.
+	It expects that stdin is a datagram socket and a packet
+	is already pending on it. It will exit after one transfer.
+	In other words: it should be run from inetd in nowait mode,
+	or from udpsvd. Example: "udpsvd -E 0 69 tftpd DIR"
 
 comment "Common options for tftp/tftpd"
 	depends on BUSYBOX_TFTP || BUSYBOX_TFTPD
@@ -900,97 +937,92 @@ config BUSYBOX_FEATURE_TFTP_GET
 	default y
 	depends on BUSYBOX_TFTP || BUSYBOX_TFTPD
 	help
-	  Add support for the GET command within the TFTP client. This allows
-	  a client to retrieve a file from a TFTP server.
-	  Also enable upload support in tftpd, if tftpd is selected.
+	Add support for the GET command within the TFTP client. This allows
+	a client to retrieve a file from a TFTP server.
+	Also enable upload support in tftpd, if tftpd is selected.
 
-	  Note: this option does _not_ make tftpd capable of download
-	  (the usual operation people need from it)!
+	Note: this option does _not_ make tftpd capable of download
+	(the usual operation people need from it)!
 
 config BUSYBOX_FEATURE_TFTP_PUT
 	bool "Enable 'tftp put' and/or tftpd download code"
 	default y
 	depends on BUSYBOX_TFTP || BUSYBOX_TFTPD
 	help
-	  Add support for the PUT command within the TFTP client. This allows
-	  a client to transfer a file to a TFTP server.
-	  Also enable download support in tftpd, if tftpd is selected.
+	Add support for the PUT command within the TFTP client. This allows
+	a client to transfer a file to a TFTP server.
+	Also enable download support in tftpd, if tftpd is selected.
 
 config BUSYBOX_FEATURE_TFTP_BLOCKSIZE
 	bool "Enable 'blksize' and 'tsize' protocol options"
 	default y
 	depends on BUSYBOX_TFTP || BUSYBOX_TFTPD
 	help
-	  Allow tftp to specify block size, and tftpd to understand
-	  "blksize" and "tsize" options.
-
-config BUSYBOX_FEATURE_TFTP_PROGRESS_BAR
-	bool "Enable progress bar"
-	default y
-	depends on BUSYBOX_TFTP && BUSYBOX_FEATURE_TFTP_BLOCKSIZE
+	Allow tftp to specify block size, and tftpd to understand
+	"blksize" and "tsize" options.
 
 config BUSYBOX_TFTP_DEBUG
 	bool "Enable debug"
 	default n
 	depends on BUSYBOX_TFTP || BUSYBOX_TFTPD
 	help
-	  Make tftp[d] print debugging messages on stderr.
-	  This is useful if you are diagnosing a bug in tftp[d].
+	Make tftp[d] print debugging messages on stderr.
+	This is useful if you are diagnosing a bug in tftp[d].
 config BUSYBOX_TLS
 	bool #No description makes it a hidden option
 	default n
 config BUSYBOX_TRACEROUTE
-	bool "traceroute"
+	bool "traceroute (11 kb)"
 	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  Utility to trace the route of IP packets.
+	Utility to trace the route of IP packets.
 
 config BUSYBOX_TRACEROUTE6
-	bool "traceroute6"
+	bool "traceroute6 (12 kb)"
 	default y
 	depends on BUSYBOX_FEATURE_IPV6
 	help
-	  Utility to trace the route of IPv6 packets.
+	Utility to trace the route of IPv6 packets.
 
 config BUSYBOX_FEATURE_TRACEROUTE_VERBOSE
 	bool "Enable verbose output"
 	default y
 	depends on BUSYBOX_TRACEROUTE || BUSYBOX_TRACEROUTE6
 	help
-	  Add some verbosity to traceroute. This includes among other things
-	  hostnames and ICMP response types.
+	Add some verbosity to traceroute. This includes among other things
+	hostnames and ICMP response types.
 
 config BUSYBOX_FEATURE_TRACEROUTE_USE_ICMP
 	bool "Enable -I option (use ICMP instead of UDP)"
 	default y
 	depends on BUSYBOX_TRACEROUTE || BUSYBOX_TRACEROUTE6
 config BUSYBOX_TUNCTL
-	bool "tunctl"
+	bool "tunctl (6.4 kb)"
 	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  tunctl creates or deletes tun devices.
+	tunctl creates or deletes tun devices.
 
 config BUSYBOX_FEATURE_TUNCTL_UG
 	bool "Support owner:group assignment"
 	default y
 	depends on BUSYBOX_TUNCTL
 	help
-	  Allow to specify owner and group of newly created interface.
-	  340 bytes of pure bloat. Say no here.
+	Allow to specify owner and group of newly created interface.
+	340 bytes of pure bloat. Say no here.
 config BUSYBOX_VCONFIG
-	bool "vconfig"
+	bool "vconfig (2.5 kb)"
 	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  Creates, removes, and configures VLAN interfaces
+	Creates, removes, and configures VLAN interfaces
 config BUSYBOX_WGET
-	bool "wget"
+	bool "wget (35 kb)"
 	default y
 	help
-	  wget is a utility for non-interactive download of files from HTTP
-	  and FTP servers.
+	wget is a utility for non-interactive download of files from HTTP
+	and FTP servers.
 
 config BUSYBOX_FEATURE_WGET_LONG_OPTIONS
 	bool "Enable long options"
@@ -1007,21 +1039,21 @@ config BUSYBOX_FEATURE_WGET_AUTHENTICATION
 	default y
 	depends on BUSYBOX_WGET
 	help
-	  Support authenticated HTTP transfers.
+	Support authenticated HTTP transfers.
 
 config BUSYBOX_FEATURE_WGET_TIMEOUT
 	bool "Enable timeout option -T SEC"
 	default y
 	depends on BUSYBOX_WGET
 	help
-	  Supports network read and connect timeouts for wget,
-	  so that wget will give up and timeout, through the -T
-	  command line option.
+	Supports network read and connect timeouts for wget,
+	so that wget will give up and timeout, through the -T
+	command line option.
 
-	  Currently only connect and network data read timeout are
-	  supported (i.e., timeout is not applied to the DNS query). When
-	  FEATURE_WGET_LONG_OPTIONS is also enabled, the --timeout option
-	  will work in addition to -T.
+	Currently only connect and network data read timeout are
+	supported (i.e., timeout is not applied to the DNS query). When
+	FEATURE_WGET_LONG_OPTIONS is also enabled, the --timeout option
+	will work in addition to -T.
 
 config BUSYBOX_FEATURE_WGET_HTTPS
 	bool "Support HTTPS using internal TLS code"
@@ -1029,85 +1061,85 @@ config BUSYBOX_FEATURE_WGET_HTTPS
 	depends on BUSYBOX_WGET
 	select BUSYBOX_TLS
 	help
-	  wget will use internal TLS code to connect to https:// URLs.
-	  Note:
-	  On NOMMU machines, ssl_helper applet should be available
-	  in the $PATH for this to work. Make sure to select that applet.
-
-	  Note: currently, TLS code only makes TLS I/O work, it
-	  does *not* check that the peer is who it claims to be, etc.
-	  IOW: it uses peer-supplied public keys to establish encryption
-	  and signing keys, then encrypts and signs outgoing data and
-	  decrypts incoming data.
-	  It does not check signature hashes on the incoming data:
-	  this means that attackers manipulating TCP packets can
-	  send altered data and we unknowingly receive garbage.
-	  (This check might be relatively easy to add).
-	  It does not check public key's certificate:
-	  this means that the peer may be an attacker impersonating
-	  the server we think we are talking to.
-
-	  If you think this is unacceptable, consider this. As more and more
-	  servers switch to HTTPS-only operation, without such "crippled"
-	  TLS code it is *impossible* to simply download a kernel source
-	  from kernel.org. Which can in real world translate into
-	  "my small automatic tooling to build cross-compilers from sources
-	  no longer works, I need to additionally keep a local copy
-	  of ~4 megabyte source tarball of a SSL library and ~2 megabyte
-	  source "config/busybox/of wget, need to compile and built both before I can"
-	  download anything. All this despite the fact that the build
-	  is done in a QEMU sandbox on a machine with absolutely nothing
-	  worth stealing, so I don't care if someone would go to a lot
-	  of trouble to intercept my HTTPS download to send me an altered
-	  kernel tarball".
-
-	  If you still think this is unacceptable, send patches.
-
-	  If you still think this is unacceptable, do not want to send
-	  patches, but do want to waste bandwidth expaining how wrong
-	  it is, you will be ignored.
+	wget will use internal TLS code to connect to https:// URLs.
+	Note:
+	On NOMMU machines, ssl_helper applet should be available
+	in the $PATH for this to work. Make sure to select that applet.
+
+	Note: currently, TLS code only makes TLS I/O work, it
+	does *not* check that the peer is who it claims to be, etc.
+	IOW: it uses peer-supplied public keys to establish encryption
+	and signing keys, then encrypts and signs outgoing data and
+	decrypts incoming data.
+	It does not check signature hashes on the incoming data:
+	this means that attackers manipulating TCP packets can
+	send altered data and we unknowingly receive garbage.
+	(This check might be relatively easy to add).
+	It does not check public key's certificate:
+	this means that the peer may be an attacker impersonating
+	the server we think we are talking to.
+
+	If you think this is unacceptable, consider this. As more and more
+	servers switch to HTTPS-only operation, without such "crippled"
+	TLS code it is *impossible* to simply download a kernel source
+	from kernel.org. Which can in real world translate into
+	"my small automatic tooling to build cross-compilers from sources
+	no longer works, I need to additionally keep a local copy
+	of ~4 megabyte source tarball of a SSL library and ~2 megabyte
+	source of wget, need to compile and built both before I can
+	download anything. All this despite the fact that the build
+	is done in a QEMU sandbox on a machine with absolutely nothing
+	worth stealing, so I don't care if someone would go to a lot
+	of trouble to intercept my HTTPS download to send me an altered
+	kernel tarball".
+
+	If you still think this is unacceptable, send patches.
+
+	If you still think this is unacceptable, do not want to send
+	patches, but do want to waste bandwidth expaining how wrong
+	it is, you will be ignored.
 
 config BUSYBOX_FEATURE_WGET_OPENSSL
 	bool "Try to connect to HTTPS using openssl"
 	default y
 	depends on BUSYBOX_WGET
 	help
-	  Try to use openssl to handle HTTPS.
-
-	  OpenSSL has a simple SSL client for debug purposes.
-	  If you select this option, wget will effectively run:
-	  "openssl s_client -quiet -connect hostname:443
-	  -servername hostname 2>/dev/null" and pipe its data
-	  through it. -servername is not used if hostname is numeric.
-	  Note inconvenient API: host resolution is done twice,
-	  and there is no guarantee openssl's idea of IPv6 address
-	  format is the same as ours.
-	  Another problem is that s_client prints debug information
-	  to stderr, and it needs to be suppressed. This means
-	  all error messages get suppressed too.
-	  openssl is also a big binary, often dynamically linked
-	  against ~15 libraries.
-
-	  If openssl can't be executed, internal TLS code will be used
-	  (if you enabled it); if openssl can be executed but fails later,
-	  wget can't detect this, and download will fail.
+	Try to use openssl to handle HTTPS.
+
+	OpenSSL has a simple SSL client for debug purposes.
+	If you select this option, wget will effectively run:
+	"openssl s_client -quiet -connect hostname:443
+	-servername hostname 2>/dev/null" and pipe its data
+	through it. -servername is not used if hostname is numeric.
+	Note inconvenient API: host resolution is done twice,
+	and there is no guarantee openssl's idea of IPv6 address
+	format is the same as ours.
+	Another problem is that s_client prints debug information
+	to stderr, and it needs to be suppressed. This means
+	all error messages get suppressed too.
+	openssl is also a big binary, often dynamically linked
+	against ~15 libraries.
+
+	If openssl can't be executed, internal TLS code will be used
+	(if you enabled it); if openssl can be executed but fails later,
+	wget can't detect this, and download will fail.
 config BUSYBOX_WHOIS
-	bool "whois"
+	bool "whois (6.6 kb)"
 	default y
 	help
-	  whois is a client for the whois directory service
+	whois is a client for the whois directory service
 config BUSYBOX_ZCIP
-	bool "zcip"
+	bool "zcip (7.8 kb)"
 	default y
 	select BUSYBOX_PLATFORM_LINUX
 	select BUSYBOX_FEATURE_SYSLOG
 	help
-	  ZCIP provides ZeroConf IPv4 address selection, according to RFC 3927.
-	  It's a daemon that allocates and defends a dynamically assigned
-	  address on the 169.254/16 network, requiring no system administrator.
+	ZCIP provides ZeroConf IPv4 address selection, according to RFC 3927.
+	It's a daemon that allocates and defends a dynamically assigned
+	address on the 169.254/16 network, requiring no system administrator.
 
-	  See http://www.zeroconf.org for further details, and "zcip.script"
-	  in the busybox examples.
+	See http://www.zeroconf.org for further details, and "zcip.script"
+	in the busybox examples.
 
 source "config/busybox/networking/udhcp/Config.in"
 
@@ -1116,8 +1148,8 @@ config BUSYBOX_IFUPDOWN_UDHCPC_CMD_OPTIONS
 	default "-R -n"
 	depends on BUSYBOX_IFUP || BUSYBOX_IFDOWN
 	help
-	  Command line options to pass to udhcpc from ifup.
-	  Intended to alter options not available in /etc/network/interfaces.
-	  (IE: --syslog --background etc...)
+	Command line options to pass to udhcpc from ifup.
+	Intended to alter options not available in /etc/network/interfaces.
+	(IE: --syslog --background etc...)
 
 endmenu
diff --git a/config/busybox/networking/udhcp/Config.in b/config/busybox/networking/udhcp/Config.in
index 75dd99c09..7f05c38f8 100644
--- a/config/busybox/networking/udhcp/Config.in
+++ b/config/busybox/networking/udhcp/Config.in
@@ -4,190 +4,194 @@
 # see scripts/kbuild/config-language.txt.
 #
 
-config BUSYBOX_UDHCPC6
-	bool "udhcpc6 (DHCPv6 client, EXPERIMENTAL)"
-	default n  # not yet ready
-	depends on BUSYBOX_FEATURE_IPV6
-	help
-	  udhcpc6 is a DHCPv6 client
-
-config BUSYBOX_FEATURE_UDHCPC6_RFC3646
-	bool "Support RFC 3646 (DNS server and search list)"
-	default y
-	depends on BUSYBOX_UDHCPC6
-	help
-	  List of DNS servers and domain search list can be requested with
-	  "-O dns" and "-O search". If server gives these values,
-	  they will be set in environment variables "dns" and "search".
-
-config BUSYBOX_FEATURE_UDHCPC6_RFC4704
-	bool "Support RFC 4704 (Client FQDN)"
-	default y
-	depends on BUSYBOX_UDHCPC6
-	help
-	  You can request FQDN to be given by server using "-O fqdn".
-
-config BUSYBOX_FEATURE_UDHCPC6_RFC4833
-	bool "Support RFC 4833 (Timezones)"
-	default y
-	depends on BUSYBOX_UDHCPC6
-	help
-	  You can request POSIX timezone with "-O tz" and timezone name
-	  with "-O timezone".
-
 config BUSYBOX_UDHCPD
-	bool "udhcpd (DHCP server)"
+	bool "udhcpd"
 	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  udhcpd is a DHCP server geared primarily toward embedded systems,
-	  while striving to be fully functional and RFC compliant.
-
-config BUSYBOX_FEATURE_UDHCPD_WRITE_LEASES_EARLY
-	bool "Rewrite the lease file at every new acknowledge"
-	default y
-	depends on BUSYBOX_UDHCPD
-	help
-	  If selected, udhcpd will write a new file with leases every
-	  time a new lease has been accepted, thus eliminating the need
-	  to send SIGUSR1 for the initial writing or updating. Any timed
-	  rewriting remains undisturbed.
+	udhcpd is a DHCP server geared primarily toward embedded systems,
+	while striving to be fully functional and RFC compliant.
 
 config BUSYBOX_FEATURE_UDHCPD_BASE_IP_ON_MAC
 	bool "Select IP address based on client MAC"
 	default n
 	depends on BUSYBOX_UDHCPD
 	help
-	  If selected, udhcpd will base its selection of IP address to offer
-	  on the client's hardware address. Otherwise udhcpd uses the next
-	  consecutive free address.
+	If selected, udhcpd will base its selection of IP address to offer
+	on the client's hardware address. Otherwise udhcpd uses the next
+	consecutive free address.
 
-	  This reduces the frequency of IP address changes for clients
-	  which let their lease expire, and makes consecutive DHCPOFFERS
-	  for the same client to (almost always) contain the same
-	  IP address.
+	This reduces the frequency of IP address changes for clients
+	which let their lease expire, and makes consecutive DHCPOFFERS
+	for the same client to (almost always) contain the same
+	IP address.
+
+config BUSYBOX_FEATURE_UDHCPD_WRITE_LEASES_EARLY
+	bool "Rewrite lease file at every new acknowledge"
+	default y
+	depends on BUSYBOX_UDHCPD
+	help
+	If selected, udhcpd will write a new file with leases every
+	time a new lease has been accepted, thus eliminating the need
+	to send SIGUSR1 for the initial writing or updating. Any timed
+	rewriting remains undisturbed.
 
 config BUSYBOX_DHCPD_LEASES_FILE
 	string "Absolute path to lease file"
 	default "/var/lib/misc/udhcpd.leases"
 	depends on BUSYBOX_UDHCPD
 	help
-	  udhcpd stores addresses in a lease file. This is the absolute path
-	  of the file. Normally it is safe to leave it untouched.
+	udhcpd stores addresses in a lease file. This is the absolute path
+	of the file. Normally it is safe to leave it untouched.
 
 config BUSYBOX_DUMPLEASES
-	bool "dumpleases"
+	bool "dumpleases (6.4 kb)"
 	default y
 	help
-	  dumpleases displays the leases written out by the udhcpd.
-	  Lease times are stored in the file by time remaining in lease, or
-	  by the absolute time that it expires in seconds from epoch.
+	dumpleases displays the leases written out by the udhcpd.
+	Lease times are stored in the file by time remaining in lease, or
+	by the absolute time that it expires in seconds from epoch.
 
 config BUSYBOX_DHCPRELAY
-	bool "dhcprelay"
+	bool "dhcprelay (5.8 kb)"
 	default y
 	help
-	  dhcprelay listens for dhcp requests on one or more interfaces
-	  and forwards these requests to a different interface or dhcp
-	  server.
+	dhcprelay listens for DHCP requests on one or more interfaces
+	and forwards these requests to a different interface or DHCP
+	server.
 
 config BUSYBOX_UDHCPC
-	bool "udhcpc (DHCP client)"
+	bool "udhcpc"
 	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  udhcpc is a DHCP client geared primarily toward embedded systems,
-	  while striving to be fully functional and RFC compliant.
+	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
-	  runs a script when a lease is obtained or lost.
+	The udhcp client negotiates a lease with the DHCP server and
+	runs a script when a lease is obtained or lost.
 
 config BUSYBOX_FEATURE_UDHCPC_ARPING
 	bool "Verify that the offered address is free, using ARP ping"
 	default y
 	depends on BUSYBOX_UDHCPC
 	help
-	  If selected, udhcpc will send ARP probes and make sure
-	  the offered address is really not in use by anyone. The client
-	  will DHCPDECLINE the offer if the address is in use,
-	  and restart the discover process.
+	If selected, udhcpc will send ARP probes and make sure
+	the offered address is really not in use by anyone. The client
+	will DHCPDECLINE the offer if the address is in use,
+	and restart the discover process.
 
 config BUSYBOX_FEATURE_UDHCPC_SANITIZEOPT
 	bool "Do not pass malformed host and domain names"
 	default y
 	depends on BUSYBOX_UDHCPC
 	help
-	  If selected, udhcpc will check some options (such as option 12 -
-	  hostname) and if they don't look like valid hostnames
-	  (for example, if they start with dash or contain spaces),
-	  they will be replaced with string "bad" when exporting
-	  to the environment.
+	If selected, udhcpc will check some options (such as option 12 -
+	hostname) and if they don't look like valid hostnames
+	(for example, if they start with dash or contain spaces),
+	they will be replaced with string "bad" when exporting
+	to the environment.
 
 config BUSYBOX_UDHCPC_DEFAULT_SCRIPT
 	string "Absolute path to config script"
 	default "/usr/share/udhcpc/default.script"
 	depends on BUSYBOX_UDHCPC
 	help
-	  This script is called after udhcpc receives an answer. See
-	  examples/udhcp for a working example. Normally it is safe
-	  to leave this untouched.
+	This script is called after udhcpc receives an answer. See
+	examples/udhcp for a working example. Normally it is safe
+	to leave this untouched.
+
+# udhcpc6 config is inserted here:
+config BUSYBOX_UDHCPC6
+	bool "udhcpc6"
+	default n  # not yet ready
+	depends on BUSYBOX_FEATURE_IPV6
+	help
+	udhcpc6 is a DHCPv6 client
+
+config BUSYBOX_FEATURE_UDHCPC6_RFC3646
+	bool "Support RFC 3646 (DNS server and search list)"
+	default y
+	depends on BUSYBOX_UDHCPC6
+	help
+	List of DNS servers and domain search list can be requested with
+	"-O dns" and "-O search". If server gives these values,
+	they will be set in environment variables "dns" and "search".
+
+config BUSYBOX_FEATURE_UDHCPC6_RFC4704
+	bool "Support RFC 4704 (Client FQDN)"
+	default y
+	depends on BUSYBOX_UDHCPC6
+	help
+	You can request FQDN to be given by server using "-O fqdn".
+
+config BUSYBOX_FEATURE_UDHCPC6_RFC4833
+	bool "Support RFC 4833 (Timezones)"
+	default y
+	depends on BUSYBOX_UDHCPC6
+	help
+	You can request POSIX timezone with "-O tz" and timezone name
+	with "-O timezone".
+
+comment "Common options for DHCP applets"
+        depends on BUSYBOX_UDHCPD || BUSYBOX_UDHCPC || BUSYBOX_UDHCPC6 || BUSYBOX_DHCPRELAY
 
 config BUSYBOX_FEATURE_UDHCP_PORT
 	bool "Enable '-P port' option for udhcpd and udhcpc"
 	default n
-	depends on BUSYBOX_UDHCPD || BUSYBOX_UDHCPC
+	depends on BUSYBOX_UDHCPD || BUSYBOX_UDHCPC || BUSYBOX_UDHCPC6
 	help
-	  At the cost of ~300 bytes, enables -P port option.
-	  This feature is typically not needed.
+	At the cost of ~300 bytes, enables -P port option.
+	This feature is typically not needed.
 
 config BUSYBOX_UDHCP_DEBUG
-	int "Maximum verbosity level for udhcp applets (0..9)"
+	int "Maximum verbosity level (0..9)"
 	default 9
 	range 0 9
-	depends on BUSYBOX_UDHCPD || BUSYBOX_UDHCPC || BUSYBOX_DHCPRELAY
+	depends on BUSYBOX_UDHCPD || BUSYBOX_UDHCPC || BUSYBOX_UDHCPC6 || BUSYBOX_DHCPRELAY
 	help
-	  Verbosity can be increased with multiple -v options.
-	  This option controls how high it can be cranked up.
+	Verbosity can be increased with multiple -v options.
+	This option controls how high it can be cranked up.
 
-	  Bigger values result in bigger code. Levels above 1
-	  are very verbose and useful for debugging only.
+	Bigger values result in bigger code. Levels above 1
+	are very verbose and useful for debugging only.
 
-config BUSYBOX_FEATURE_UDHCP_RFC3397
-	bool "Support RFC3397 domain search (experimental)"
-	default y
+config BUSYBOX_UDHCPC_SLACK_FOR_BUGGY_SERVERS
+	int "DHCP options slack buffer size"
+	default 80
+	range 0 924
 	depends on BUSYBOX_UDHCPD || BUSYBOX_UDHCPC
 	help
-	  If selected, both client and server will support passing of domain
-	  search lists via option 119, specified in RFC 3397,
-	  and SIP servers option 120, specified in RFC 3361.
+	Some buggy DHCP servers send DHCP offer packets with option
+	field larger than we expect (which might also be considered a
+	buffer overflow attempt). These packets are normally discarded.
+	If circumstances beyond your control force you to support such
+	servers, this may help. The upper limit (924) makes udhcpc accept
+	even 1500 byte packets (maximum-sized ethernet packets).
 
-config BUSYBOX_FEATURE_UDHCP_8021Q
-	bool "Support 802.1Q VLAN parameters"
+	This option does not make udhcp[cd] emit non-standard
+	sized packets.
+
+	Known buggy DHCP servers:
+	3Com OfficeConnect Remote 812 ADSL Router:
+		seems to confuse maximum allowed UDP packet size with
+		maximum size of entire IP packet, and sends packets
+		which are 28 bytes too large.
+	Seednet (ISP) VDSL: sends packets 2 bytes too large.
+
+config BUSYBOX_FEATURE_UDHCP_RFC3397
+	bool "Support RFC 3397 domain search options"
 	default y
 	depends on BUSYBOX_UDHCPD || BUSYBOX_UDHCPC
 	help
-	  If selected, both client and server will support passing of VLAN
-	  ID and priority via options 132 and 133 as per 802.1Q.
+	If selected, both client and server will support passing of domain
+	search lists via option 119, specified in RFC 3397,
+	and SIP servers option 120, specified in RFC 3361.
 
-config BUSYBOX_UDHCPC_SLACK_FOR_BUGGY_SERVERS
-	int "DHCP options slack buffer size"
-	default 80
-	range 0 924
+config BUSYBOX_FEATURE_UDHCP_8021Q
+	bool "Support 802.1Q VLAN parameters options"
+	default y
 	depends on BUSYBOX_UDHCPD || BUSYBOX_UDHCPC
 	help
-	  Some buggy DHCP servers send DHCP offer packets with option
-	  field larger than we expect (which might also be considered a
-	  buffer overflow attempt). These packets are normally discarded.
-	  If circumstances beyond your control force you to support such
-	  servers, this may help. The upper limit (924) makes dhcpc accept
-	  even 1500 byte packets (maximum-sized ethernet packets).
-
-	  This option does not make dhcp[cd] emit non-standard
-	  sized packets.
-
-	  Known buggy DHCP servers:
-	  3Com OfficeConnect Remote 812 ADSL Router:
-	    seems to confuse maximum allowed UDP packet size with
-	    maximum size of entire IP packet, and sends packets which are
-	    28 bytes too large.
-	  Seednet (ISP) VDSL: sends packets 2 bytes too large.
+	If selected, both client and server will support passing of VLAN
+	ID and priority via options 132 and 133 as per 802.1Q.
diff --git a/config/busybox/printutils/Config.in b/config/busybox/printutils/Config.in
index 91c3e77b9..ad4f09968 100644
--- a/config/busybox/printutils/Config.in
+++ b/config/busybox/printutils/Config.in
@@ -7,20 +7,20 @@
 menu "Print Utilities"
 
 config BUSYBOX_LPD
-	bool "lpd"
+	bool "lpd (5.3 kb)"
 	default y
 	help
-	  lpd is a print spooling daemon.
+	lpd is a print spooling daemon.
 config BUSYBOX_LPR
-	bool "lpr"
+	bool "lpr (10 kb)"
 	default y
 	help
-	  lpr sends files (or standard input) to a print spooling daemon.
+	lpr sends files (or standard input) to a print spooling daemon.
 
 config BUSYBOX_LPQ
-	bool "lpq"
+	bool "lpq (10 kb)"
 	default y
 	help
-	  lpq is a print spool queue examination and manipulation program.
+	lpq is a print spool queue examination and manipulation program.
 
 endmenu
diff --git a/config/busybox/procps/Config.in b/config/busybox/procps/Config.in
index da93002bd..b5ed25906 100644
--- a/config/busybox/procps/Config.in
+++ b/config/busybox/procps/Config.in
@@ -7,143 +7,143 @@
 menu "Process Utilities"
 
 config BUSYBOX_FREE
-	bool "free"
+	bool "free (2.4 kb)"
 	default y
 	select BUSYBOX_PLATFORM_LINUX #sysinfo()
 	help
-	  free displays the total amount of free and used physical and swap
-	  memory in the system, as well as the buffers used by the kernel.
-	  The shared memory column should be ignored; it is obsolete.
+	free displays the total amount of free and used physical and swap
+	memory in the system, as well as the buffers used by the kernel.
+	The shared memory column should be ignored; it is obsolete.
 config BUSYBOX_FUSER
-	bool "fuser"
+	bool "fuser (7 kb)"
 	default y
 	help
-	  fuser lists all PIDs (Process IDs) that currently have a given
-	  file open. fuser can also list all PIDs that have a given network
-	  (TCP or UDP) port open.
+	fuser lists all PIDs (Process IDs) that currently have a given
+	file open. fuser can also list all PIDs that have a given network
+	(TCP or UDP) port open.
 config BUSYBOX_IOSTAT
-	bool "iostat"
+	bool "iostat (7.4 kb)"
 	default y
 	help
-	  Report CPU and I/O statistics
+	Report CPU and I/O statistics
 config BUSYBOX_KILL
-	bool "kill"
+	bool "kill (2.6 kb)"
 	default y
 	help
-	  The command kill sends the specified signal to the specified
-	  process or process group. If no signal is specified, the TERM
-	  signal is sent.
+	The command kill sends the specified signal to the specified
+	process or process group. If no signal is specified, the TERM
+	signal is sent.
 
 config BUSYBOX_KILLALL
-	bool "killall"
+	bool "killall (5.6 kb)"
 	default y
 	help
-	  killall sends a signal to all processes running any of the
-	  specified commands. If no signal name is specified, SIGTERM is
-	  sent.
+	killall sends a signal to all processes running any of the
+	specified commands. If no signal name is specified, SIGTERM is
+	sent.
 
 config BUSYBOX_KILLALL5
-	bool "killall5"
+	bool "killall5 (5.3 kb)"
 	default y
 	help
-	  The SystemV killall command. killall5 sends a signal
-	  to all processes except kernel threads and the processes
-	  in its own session, so it won't kill the shell that is running
-	  the script it was called from.
+	The SystemV killall command. killall5 sends a signal
+	to all processes except kernel threads and the processes
+	in its own session, so it won't kill the shell that is running
+	the script it was called from.
 config BUSYBOX_LSOF
-	bool "lsof"
+	bool "lsof (3.6 kb)"
 	default y
 	help
-	  Show open files in the format of:
-	  PID <TAB> /path/to/executable <TAB> /path/to/opened/file
+	Show open files in the format of:
+	PID <TAB> /path/to/executable <TAB> /path/to/opened/file
 config BUSYBOX_MPSTAT
-	bool "mpstat"
+	bool "mpstat (10 kb)"
 	default y
 	help
-	  Per-processor statistics
+	Per-processor statistics
 config BUSYBOX_NMETER
-	bool "nmeter"
+	bool "nmeter (10 kb)"
 	default y
 	help
-	  Prints selected system stats continuously, one line per update.
+	Prints selected system stats continuously, one line per update.
 config BUSYBOX_PGREP
-	bool "pgrep"
+	bool "pgrep (6.8 kb)"
 	default y
 	help
-	  Look for processes by name.
+	Look for processes by name.
 
 config BUSYBOX_PKILL
-	bool "pkill"
+	bool "pkill (7.6 kb)"
 	default y
 	help
-	  Send signals to processes by name.
+	Send signals to processes by name.
 config BUSYBOX_PIDOF
-	bool "pidof"
+	bool "pidof (6.6 kb)"
 	default y
 	help
-	  Pidof finds the process id's (pids) of the named programs. It prints
-	  those id's on the standard output.
+	Pidof finds the process id's (pids) of the named programs. It prints
+	those id's on the standard output.
 
 config BUSYBOX_FEATURE_PIDOF_SINGLE
 	bool "Enable single shot (-s)"
 	default y
 	depends on BUSYBOX_PIDOF
 	help
-	  Support '-s' for returning only the first pid found.
+	Support '-s' for returning only the first pid found.
 
 config BUSYBOX_FEATURE_PIDOF_OMIT
 	bool "Enable omitting pids (-o PID)"
 	default y
 	depends on BUSYBOX_PIDOF
 	help
-	  Support '-o PID' for omitting the given pid(s) 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.
+	Support '-o PID' for omitting the given pid(s) 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 BUSYBOX_PMAP
-       bool "pmap"
-       default y
-       help
-         Display processes' memory mappings.
+	bool "pmap (6 kb)"
+	default y
+	help
+	Display processes' memory mappings.
 config BUSYBOX_POWERTOP
-	bool "powertop"
+	bool "powertop (9.1 kb)"
 	default y
 	help
-	  Analyze power consumption on Intel-based laptops
+	Analyze power consumption on Intel-based laptops
 
 config BUSYBOX_FEATURE_POWERTOP_INTERACTIVE
 	bool "Accept keyboard commands"
 	default y
 	depends on BUSYBOX_POWERTOP
 	help
-	  Without this, powertop will only refresh display every 10 seconds.
-	  No keyboard commands will work, only ^C to terminate.
+	Without this, powertop will only refresh display every 10 seconds.
+	No keyboard commands will work, only ^C to terminate.
 config BUSYBOX_PS
-	bool "ps"
+	bool "ps (11 kb)"
 	default y
 	help
-	  ps gives a snapshot of the current processes.
+	ps gives a snapshot of the current processes.
 
 config BUSYBOX_FEATURE_PS_WIDE
-	bool "Enable wide output option (-w)"
+	bool "Enable wide output (-w)"
 	default y
-	depends on BUSYBOX_PS && !BUSYBOX_DESKTOP
+	depends on (BUSYBOX_PS || BUSYBOX_MINIPS) && !BUSYBOX_DESKTOP
 	help
-	  Support argument 'w' for wide output.
-	  If given once, 132 chars are printed, and if given more
-	  than once, the length is unlimited.
+	Support argument 'w' for wide output.
+	If given once, 132 chars are printed, and if given more
+	than once, the length is unlimited.
 
 config BUSYBOX_FEATURE_PS_LONG
-	bool "Enable long output option (-l)"
+	bool "Enable long output (-l)"
 	default y
-	depends on BUSYBOX_PS && !BUSYBOX_DESKTOP
+	depends on (BUSYBOX_PS || BUSYBOX_MINIPS) && !BUSYBOX_DESKTOP
 	help
-	  Support argument 'l' for long output.
-	  Adds fields PPID, RSS, START, TIME & TTY
+	Support argument 'l' for long output.
+	Adds fields PPID, RSS, START, TIME & TTY
 
 config BUSYBOX_FEATURE_PS_TIME
-	bool "Support -o time and -o etime output specifiers"
+	bool "Enable -o time and -o etime specifiers"
 	default y
-	depends on BUSYBOX_PS && BUSYBOX_DESKTOP
+	depends on (BUSYBOX_PS || BUSYBOX_MINIPS) && BUSYBOX_DESKTOP
 	select BUSYBOX_PLATFORM_LINUX
 
 config BUSYBOX_FEATURE_PS_UNUSUAL_SYSTEMS
@@ -151,123 +151,123 @@ config BUSYBOX_FEATURE_PS_UNUSUAL_SYSTEMS
 	default n
 	depends on BUSYBOX_FEATURE_PS_TIME
 	help
-	  Include support for measuring HZ on old kernels and non-ELF systems
-	  (if you are on Linux 2.4.0+ and use ELF, you don't need this)
+	Include support for measuring HZ on old kernels and non-ELF systems
+	(if you are on Linux 2.4.0+ and use ELF, you don't need this)
 
 config BUSYBOX_FEATURE_PS_ADDITIONAL_COLUMNS
-	bool "Support -o rgroup, -o ruser, -o nice specifiers"
+	bool "Enable -o rgroup, -o ruser, -o nice specifiers"
 	default y
-	depends on BUSYBOX_PS && BUSYBOX_DESKTOP
+	depends on (BUSYBOX_PS || BUSYBOX_MINIPS) && BUSYBOX_DESKTOP
 config BUSYBOX_PSTREE
-	bool "pstree"
+	bool "pstree (9.4 kb)"
 	default y
 	help
-	  Display a tree of processes.
+	Display a tree of processes.
 config BUSYBOX_PWDX
-	bool "pwdx"
+	bool "pwdx (3.5 kb)"
 	default y
 	help
-	  Report current working directory of a process
+	Report current working directory of a process
 config BUSYBOX_SMEMCAP
-	bool "smemcap"
+	bool "smemcap (2.5 kb)"
 	default y
 	help
-	  smemcap is a tool for capturing process data for smem,
-	  a memory usage statistic tool.
+	smemcap is a tool for capturing process data for smem,
+	a memory usage statistic tool.
 config BUSYBOX_BB_SYSCTL
-	bool "sysctl"
+	bool "sysctl (6.9 kb)"
 	default y
 	help
-	  Configure kernel parameters at runtime.
+	Configure kernel parameters at runtime.
 config BUSYBOX_TOP
-	bool "top"
+	bool "top (17 kb)"
 	default y
 	help
-	  The top program provides a dynamic real-time view of a running
-	  system.
+	The top program provides a dynamic real-time view of a running
+	system.
 
 config BUSYBOX_FEATURE_TOP_INTERACTIVE
 	bool "Accept keyboard commands"
 	default y
 	depends on BUSYBOX_TOP
 	help
-	  Without this, top will only refresh display every 5 seconds.
-	  No keyboard commands will work, only ^C to terminate.
+	Without this, top will only refresh display every 5 seconds.
+	No keyboard commands will work, only ^C to terminate.
 
 config BUSYBOX_FEATURE_TOP_CPU_USAGE_PERCENTAGE
 	bool "Show CPU per-process usage percentage"
 	default y
 	depends on BUSYBOX_TOP
 	help
-	  Make top display CPU usage for each process.
-	  This adds about 2k.
+	Make top display CPU usage for each process.
+	This adds about 2k.
 
 config BUSYBOX_FEATURE_TOP_CPU_GLOBAL_PERCENTS
 	bool "Show CPU global usage percentage"
 	default y
 	depends on BUSYBOX_FEATURE_TOP_CPU_USAGE_PERCENTAGE
 	help
-	  Makes top display "CPU: NN% usr NN% sys..." line.
-	  This adds about 0.5k.
+	Makes top display "CPU: NN% usr NN% sys..." line.
+	This adds about 0.5k.
 
 config BUSYBOX_FEATURE_TOP_SMP_CPU
 	bool "SMP CPU usage display ('c' key)"
 	default y
 	depends on BUSYBOX_FEATURE_TOP_CPU_GLOBAL_PERCENTS
 	help
-	  Allow 'c' key to switch between individual/cumulative CPU stats
-	  This adds about 0.5k.
+	Allow 'c' key to switch between individual/cumulative CPU stats
+	This adds about 0.5k.
 
 config BUSYBOX_FEATURE_TOP_DECIMALS
 	bool "Show 1/10th of a percent in CPU/mem statistics"
 	default y
 	depends on BUSYBOX_FEATURE_TOP_CPU_USAGE_PERCENTAGE
 	help
-	  Show 1/10th of a percent in CPU/mem statistics.
-	  This adds about 0.3k.
+	Show 1/10th of a percent in CPU/mem statistics.
+	This adds about 0.3k.
 
 config BUSYBOX_FEATURE_TOP_SMP_PROCESS
 	bool "Show CPU process runs on ('j' field)"
 	default y
 	depends on BUSYBOX_TOP
 	help
-	  Show CPU where process was last found running on.
-	  This is the 'j' field.
+	Show CPU where process was last found running on.
+	This is the 'j' field.
 
 config BUSYBOX_FEATURE_TOPMEM
 	bool "Topmem command ('s' key)"
 	default y
 	depends on BUSYBOX_TOP
 	help
-	  Enable 's' in top (gives lots of memory info).
+	Enable 's' in top (gives lots of memory info).
 config BUSYBOX_UPTIME
-	bool "uptime"
+	bool "uptime (632 bytes)"
 	default y
 	select BUSYBOX_PLATFORM_LINUX #sysinfo()
 	help
-	  uptime gives a one line display of the current time, how long
-	  the system has been running, how many users are currently logged
-	  on, and the system load averages for the past 1, 5, and 15 minutes.
+	uptime gives a one line display of the current time, how long
+	the system has been running, how many users are currently logged
+	on, and the system load averages for the past 1, 5, and 15 minutes.
 
 config BUSYBOX_FEATURE_UPTIME_UTMP_SUPPORT
 	bool "Show the number of users"
 	default y
 	depends on BUSYBOX_UPTIME && BUSYBOX_FEATURE_UTMP
 	help
-	  Display the number of users currently logged on.
+	Display the number of users currently logged on.
 config BUSYBOX_WATCH
-	bool "watch"
+	bool "watch (4.1 kb)"
 	default y
 	help
-	  watch is used to execute a program periodically, showing
-	  output to the screen.
+	watch is used to execute a program periodically, showing
+	output to the screen.
 
 config BUSYBOX_FEATURE_SHOW_THREADS
 	bool "Support thread display in ps/pstree/top"
 	default y
 	depends on BUSYBOX_PS || BUSYBOX_TOP || BUSYBOX_PSTREE
 	help
-	  Enables the ps -T option, showing of threads in pstree,
-	  and 'h' command in top.
+	Enables the ps -T option, showing of threads in pstree,
+	and 'h' command in top.
 
 endmenu
diff --git a/config/busybox/runit/Config.in b/config/busybox/runit/Config.in
index d3bebfd34..23eeea141 100644
--- a/config/busybox/runit/Config.in
+++ b/config/busybox/runit/Config.in
@@ -7,85 +7,85 @@
 menu "Runit Utilities"
 
 config BUSYBOX_CHPST
-	bool "chpst"
+	bool "chpst (8.7 kb)"
 	default y
 	help
-	  chpst changes the process state according to the given options, and
-	  execs specified program.
+	chpst changes the process state according to the given options, and
+	execs specified program.
 
 config BUSYBOX_SETUIDGID
-	bool "setuidgid"
+	bool "setuidgid (4.2 kb)"
 	default y
 	help
-	  Sets soft resource limits as specified by options
+	Sets soft resource limits as specified by options
 
 config BUSYBOX_ENVUIDGID
-	bool "envuidgid"
+	bool "envuidgid (3.6 kb)"
 	default y
 	help
-	  Sets $UID to account's uid and $GID to account's gid
+	Sets $UID to account's uid and $GID to account's gid
 
 config BUSYBOX_ENVDIR
-	bool "envdir"
+	bool "envdir (2.5 kb)"
 	default y
 	help
-	  Sets various environment variables as specified by files
-	  in the given directory
+	Sets various environment variables as specified by files
+	in the given directory
 
 config BUSYBOX_SOFTLIMIT
-	bool "softlimit"
+	bool "softlimit (4.3 kb)"
 	default y
 	help
-	  Sets soft resource limits as specified by options
+	Sets soft resource limits as specified by options
 config BUSYBOX_RUNSV
-	bool "runsv"
+	bool "runsv (7.2 kb)"
 	default y
 	help
-	  runsv starts and monitors a service and optionally an appendant log
-	  service.
+	runsv starts and monitors a service and optionally an appendant log
+	service.
 config BUSYBOX_RUNSVDIR
-	bool "runsvdir"
+	bool "runsvdir (6 kb)"
 	default y
 	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.
+	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 BUSYBOX_FEATURE_RUNSVDIR_LOG
 	bool "Enable scrolling argument log"
 	depends on BUSYBOX_RUNSVDIR
 	default n
 	help
-	  Enable feature where second parameter of runsvdir holds last error
-	  message (viewable via top/ps). Otherwise (feature is off
-	  or no parameter), error messages go to stderr only.
+	Enable feature where second parameter of runsvdir holds last error
+	message (viewable via top/ps). Otherwise (feature is off
+	or no parameter), error messages go to stderr only.
 config BUSYBOX_SV
-	bool "sv"
+	bool "sv (7.8 kb)"
 	default y
 	help
-	  sv reports the current status and controls the state of services
-	  monitored by the runsv supervisor.
+	sv reports the current status and controls the state of services
+	monitored by the runsv supervisor.
 
 config BUSYBOX_SV_DEFAULT_SERVICE_DIR
 	string "Default directory for services"
 	default "/var/service"
 	depends on BUSYBOX_SV
 	help
-	  Default directory for services.
-	  Defaults to "/var/service"
+	Default directory for services.
+	Defaults to "/var/service"
 
 config BUSYBOX_SVC
-	bool "svc"
+	bool "svc (7.8 kb)"
 	default y
 	help
-	  svc controls the state of services monitored by the runsv supervisor.
-	  It is comaptible with daemontools command with the same name.
+	svc controls the state of services monitored by the runsv supervisor.
+	It is comaptible with daemontools command with the same name.
 config BUSYBOX_SVLOGD
-	bool "svlogd"
+	bool "svlogd (15 kb)"
 	default y
 	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.
+	svlogd continuously reads log data from its standard input, optionally
+	filters log messages, and writes the data to one or more automatically
+	rotated logs.
 
 endmenu
diff --git a/config/busybox/selinux/Config.in b/config/busybox/selinux/Config.in
index 9f062a3ed..17b34d25f 100644
--- a/config/busybox/selinux/Config.in
+++ b/config/busybox/selinux/Config.in
@@ -8,102 +8,92 @@ menu "SELinux Utilities"
 	depends on BUSYBOX_SELINUX
 
 config BUSYBOX_CHCON
-	bool "chcon"
+	bool "chcon (8.9 kb)"
 	default n
 	depends on BUSYBOX_SELINUX
 	help
-	  Enable support to change the security context of file.
-
-config BUSYBOX_FEATURE_CHCON_LONG_OPTIONS
-	bool "Enable long options"
-	default y
-	depends on BUSYBOX_CHCON && BUSYBOX_LONG_OPTS
+	Enable support to change the security context of file.
 config BUSYBOX_GETENFORCE
-	bool "getenforce"
+	bool "getenforce (1.7 kb)"
 	default n
 	depends on BUSYBOX_SELINUX
 	help
-	  Enable support to get the current mode of SELinux.
+	Enable support to get the current mode of SELinux.
 config BUSYBOX_GETSEBOOL
-	bool "getsebool"
+	bool "getsebool (5.5 kb)"
 	default n
 	depends on BUSYBOX_SELINUX
 	help
-	  Enable support to get SELinux boolean values.
+	Enable support to get SELinux boolean values.
 config BUSYBOX_LOAD_POLICY
-	bool "load_policy"
+	bool "load_policy (1.6 kb)"
 	default n
 	depends on BUSYBOX_SELINUX
 	help
-	  Enable support to load SELinux policy.
+	Enable support to load SELinux policy.
 config BUSYBOX_MATCHPATHCON
-	bool "matchpathcon"
+	bool "matchpathcon (6.1 kb)"
 	default n
 	depends on BUSYBOX_SELINUX
 	help
-	  Enable support to get default security context of the
-	  specified path from the file contexts configuration.
+	Enable support to get default security context of the
+	specified path from the file contexts configuration.
 config BUSYBOX_RUNCON
-	bool "runcon"
+	bool "runcon (6.6 kb)"
 	default n
 	depends on BUSYBOX_SELINUX
 	help
-	  Enable support to run command in specified security context.
-
-config BUSYBOX_FEATURE_RUNCON_LONG_OPTIONS
-	bool "Enable long options"
-	default y
-	depends on BUSYBOX_RUNCON && BUSYBOX_LONG_OPTS
+	Enable support to run command in specified security context.
 config BUSYBOX_SELINUXENABLED
-	bool "selinuxenabled"
+	bool "selinuxenabled (321 bytes)"
 	default n
 	depends on BUSYBOX_SELINUX
 	help
-	  Enable support for this command to be used within shell scripts
-	  to determine if selinux is enabled.
+	Enable support for this command to be used within shell scripts
+	to determine if selinux is enabled.
 config BUSYBOX_SESTATUS
-	bool "sestatus"
+	bool "sestatus (12 kb)"
 	default n
 	depends on BUSYBOX_SELINUX
 	help
-	  Displays the status of SELinux.
+	Displays the status of SELinux.
 config BUSYBOX_SETENFORCE
-	bool "setenforce"
+	bool "setenforce (2.1 kb)"
 	default n
 	depends on BUSYBOX_SELINUX
 	help
-	  Enable support to modify the mode SELinux is running in.
+	Enable support to modify the mode SELinux is running in.
 config BUSYBOX_SETFILES
-	bool "setfiles"
+	bool "setfiles (13 kb)"
 	default n
 	depends on BUSYBOX_SELINUX
 	help
-	  Enable support to modify to relabel files.
-	  Notice: If you built libselinux with -D_FILE_OFFSET_BITS=64,
-	  (It is default in libselinux's Makefile), you _must_ enable
-	  CONFIG_LFS.
+	Enable support to modify to relabel files.
+	Notice: If you built libselinux with -D_FILE_OFFSET_BITS=64,
+	(It is default in libselinux's Makefile), you _must_ enable
+	CONFIG_LFS.
 
 config BUSYBOX_FEATURE_SETFILES_CHECK_OPTION
 	bool "Enable check option"
 	default n
 	depends on BUSYBOX_SETFILES
 	help
-	  Support "-c" option (check the validity of the contexts against
-	  the specified binary policy) for setfiles. Requires libsepol.
+	Support "-c" option (check the validity of the contexts against
+	the specified binary policy) for setfiles. Requires libsepol.
 
 config BUSYBOX_RESTORECON
-	bool "restorecon"
+	bool "restorecon (12 kb)"
 	default n
 	depends on BUSYBOX_SELINUX
 	help
-	  Enable support to relabel files. The feature is almost
-	  the same as setfiles, but usage is a little different.
+	Enable support to relabel files. The feature is almost
+	the same as setfiles, but usage is a little different.
 config BUSYBOX_SETSEBOOL
-	bool "setsebool"
+	bool "setsebool (1.7 kb)"
 	default n
 	depends on BUSYBOX_SELINUX
 	help
-	  Enable support for change boolean.
-	  semanage and -P option is not supported yet.
+	Enable support for change boolean.
+	semanage and -P option is not supported yet.
 
 endmenu
diff --git a/config/busybox/shell/Config.in b/config/busybox/shell/Config.in
index 201dcfeec..f89db4299 100644
--- a/config/busybox/shell/Config.in
+++ b/config/busybox/shell/Config.in
@@ -11,26 +11,26 @@ choice
 	prompt "Choose which shell is aliased to 'sh' name"
 	default BUSYBOX_SH_IS_ASH
 	help
-	  Choose which shell you want to be executed by 'sh' alias.
-	  The ash shell is the most bash compatible and full featured one.
+	Choose which shell you want to be executed by 'sh' alias.
+	The ash shell is the most bash compatible and full featured one.
 
 # note: cannot use "select ASH" here, it breaks "make allnoconfig"
 config BUSYBOX_SH_IS_ASH
 	depends on !BUSYBOX_NOMMU
 	bool "ash"
 	help
-	  Choose ash to be the shell executed by 'sh' name.
-	  The ash code will be built into busybox. If you don't select
-	  "ash" choice (CONFIG_ASH), this shell may only be invoked by
-	  the name 'sh' (and not 'ash').
+	Choose ash to be the shell executed by 'sh' name.
+	The ash code will be built into busybox. If you don't select
+	"ash" choice (CONFIG_ASH), this shell may only be invoked by
+	the name 'sh' (and not 'ash').
 
 config BUSYBOX_SH_IS_HUSH
 	bool "hush"
 	help
-	  Choose hush to be the shell executed by 'sh' name.
-	  The hush code will be built into busybox. If you don't select
-	  "hush" choice (CONFIG_HUSH), this shell may only be invoked by
-	  the name 'sh' (and not 'hush').
+	Choose hush to be the shell executed by 'sh' name.
+	The hush code will be built into busybox. If you don't select
+	"hush" choice (CONFIG_HUSH), this shell may only be invoked by
+	the name 'sh' (and not 'hush').
 
 config BUSYBOX_SH_IS_NONE
 	bool "none"
@@ -41,36 +41,36 @@ choice
 	prompt "Choose which shell is aliased to 'bash' name"
 	default BUSYBOX_BASH_IS_NONE
 	help
-	  Choose which shell you want to be executed by 'bash' alias.
-	  The ash shell is the most bash compatible and full featured one,
-	  although compatibility is far from being complete.
+	Choose which shell you want to be executed by 'bash' alias.
+	The ash shell is the most bash compatible and full featured one,
+	although compatibility is far from being complete.
 
-	  Note that selecting this option does not switch on any bash
-	  compatibility code. It merely makes it possible to install
-	  /bin/bash (sym)link and run scripts which start with
-	  #!/bin/bash line.
+	Note that selecting this option does not switch on any bash
+	compatibility code. It merely makes it possible to install
+	/bin/bash (sym)link and run scripts which start with
+	#!/bin/bash line.
 
-	  Many systems use it in scripts which use bash-specific features,
-	  even simple ones like $RANDOM. Without this option, busybox
-	  can't be used for running them because it won't recongnize
-	  "bash" as a supported applet name.
+	Many systems use it in scripts which use bash-specific features,
+	even simple ones like $RANDOM. Without this option, busybox
+	can't be used for running them because it won't recongnize
+	"bash" as a supported applet name.
 
 config BUSYBOX_BASH_IS_ASH
 	depends on !BUSYBOX_NOMMU
 	bool "ash"
 	help
-	  Choose ash to be the shell executed by 'bash' name.
-	  The ash code will be built into busybox. If you don't select
-	  "ash" choice (CONFIG_ASH), this shell may only be invoked by
-	  the name 'bash' (and not 'ash').
+	Choose ash to be the shell executed by 'bash' name.
+	The ash code will be built into busybox. If you don't select
+	"ash" choice (CONFIG_ASH), this shell may only be invoked by
+	the name 'bash' (and not 'ash').
 
 config BUSYBOX_BASH_IS_HUSH
 	bool "hush"
 	help
-	  Choose hush to be the shell executed by 'bash' name.
-	  The hush code will be built into busybox. If you don't select
-	  "hush" choice (CONFIG_HUSH), this shell may only be invoked by
-	  the name 'bash' (and not 'hush').
+	Choose hush to be the shell executed by 'bash' name.
+	The hush code will be built into busybox. If you don't select
+	"hush" choice (CONFIG_HUSH), this shell may only be invoked by
+	the name 'bash' (and not 'hush').
 
 config BUSYBOX_BASH_IS_NONE
 	bool "none"
@@ -79,15 +79,14 @@ endchoice
 
 
 config BUSYBOX_ASH
-	bool "ash"
+	bool "ash (77 kb)"
 	default y
 	depends on !BUSYBOX_NOMMU
 	help
-	  Tha 'ash' shell adds about 60k in the default configuration and is
-	  the most complete and most pedantically correct shell included with
-	  busybox. This shell is actually a derivative of the Debian 'dash'
-	  shell (by Herbert Xu), which was created by porting the 'ash' shell
-	  (written by Kenneth Almquist) from NetBSD.
+	The most complete and most pedantically correct shell included with
+	busybox. This shell is actually a derivative of the Debian 'dash'
+	shell (by Herbert Xu), which was created by porting the 'ash' shell
+	(written by Kenneth Almquist) from NetBSD.
 
 # ash options
 # note: Don't remove !NOMMU part in the next line; it would break
@@ -104,11 +103,11 @@ config BUSYBOX_ASH_INTERNAL_GLOB
 	default y	# Y is bigger, but because of uclibc glob() bug, let Y be default for now
 	depends on BUSYBOX_ASH || BUSYBOX_SH_IS_ASH || BUSYBOX_BASH_IS_ASH
 	help
-	  Do not use glob() function from libc, use internal implementation.
-	  Use this if you are getting "glob.h: No such file or directory"
-	  or similar build errors.
-	  Note that as of now (2017-01), uclibc and musl glob() both have bugs
-	  which would break ash if you select N here.
+	Do not use glob() function from libc, use internal implementation.
+	Use this if you are getting "glob.h: No such file or directory"
+	or similar build errors.
+	Note that as of now (2017-01), uclibc and musl glob() both have bugs
+	which would break ash if you select N here.
 
 config BUSYBOX_ASH_BASH_COMPAT
 	bool "bash-compatible extensions"
@@ -130,37 +129,37 @@ config BUSYBOX_ASH_RANDOM_SUPPORT
 	default y
 	depends on BUSYBOX_ASH || BUSYBOX_SH_IS_ASH || BUSYBOX_BASH_IS_ASH
 	help
-	  Enable pseudorandom generator and dynamic variable "$RANDOM".
-	  Each read of "$RANDOM" will generate a new pseudorandom value.
-	  You can reset the generator by using a specified start value.
-	  After "unset RANDOM" the generator will switch off and this
-	  variable will no longer have special treatment.
+	Enable pseudorandom generator and dynamic variable "$RANDOM".
+	Each read of "$RANDOM" will generate a new pseudorandom value.
+	You can reset the generator by using a specified start value.
+	After "unset RANDOM" the generator will switch off and this
+	variable will no longer have special treatment.
 
 config BUSYBOX_ASH_EXPAND_PRMT
 	bool "Expand prompt string"
 	default y
 	depends on BUSYBOX_ASH || BUSYBOX_SH_IS_ASH || BUSYBOX_BASH_IS_ASH
 	help
-	  $PS# may contain volatile content, such as backquote commands.
-	  This option recreates the prompt string from the environment
-	  variable each time it is displayed.
+	$PS# may contain volatile content, such as backquote commands.
+	This option recreates the prompt string from the environment
+	variable each time it is displayed.
 
 config BUSYBOX_ASH_IDLE_TIMEOUT
 	bool "Idle timeout variable $TMOUT"
 	default y
 	depends on BUSYBOX_ASH || BUSYBOX_SH_IS_ASH || BUSYBOX_BASH_IS_ASH
 	help
-	  Enable bash-like auto-logout after $TMOUT seconds of idle time.
+	Enable bash-like auto-logout after $TMOUT seconds of idle time.
 
 config BUSYBOX_ASH_MAIL
 	bool "Check for new mail in interactive shell"
 	default y
 	depends on BUSYBOX_ASH || BUSYBOX_SH_IS_ASH || BUSYBOX_BASH_IS_ASH
 	help
-	  Enable "check for new mail" function:
-	  if set, $BUSYBOX_MAIL file and $BUSYBOX_MAILPATH list of files
-	  are checked for mtime changes, and "you have mail"
-	  message is printed if change is detected.
+	Enable "check for new mail" function:
+	if set, $BUSYBOX_MAIL file and $BUSYBOX_MAILPATH list of files
+	are checked for mtime changes, and "you have mail"
+	message is printed if change is detected.
 
 config BUSYBOX_ASH_ECHO
 	bool "echo builtin"
@@ -192,67 +191,67 @@ config BUSYBOX_ASH_CMDCMD
 	default y
 	depends on BUSYBOX_ASH || BUSYBOX_SH_IS_ASH || BUSYBOX_BASH_IS_ASH
 	help
-	  Enable support for the 'command' builtin, which allows
-	  you to run the specified command or builtin,
-	  even when there is a function with the same name.
+	Enable support for the 'command' builtin, which allows
+	you to run the specified command or builtin,
+	even when there is a function with the same name.
 
 endif # ash options
 config BUSYBOX_CTTYHACK
-	bool "cttyhack"
+	bool "cttyhack (2.5 kb)"
 	default y
 	help
-	  One common problem reported on the mailing list is the "can't
-	  access tty; job control turned off" error message, which typically
-	  appears when one tries to use a shell with stdin/stdout on
-	  /dev/console.
-	  This device is special - it cannot be a controlling tty.
+	One common problem reported on the mailing list is the "can't
+	access tty; job control turned off" error message, which typically
+	appears when one tries to use a shell with stdin/stdout on
+	/dev/console.
+	This device is special - it cannot be a controlling tty.
 
-	  The proper solution is to use the correct device instead of
-	  /dev/console.
+	The proper solution is to use the correct device instead of
+	/dev/console.
 
-	  cttyhack provides a "quick and dirty" solution to this problem.
-	  It analyzes stdin with various ioctls, trying to determine whether
-	  it is a /dev/ttyN or /dev/ttySN (virtual terminal or serial line).
-	  On Linux it also checks sysfs for a pointer to the active console.
-	  If cttyhack is able to find the real console device, it closes
-	  stdin/out/err and reopens that device.
-	  Then it executes the given program. Opening the device will make
-	  that device a controlling tty. This may require cttyhack
-	  to be a session leader.
+	cttyhack provides a "quick and dirty" solution to this problem.
+	It analyzes stdin with various ioctls, trying to determine whether
+	it is a /dev/ttyN or /dev/ttySN (virtual terminal or serial line).
+	On Linux it also checks sysfs for a pointer to the active console.
+	If cttyhack is able to find the real console device, it closes
+	stdin/out/err and reopens that device.
+	Then it executes the given program. Opening the device will make
+	that device a controlling tty. This may require cttyhack
+	to be a session leader.
 
-	  Example for /etc/inittab (for busybox init):
+	Example for /etc/inittab (for busybox init):
 
-	  ::respawn:/bin/cttyhack /bin/sh
+	::respawn:/bin/cttyhack /bin/sh
 
-	  Starting an interactive shell from boot shell script:
+	Starting an interactive shell from boot shell script:
 
-	  setsid cttyhack sh
+	setsid cttyhack sh
 
-	  Giving controlling tty to shell running with PID 1:
+	Giving controlling tty to shell running with PID 1:
 
-	  # exec cttyhack sh
+	# exec cttyhack sh
 
-	  Without cttyhack, you need to know exact tty name,
-	  and do something like this:
+	Without cttyhack, you need to know exact tty name,
+	and do something like this:
 
-	  # exec setsid sh -c 'exec sh </dev/tty1 >/dev/tty1 2>&1'
+	# exec setsid sh -c 'exec sh </dev/tty1 >/dev/tty1 2>&1'
 
-	  Starting getty on a controlling tty from a shell script:
+	Starting getty on a controlling tty from a shell script:
 
-	  # getty 115200 $(cttyhack)
+	# getty 115200 $(cttyhack)
 config BUSYBOX_HUSH
-	bool "hush"
+	bool "hush (64 kb)"
 	default y
 	help
-	  hush is a small shell (25k). It handles the normal flow control
-	  constructs such as if/then/elif/else/fi, for/in/do/done, while loops,
-	  case/esac. Redirections, here documents, $((arithmetic))
-	  and functions are supported.
+	hush is a small shell. It handles the normal flow control
+	constructs such as if/then/elif/else/fi, for/in/do/done, while loops,
+	case/esac. Redirections, here documents, $((arithmetic))
+	and functions are supported.
 
-	  It will compile and work on no-mmu systems.
+	It will compile and work on no-mmu systems.
 
-	  It does not handle select, aliases, tilde expansion,
-	  &>file and >&file redirection of stdout+stderr.
+	It does not handle select, aliases, tilde expansion,
+	&>file and >&file redirection of stdout+stderr.
 
 config BUSYBOX_HUSH_BASH_COMPAT
 	bool "bash-compatible extensions"
@@ -264,17 +263,17 @@ config BUSYBOX_HUSH_BRACE_EXPANSION
 	default y
 	depends on BUSYBOX_HUSH_BASH_COMPAT
 	help
-	  Enable {abc,def} extension.
+	Enable {abc,def} extension.
 
 config BUSYBOX_HUSH_INTERACTIVE
 	bool "Interactive mode"
 	default y
 	depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
 	help
-	  Enable interactive mode (prompt and command editing).
-	  Without this, hush simply reads and executes commands
-	  from stdin just like a shell script from a file.
-	  No prompt, no PS1/PS2 magic shell variables.
+	Enable interactive mode (prompt and command editing).
+	Without this, hush simply reads and executes commands
+	from stdin just like a shell script from a file.
+	No prompt, no PS1/PS2 magic shell variables.
 
 config BUSYBOX_HUSH_SAVEHISTORY
 	bool "Save command history to .hush_history"
@@ -286,18 +285,18 @@ config BUSYBOX_HUSH_JOB
 	default y
 	depends on BUSYBOX_HUSH_INTERACTIVE
 	help
-	  Enable job control: Ctrl-Z backgrounds, Ctrl-C interrupts current
-	  command (not entire shell), fg/bg builtins work. Without this option,
-	  "cmd &" still works by simply spawning a process and immediately
-	  prompting for next command (or executing next command in a script),
-	  but no separate process group is formed.
+	Enable job control: Ctrl-Z backgrounds, Ctrl-C interrupts current
+	command (not entire shell), fg/bg builtins work. Without this option,
+	"cmd &" still works by simply spawning a process and immediately
+	prompting for next command (or executing next command in a script),
+	but no separate process group is formed.
 
 config BUSYBOX_HUSH_TICK
 	bool "Support process substitution"
 	default y
 	depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
 	help
-	  Enable `command` and $(command).
+	Enable `command` and $(command).
 
 config BUSYBOX_HUSH_IF
 	bool "Support if/then/elif/else/fi"
@@ -314,37 +313,37 @@ config BUSYBOX_HUSH_CASE
 	default y
 	depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
 	help
-	  Enable case ... esac statement. +400 bytes.
+	Enable case ... esac statement. +400 bytes.
 
 config BUSYBOX_HUSH_FUNCTIONS
 	bool "Support funcname() { commands; } syntax"
 	default y
 	depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
 	help
-	  Enable support for shell functions. +800 bytes.
+	Enable support for shell functions. +800 bytes.
 
 config BUSYBOX_HUSH_LOCAL
 	bool "local builtin"
 	default y
 	depends on BUSYBOX_HUSH_FUNCTIONS
 	help
-	  Enable support for local variables in functions.
+	Enable support for local variables in functions.
 
 config BUSYBOX_HUSH_RANDOM_SUPPORT
 	bool "Pseudorandom generator and $RANDOM variable"
 	default y
 	depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
 	help
-	  Enable pseudorandom generator and dynamic variable "$RANDOM".
-	  Each read of "$RANDOM" will generate a new pseudorandom value.
+	Enable pseudorandom generator and dynamic variable "$RANDOM".
+	Each read of "$RANDOM" will generate a new pseudorandom value.
 
 config BUSYBOX_HUSH_MODE_X
 	bool "Support 'hush -x' option and 'set -x' command"
 	default y
 	depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
 	help
-	  This instructs hush to print commands before execution.
-	  Adds ~300 bytes.
+	This instructs hush to print commands before execution.
+	Adds ~300 bytes.
 
 config BUSYBOX_HUSH_ECHO
 	bool "echo builtin"
@@ -376,7 +375,14 @@ config BUSYBOX_HUSH_EXPORT_N
 	default y
 	depends on BUSYBOX_HUSH_EXPORT
 	help
-	  export -n unexports variables. It is a bash extension.
+	export -n unexports variables. It is a bash extension.
+
+config BUSYBOX_HUSH_READONLY
+	bool "readonly builtin"
+	default y
+	depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
+	help
+	Enable support for read-only variables.
 
 config BUSYBOX_HUSH_KILL
 	bool "kill builtin (supports kill %jobspec)"
@@ -398,6 +404,11 @@ config BUSYBOX_HUSH_TYPE
 	default y
 	depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
 
+config BUSYBOX_HUSH_TIMES
+	bool "times builtin"
+	default y
+	depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
+
 config BUSYBOX_HUSH_READ
 	bool "read builtin"
 	default y
@@ -423,18 +434,16 @@ config BUSYBOX_HUSH_UMASK
 	default y
 	depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
 
+config BUSYBOX_HUSH_GETOPTS
+	bool "getopts builtin"
+	default y
+	depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
+
 config BUSYBOX_HUSH_MEMLEAK
 	bool "memleak builtin (debugging)"
 	default n
 	depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
 
-config BUSYBOX_MSH
-	bool "msh (deprecated: aliased to hush)"
-	default n
-	select BUSYBOX_HUSH
-	help
-	  msh is deprecated and will be removed, please migrate to hush.
-
 
 comment "Options common to all shells"
 if BUSYBOX_ASH || BUSYBOX_HUSH || BUSYBOX_SH_IS_ASH || BUSYBOX_BASH_IS_ASH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
@@ -444,71 +453,78 @@ config BUSYBOX_FEATURE_SH_MATH
 	default y
 	depends on BUSYBOX_ASH || BUSYBOX_HUSH || BUSYBOX_SH_IS_ASH || BUSYBOX_BASH_IS_ASH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
 	help
-	  Enable math support in the shell via $((...)) syntax.
+	Enable math support in the shell via $((...)) syntax.
 
 config BUSYBOX_FEATURE_SH_MATH_64
 	bool "Extend POSIX math support to 64 bit"
 	default y
 	depends on BUSYBOX_FEATURE_SH_MATH
 	help
-	  Enable 64-bit math support in the shell. This will make the shell
-	  slightly larger, but will allow computation with very large numbers.
-	  This is not in POSIX, so do not rely on this in portable code.
+	Enable 64-bit math support in the shell. This will make the shell
+	slightly larger, but will allow computation with very large numbers.
+	This is not in POSIX, so do not rely on this in portable code.
 
 config BUSYBOX_FEATURE_SH_EXTRA_QUIET
 	bool "Hide message on interactive shell startup"
 	default y
 	depends on BUSYBOX_ASH || BUSYBOX_HUSH || BUSYBOX_SH_IS_ASH || BUSYBOX_BASH_IS_ASH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
 	help
-	  Remove the busybox introduction when starting a shell.
+	Remove the busybox introduction when starting a shell.
 
 config BUSYBOX_FEATURE_SH_STANDALONE
 	bool "Standalone shell"
 	default n
 	depends on BUSYBOX_ASH || BUSYBOX_HUSH || BUSYBOX_SH_IS_ASH || BUSYBOX_BASH_IS_ASH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
 	help
-	  This option causes busybox shells to use busybox applets
-	  in preference to executables in the PATH whenever possible. For
-	  example, entering the command 'ifconfig' into the shell would cause
-	  busybox to use the ifconfig busybox applet. Specifying the fully
-	  qualified executable name, such as '/sbin/ifconfig' will still
-	  execute the /sbin/ifconfig executable on the filesystem. This option
-	  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.
+	This option causes busybox shells to use busybox applets
+	in preference to executables in the PATH whenever possible. For
+	example, entering the command 'ifconfig' into the shell would cause
+	busybox to use the ifconfig busybox applet. Specifying the fully
+	qualified executable name, such as '/sbin/ifconfig' will still
+	execute the /sbin/ifconfig executable on the filesystem. This option
+	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.
 
-	  This is implemented by re-execing /proc/self/exe (typically)
-	  with right parameters.
+	This is implemented by re-execing /proc/self/exe (typically)
+	with right parameters.
 
-	  However, there are drawbacks: it is problematic in chroot jails
-	  without mounted /proc, and ps/top may show command name as 'exe'
-	  for applets started this way.
+	However, there are drawbacks: it is problematic in chroot jails
+	without mounted /proc, and ps/top may show command name as 'exe'
+	for applets started this way.
 
 config BUSYBOX_FEATURE_SH_NOFORK
 	bool "Run 'nofork' applets directly"
 	default n
 	depends on BUSYBOX_ASH || BUSYBOX_HUSH || BUSYBOX_SH_IS_ASH || BUSYBOX_BASH_IS_ASH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
 	help
-	  This option causes busybox shells to not execute typical
-	  fork/exec/wait sequence, but call <applet>_main directly,
-	  if possible. (BUSYBOX_Sometimes it is not possible: for example,
-	  this is not possible in pipes).
+	This option causes busybox shells to not execute typical
+	fork/exec/wait sequence, but call <applet>_main directly,
+	if possible. (BUSYBOX_Sometimes it is not possible: for example,
+	this is not possible in pipes).
+
+	This will be done only for some applets (those which are marked
+	NOFORK in include/applets.h).
 
-	  This will be done only for some applets (those which are marked
-	  NOFORK in include/applets.h).
+	This may significantly speed up some shell scripts.
 
-	  This may significantly speed up some shell scripts.
+	This feature is relatively new. Use with care. Report bugs
+	to project mailing list.
 
-	  This feature is relatively new. Use with care. Report bugs
-	  to project mailing list.
+config BUSYBOX_FEATURE_SH_READ_FRAC
+	bool "read -t N.NNN support (+110 bytes)"
+	default y
+	depends on BUSYBOX_ASH || BUSYBOX_HUSH || BUSYBOX_SH_IS_ASH || BUSYBOX_BASH_IS_ASH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
+	help
+	Enable support for fractional second timeout in read builtin.
 
 config BUSYBOX_FEATURE_SH_HISTFILESIZE
 	bool "Use $HISTFILESIZE"
 	default y
 	depends on BUSYBOX_ASH || BUSYBOX_HUSH || BUSYBOX_SH_IS_ASH || BUSYBOX_BASH_IS_ASH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
 	help
-	  This option makes busybox shells to use $HISTFILESIZE variable
-	  to set shell history size. Note that its max value is capped
-	  by "History size" setting in library tuning section.
+	This option makes busybox shells to use $HISTFILESIZE variable
+	to set shell history size. Note that its max value is capped
+	by "History size" setting in library tuning section.
 
 endif # Options common to all shells
 
diff --git a/config/busybox/sysklogd/Config.in b/config/busybox/sysklogd/Config.in
index 513adc0f2..14f969b63 100644
--- a/config/busybox/sysklogd/Config.in
+++ b/config/busybox/sysklogd/Config.in
@@ -7,14 +7,14 @@
 menu "System Logging Utilities"
 
 config BUSYBOX_KLOGD
-	bool "klogd"
+	bool "klogd (5.5 kb)"
 	default y
 	help
-	  klogd is a utility which intercepts and logs all
-	  messages from the Linux kernel and sends the messages
-	  out to the 'syslogd' utility so they can be logged. If
-	  you wish to record the messages produced by the kernel,
-	  you should enable this option.
+	klogd is a utility which intercepts and logs all
+	messages from the Linux kernel and sends the messages
+	out to the 'syslogd' utility so they can be logged. If
+	you wish to record the messages produced by the kernel,
+	you should enable this option.
 
 comment "klogd should not be used together with syslog to kernel printk buffer"
 	depends on BUSYBOX_KLOGD && BUSYBOX_FEATURE_KMSG_SYSLOG
@@ -25,96 +25,96 @@ config BUSYBOX_FEATURE_KLOGD_KLOGCTL
 	depends on BUSYBOX_KLOGD
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  The klogd applet supports two interfaces for reading
-	  kernel messages. Linux provides the klogctl() interface
-	  which allows reading messages from the kernel ring buffer
-	  independently from the file system.
+	The klogd applet supports two interfaces for reading
+	kernel messages. Linux provides the klogctl() interface
+	which allows reading messages from the kernel ring buffer
+	independently from the file system.
 
-	  If you answer 'N' here, klogd will use the more portable
-	  approach of reading them from /proc or a device node.
-	  However, this method requires the file to be available.
+	If you answer 'N' here, klogd will use the more portable
+	approach of reading them from /proc or a device node.
+	However, this method requires the file to be available.
 
-	  If in doubt, say 'Y'.
+	If in doubt, say 'Y'.
 config BUSYBOX_LOGGER
-	bool "logger"
+	bool "logger (6.4 kb)"
 	default y
 	select BUSYBOX_FEATURE_SYSLOG
 	help
-	    The logger utility allows you to send arbitrary text
-	    messages to the system log (i.e. the 'syslogd' utility) so
-	    they can be logged. This is generally used to help locate
-	    problems that occur within programs and scripts.
+	The logger utility allows you to send arbitrary text
+	messages to the system log (i.e. the 'syslogd' utility) so
+	they can be logged. This is generally used to help locate
+	problems that occur within programs and scripts.
 config BUSYBOX_LOGREAD
-	bool "logread"
+	bool "logread (6 kb)"
 	default y
 	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.
+	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 BUSYBOX_FEATURE_LOGREAD_REDUCED_LOCKING
 	bool "Double buffering"
 	default y
 	depends on BUSYBOX_LOGREAD
 	help
-	  'logread' output to slow serial terminals can have
-	  side effects on syslog because of the semaphore.
-	  This option make logread to double buffer copy
-	  from circular buffer, minimizing semaphore
-	  contention at some minor memory expense.
+	'logread' output to slow serial terminals can have
+	side effects on syslog because of the semaphore.
+	This option make logread to double buffer copy
+	from circular buffer, minimizing semaphore
+	contention at some minor memory expense.
 
 config BUSYBOX_SYSLOGD
-	bool "syslogd"
+	bool "syslogd (12 kb)"
 	default y
 	help
-	  The syslogd utility is used to record logs of all the
-	  significant events that occur on a system. Every
-	  message that is logged records the date and time of the
-	  event, and will generally also record the name of the
-	  application that generated the message. When used in
-	  conjunction with klogd, messages from the Linux kernel
-	  can also be recorded. This is terribly useful,
-	  especially for finding what happened when something goes
-	  wrong. And something almost always will go wrong if
-	  you wait long enough....
+	The syslogd utility is used to record logs of all the
+	significant events that occur on a system. Every
+	message that is logged records the date and time of the
+	event, and will generally also record the name of the
+	application that generated the message. When used in
+	conjunction with klogd, messages from the Linux kernel
+	can also be recorded. This is terribly useful,
+	especially for finding what happened when something goes
+	wrong. And something almost always will go wrong if
+	you wait long enough....
 
 config BUSYBOX_FEATURE_ROTATE_LOGFILE
 	bool "Rotate message files"
 	default y
 	depends on BUSYBOX_SYSLOGD
 	help
-	  This enables syslogd to rotate the message files
-	  on his own. No need to use an external rotate script.
+	This enables syslogd to rotate the message files
+	on his own. No need to use an external rotate script.
 
 config BUSYBOX_FEATURE_REMOTE_LOG
 	bool "Remote Log support"
 	default y
 	depends on BUSYBOX_SYSLOGD
 	help
-	  When you enable this feature, the syslogd utility can
-	  be used to send system log messages to another system
-	  connected via a network. This allows the remote
-	  machine to log all the system messages, which can be
-	  terribly useful for reducing the number of serial
-	  cables you use. It can also be a very good security
-	  measure to prevent system logs from being tampered with
-	  by an intruder.
+	When you enable this feature, the syslogd utility can
+	be used to send system log messages to another system
+	connected via a network. This allows the remote
+	machine to log all the system messages, which can be
+	terribly useful for reducing the number of serial
+	cables you use. It can also be a very good security
+	measure to prevent system logs from being tampered with
+	by an intruder.
 
 config BUSYBOX_FEATURE_SYSLOGD_DUP
 	bool "Support -D (drop dups) option"
 	default y
 	depends on BUSYBOX_SYSLOGD
 	help
-	  Option -D instructs syslogd to drop consecutive messages
-	  which are totally the same.
+	Option -D instructs syslogd to drop consecutive messages
+	which are totally the same.
 
 config BUSYBOX_FEATURE_SYSLOGD_CFG
 	bool "Support syslog.conf"
 	default y
 	depends on BUSYBOX_SYSLOGD
 	help
-	  Supports restricted syslogd config. See docs/syslog.conf.txt
+	Supports restricted syslogd config. See docs/syslog.conf.txt
 
 config BUSYBOX_FEATURE_SYSLOGD_READ_BUFFER_SIZE
 	int "Read buffer size in bytes"
@@ -122,23 +122,23 @@ config BUSYBOX_FEATURE_SYSLOGD_READ_BUFFER_SIZE
 	range 256 20000
 	depends on BUSYBOX_SYSLOGD
 	help
-	  This option sets the size of the syslog read buffer.
-	  Actual memory usage increases around five times the
-	  change done here.
+	This option sets the size of the syslog read buffer.
+	Actual memory usage increases around five times the
+	change done here.
 
 config BUSYBOX_FEATURE_IPC_SYSLOG
 	bool "Circular Buffer support"
 	default y
 	depends on BUSYBOX_SYSLOGD
 	help
-	  When you enable this feature, the syslogd utility will
-	  use a circular buffer to record system log messages.
-	  When the buffer is filled it will continue to overwrite
-	  the oldest messages. This can be very useful for
-	  systems with little or no permanent storage, since
-	  otherwise system logs can eventually fill up your
-	  entire filesystem, which may cause your system to
-	  break badly.
+	When you enable this feature, the syslogd utility will
+	use a circular buffer to record system log messages.
+	When the buffer is filled it will continue to overwrite
+	the oldest messages. This can be very useful for
+	systems with little or no permanent storage, since
+	otherwise system logs can eventually fill up your
+	entire filesystem, which may cause your system to
+	break badly.
 
 config BUSYBOX_FEATURE_IPC_SYSLOG_BUFFER_SIZE
 	int "Circular buffer size in Kbytes (minimum 4KB)"
@@ -146,8 +146,8 @@ config BUSYBOX_FEATURE_IPC_SYSLOG_BUFFER_SIZE
 	range 4 2147483647
 	depends on BUSYBOX_FEATURE_IPC_SYSLOG
 	help
-	  This option sets the size of the circular buffer
-	  used to record system log messages.
+	This option sets the size of the circular buffer
+	used to record system log messages.
 
 config BUSYBOX_FEATURE_KMSG_SYSLOG
 	bool "Linux kernel printk buffer support"
@@ -155,11 +155,11 @@ config BUSYBOX_FEATURE_KMSG_SYSLOG
 	depends on BUSYBOX_SYSLOGD
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  When you enable this feature, the syslogd utility will
-	  write system log message to the Linux kernel's printk buffer.
-	  This can be used as a smaller alternative to the syslogd IPC
-	  support, as klogd and logread aren't needed.
+	When you enable this feature, the syslogd utility will
+	write system log message to the Linux kernel's printk buffer.
+	This can be used as a smaller alternative to the syslogd IPC
+	support, as klogd and logread aren't needed.
 
-	  NOTICE: Syslog facilities in log entries needs kernel 3.5+.
+	NOTICE: Syslog facilities in log entries needs kernel 3.5+.
 
 endmenu
diff --git a/config/busybox/util-linux/Config.in b/config/busybox/util-linux/Config.in
index dc878e670..f74c33165 100644
--- a/config/busybox/util-linux/Config.in
+++ b/config/busybox/util-linux/Config.in
@@ -7,165 +7,164 @@
 menu "Linux System Utilities"
 
 config BUSYBOX_ACPID
-	bool "acpid"
+	bool "acpid (8.7 kb)"
 	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  acpid listens to ACPI events coming either in textual form from
-	  /proc/acpi/event (though it is marked deprecated it is still widely
-	  used and _is_ a standard) or in binary form from specified evdevs
-	  (just use /dev/input/event*).
+	acpid listens to ACPI events coming either in textual form from
+	/proc/acpi/event (though it is marked deprecated it is still widely
+	used and _is_ a standard) or in binary form from specified evdevs
+	(just use /dev/input/event*).
 
-	  It parses the event to retrieve ACTION and a possible PARAMETER.
-	  It then spawns /etc/acpi/<ACTION>[/<PARAMETER>] either via run-parts
-	  (if the resulting path is a directory) or directly as an executable.
+	It parses the event to retrieve ACTION and a possible PARAMETER.
+	It then spawns /etc/acpi/<ACTION>[/<PARAMETER>] either via run-parts
+	(if the resulting path is a directory) or directly as an executable.
 
-	  N.B. acpid relies on run-parts so have the latter installed.
+	N.B. acpid relies on run-parts so have the latter installed.
 
 config BUSYBOX_FEATURE_ACPID_COMPAT
 	bool "Accept and ignore redundant options"
 	default y
 	depends on BUSYBOX_ACPID
 	help
-	  Accept and ignore compatibility options -g -m -s -S -v.
+	Accept and ignore compatibility options -g -m -s -S -v.
 config BUSYBOX_BLKDISCARD
-	bool "blkdiscard"
+	bool "blkdiscard (5.3 kb)"
 	default y
+	select BUSYBOX_PLATFORM_LINUX
 	help
-	  blkdiscard discards sectors on a given device.
+	blkdiscard discards sectors on a given device.
 config BUSYBOX_BLKID
-	bool "blkid"
+	bool "blkid (11 kb)"
 	default y
 	select BUSYBOX_PLATFORM_LINUX
 	select BUSYBOX_VOLUMEID
 	help
-	  Lists labels and UUIDs of all filesystems.
-	  WARNING:
-	  With all submodules selected, it will add ~8k to busybox.
+	Lists labels and UUIDs of all filesystems.
 
 config BUSYBOX_FEATURE_BLKID_TYPE
 	bool "Print filesystem type"
-	default n
+	default y
 	depends on BUSYBOX_BLKID
 	help
-	  Show TYPE="filesystem type"
+	Show TYPE="filesystem type"
 config BUSYBOX_BLOCKDEV
-	bool "blockdev"
+	bool "blockdev (2.4 kb)"
 	default y
 	help
-	  Performs some ioctls with block devices.
+	Performs some ioctls with block devices.
 config BUSYBOX_CAL
-	bool "cal"
+	bool "cal (6.5 kb)"
 	default y
 	help
-	  cal is used to display a monthly calendar.
+	cal is used to display a monthly calendar.
 config BUSYBOX_CHRT
-	bool "chrt"
+	bool "chrt (4.4 kb)"
 	default y
 	help
-	  manipulate real-time attributes of a process.
-	  This requires sched_{g,s}etparam support in your libc.
+	manipulate real-time attributes of a process.
+	This requires sched_{g,s}etparam support in your libc.
 config BUSYBOX_DMESG
-	bool "dmesg"
+	bool "dmesg (3.5 kb)"
 	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  dmesg is used to examine or control the kernel ring buffer. When the
-	  Linux kernel prints messages to the system log, they are stored in
-	  the kernel ring buffer. You can use dmesg to print the kernel's ring
-	  buffer, clear the kernel ring buffer, change the size of the kernel
-	  ring buffer, and change the priority level at which kernel messages
-	  are also logged to the system console. Enable this option if you
-	  wish to enable the 'dmesg' utility.
+	dmesg is used to examine or control the kernel ring buffer. When the
+	Linux kernel prints messages to the system log, they are stored in
+	the kernel ring buffer. You can use dmesg to print the kernel's ring
+	buffer, clear the kernel ring buffer, change the size of the kernel
+	ring buffer, and change the priority level at which kernel messages
+	are also logged to the system console. Enable this option if you
+	wish to enable the 'dmesg' utility.
 
 config BUSYBOX_FEATURE_DMESG_PRETTY
 	bool "Pretty output"
 	default y
 	depends on BUSYBOX_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)
+	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 BUSYBOX_EJECT
-	bool "eject"
+	bool "eject (4.1 kb)"
 	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  Used to eject cdroms. (defaults to /dev/cdrom)
+	Used to eject cdroms. (defaults to /dev/cdrom)
 
 config BUSYBOX_FEATURE_EJECT_SCSI
 	bool "SCSI support"
 	default y
 	depends on BUSYBOX_EJECT
 	help
-	  Add the -s option to eject, this allows to eject SCSI-Devices and
-	  usb-storage devices.
+	Add the -s option to eject, this allows to eject SCSI-Devices and
+	usb-storage devices.
 config BUSYBOX_FALLOCATE
-	bool "fallocate"
+	bool "fallocate (5 kb)"
 	default y
 	help
-	  Preallocate space for files.
+	Preallocate space for files.
 config BUSYBOX_FATATTR
-	bool "fatattr"
+	bool "fatattr (1.9 kb)"
 	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  fatattr lists or changes the file attributes on a fat file system.
+	fatattr lists or changes the file attributes on a fat file system.
 config BUSYBOX_FBSET
-	bool "fbset"
+	bool "fbset (5.8 kb)"
 	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  fbset is used to show or change the settings of a Linux frame buffer
-	  device. The frame buffer device provides a simple and unique
-	  interface to access a graphics display. Enable this option
-	  if you wish to enable the 'fbset' utility.
+	fbset is used to show or change the settings of a Linux frame buffer
+	device. The frame buffer device provides a simple and unique
+	interface to access a graphics display. Enable this option
+	if you wish to enable the 'fbset' utility.
 
 config BUSYBOX_FEATURE_FBSET_FANCY
 	bool "Enable extra options"
 	default y
 	depends on BUSYBOX_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.
+	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 BUSYBOX_FEATURE_FBSET_READMODE
 	bool "Enable readmode support"
 	default y
 	depends on BUSYBOX_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.
+	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 BUSYBOX_FDFORMAT
-	bool "fdformat"
+	bool "fdformat (4.5 kb)"
 	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  fdformat is used to low-level format a floppy disk.
+	fdformat is used to low-level format a floppy disk.
 config BUSYBOX_FDISK
-	bool "fdisk"
+	bool "fdisk (41 kb)"
 	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  The fdisk utility is used to divide hard disks into one or more
-	  logical disks, which are generally called partitions. This utility
-	  can be used to list and edit the set of partitions or BSD style
-	  'disk slices' that are defined on a hard drive.
+	The fdisk utility is used to divide hard disks into one or more
+	logical disks, which are generally called partitions. This utility
+	can be used to list and edit the set of partitions or BSD style
+	'disk slices' that are defined on a hard drive.
 
 config BUSYBOX_FDISK_SUPPORT_LARGE_DISKS
 	bool "Support over 4GB disks"
@@ -178,444 +177,436 @@ config BUSYBOX_FEATURE_FDISK_WRITABLE
 	default y
 	depends on BUSYBOX_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.
+	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 BUSYBOX_FEATURE_AIX_LABEL
 	bool "Support AIX disklabels"
 	default n
 	depends on BUSYBOX_FDISK && BUSYBOX_FEATURE_FDISK_WRITABLE
 	help
-	  Enabling this option allows you to create or change AIX disklabels.
-	  Most people can safely leave this option disabled.
+	Enabling this option allows you to create or change AIX disklabels.
+	Most people can safely leave this option disabled.
 
 config BUSYBOX_FEATURE_SGI_LABEL
 	bool "Support SGI disklabels"
 	default n
 	depends on BUSYBOX_FDISK && BUSYBOX_FEATURE_FDISK_WRITABLE
 	help
-	  Enabling this option allows you to create or change SGI disklabels.
-	  Most people can safely leave this option disabled.
+	Enabling this option allows you to create or change SGI disklabels.
+	Most people can safely leave this option disabled.
 
 config BUSYBOX_FEATURE_SUN_LABEL
 	bool "Support SUN disklabels"
 	default n
 	depends on BUSYBOX_FDISK && BUSYBOX_FEATURE_FDISK_WRITABLE
 	help
-	  Enabling this option allows you to create or change SUN disklabels.
-	  Most people can safely leave this option disabled.
+	Enabling this option allows you to create or change SUN disklabels.
+	Most people can safely leave this option disabled.
 
 config BUSYBOX_FEATURE_OSF_LABEL
 	bool "Support BSD disklabels"
 	default n
 	depends on BUSYBOX_FDISK && BUSYBOX_FEATURE_FDISK_WRITABLE
 	help
-	  Enabling this option allows you to create or change BSD disklabels
-	  and define and edit BSD disk slices.
+	Enabling this option allows you to create or change BSD disklabels
+	and define and edit BSD disk slices.
 
 config BUSYBOX_FEATURE_GPT_LABEL
 	bool "Support GPT disklabels"
 	default n
 	depends on BUSYBOX_FDISK && BUSYBOX_FEATURE_FDISK_WRITABLE
 	help
-	  Enabling this option allows you to view GUID Partition Table
-	  disklabels.
+	Enabling this option allows you to view GUID Partition Table
+	disklabels.
 
 config BUSYBOX_FEATURE_FDISK_ADVANCED
 	bool "Support expert mode"
 	default y
 	depends on BUSYBOX_FDISK && BUSYBOX_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.
+	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 BUSYBOX_FINDFS
-	bool "findfs"
+	bool "findfs (11 kb)"
 	default y
 	select BUSYBOX_PLATFORM_LINUX
 	select BUSYBOX_VOLUMEID
 	help
-	  Prints the name of a filesystem with given label or UUID.
-	  WARNING:
-	  With all submodules selected, it will add ~8k to busybox.
+	Prints the name of a filesystem with given label or UUID.
 config BUSYBOX_FLOCK
-	bool "flock"
+	bool "flock (6.1 kb)"
 	default y
 	help
-	  Manage locks from shell scripts
+	Manage locks from shell scripts
 config BUSYBOX_FDFLUSH
-	bool "fdflush"
+	bool "fdflush (1.4 kb)"
 	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  fdflush is only needed when changing media on slightly-broken
-	  removable media drives. It is used to make Linux believe that a
-	  hardware disk-change switch has been actuated, which causes Linux to
-	  forget anything it has cached from the previous media. If you have
-	  such a slightly-broken drive, you will need to run fdflush every time
-	  you change a disk. Most people have working hardware and can safely
-	  leave this disabled.
+	fdflush is only needed when changing media on slightly-broken
+	removable media drives. It is used to make Linux believe that a
+	hardware disk-change switch has been actuated, which causes Linux to
+	forget anything it has cached from the previous media. If you have
+	such a slightly-broken drive, you will need to run fdflush every time
+	you change a disk. Most people have working hardware and can safely
+	leave this disabled.
 
 config BUSYBOX_FREERAMDISK
-	bool "freeramdisk"
+	bool "freeramdisk (1.4 kb)"
 	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  Linux allows you to create ramdisks. This utility allows you to
-	  delete them and completely free all memory that was used for the
-	  ramdisk. For example, if you boot Linux into a ramdisk and later
-	  pivot_root, you may want to free the memory that is allocated to the
-	  ramdisk. If you have no use for freeing memory from a ramdisk, leave
-	  this disabled.
+	Linux allows you to create ramdisks. This utility allows you to
+	delete them and completely free all memory that was used for the
+	ramdisk. For example, if you boot Linux into a ramdisk and later
+	pivot_root, you may want to free the memory that is allocated to the
+	ramdisk. If you have no use for freeing memory from a ramdisk, leave
+	this disabled.
 config BUSYBOX_FSCK_MINIX
 	bool "fsck_minix"
 	default y
 	help
-	  The minix filesystem is a nice, small, compact, read-write filesystem
-	  with little overhead. It is not a journaling filesystem however and
-	  can experience corruption if it is not properly unmounted or if the
-	  power goes off in the middle of a write. This utility allows you to
-	  check for and attempt to repair any corruption that occurs to a minix
-	  filesystem.
+	The minix filesystem is a nice, small, compact, read-write filesystem
+	with little overhead. It is not a journaling filesystem however and
+	can experience corruption if it is not properly unmounted or if the
+	power goes off in the middle of a write. This utility allows you to
+	check for and attempt to repair any corruption that occurs to a minix
+	filesystem.
 config BUSYBOX_FSFREEZE
-	bool "fsfreeze"
+	bool "fsfreeze (3.6 kb)"
 	default y
 	select BUSYBOX_PLATFORM_LINUX
 	select BUSYBOX_LONG_OPTS
 	help
-	  Halt new accesses and flush writes on a mounted filesystem.
+	Halt new accesses and flush writes on a mounted filesystem.
 config BUSYBOX_FSTRIM
-	bool "fstrim"
+	bool "fstrim (5.5 kb)"
 	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  Discard unused blocks on a mounted filesystem.
+	Discard unused blocks on a mounted filesystem.
 config BUSYBOX_GETOPT
-	bool "getopt"
+	bool "getopt (5.6 kb)"
 	default y
 	help
-	  The getopt utility is used to break up (parse) options in command
-	  lines to make it easy to write complex shell scripts that also check
-	  for legal (and illegal) options. If you want to write horribly
-	  complex shell scripts, or use some horribly complex shell script
-	  written by others, this utility may be for you. Most people will
-	  wisely leave this disabled.
+	The getopt utility is used to break up (parse) options in command
+	lines to make it easy to write complex shell scripts that also check
+	for legal (and illegal) options. If you want to write horribly
+	complex shell scripts, or use some horribly complex shell script
+	written by others, this utility may be for you. Most people will
+	wisely leave this disabled.
 
 config BUSYBOX_FEATURE_GETOPT_LONG
-	bool "Support option -l"
-	default y if BUSYBOX_LONG_OPTS
-	depends on BUSYBOX_GETOPT
+	bool "Support -l LONGOPTs"
+	default y
+	depends on BUSYBOX_GETOPT && BUSYBOX_LONG_OPTS
 	help
-	  Enable support for long options (option -l).
+	Enable support for long options (option -l).
 config BUSYBOX_HEXDUMP
-	bool "hexdump"
+	bool "hexdump (8.8 kb)"
 	default y
 	help
-	  The hexdump utility is used to display binary data in a readable
-	  way that is comparable to the output from most hex editors.
+	The hexdump utility is used to display binary data in a readable
+	way that is comparable to the output from most hex editors.
 
 config BUSYBOX_FEATURE_HEXDUMP_REVERSE
 	bool "Support -R, reverse of 'hexdump -Cv'"
 	default y
 	depends on BUSYBOX_HEXDUMP
 	help
-	  The hexdump utility is used to display binary data in an ascii
-	  readable way. This option creates binary data from an ascii input.
-	  NB: this option is non-standard. It's unwise to use it in scripts
-	  aimed to be portable.
+	The hexdump utility is used to display binary data in an ascii
+	readable way. This option creates binary data from an ascii input.
+	NB: this option is non-standard. It's unwise to use it in scripts
+	aimed to be portable.
 
 config BUSYBOX_HD
-	bool "hd"
+	bool "hd (8 kb)"
 	default y
 	help
-	  hd is an alias to hexdump -C.
+	hd is an alias to hexdump -C.
 config BUSYBOX_XXD
-	bool "xxd"
+	bool "xxd (8.9 kb)"
 	default y
 	help
-	  The xxd utility is used to display binary data in a readable
-	  way that is comparable to the output from most hex editors.
+	The xxd utility is used to display binary data in a readable
+	way that is comparable to the output from most hex editors.
 config BUSYBOX_HWCLOCK
-	bool "hwclock"
+	bool "hwclock (5.8 kb)"
 	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  The hwclock utility is used to read and set the hardware clock
-	  on a system. This is primarily used to set the current time on
-	  shutdown in the hardware clock, so the hardware will keep the
-	  correct time when Linux is _not_ running.
-
-config BUSYBOX_FEATURE_HWCLOCK_LONG_OPTIONS
-	bool "Support long options (--hctosys,...)"
-	default y
-	depends on BUSYBOX_HWCLOCK && BUSYBOX_LONG_OPTS
+	The hwclock utility is used to read and set the hardware clock
+	on a system. This is primarily used to set the current time on
+	shutdown in the hardware clock, so the hardware will keep the
+	correct time when Linux is _not_ running.
 
 config BUSYBOX_FEATURE_HWCLOCK_ADJTIME_FHS
 	bool "Use FHS /var/lib/hwclock/adjtime"
 	default n  # util-linux-ng in Fedora 13 still uses /etc/adjtime
 	depends on BUSYBOX_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
-	  to use the FHS behavior, answer Y here, otherwise answer N for the
-	  classic /etc/adjtime path.
+	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
+	to use the FHS behavior, answer Y here, otherwise answer N for the
+	classic /etc/adjtime path.
 
-	  pathname.com/fhs/pub/fhs-2.3.html#VARLIBHWCLOCKSTATEDIRECTORYFORHWCLO
+	pathname.com/fhs/pub/fhs-2.3.html#VARLIBHWCLOCKSTATEDIRECTORYFORHWCLO
 config BUSYBOX_IONICE
-	bool "ionice"
+	bool "ionice (3.6 kb)"
 	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  Set/set program io scheduling class and priority
-	  Requires kernel >= 2.6.13
+	Set/set program io scheduling class and priority
+	Requires kernel >= 2.6.13
 config BUSYBOX_IPCRM
-	bool "ipcrm"
+	bool "ipcrm (2.9 kb)"
 	default y
 	help
-	  The ipcrm utility allows the removal of System V interprocess
-	  communication (IPC) objects and the associated data structures
-	  from the system.
+	The ipcrm utility allows the removal of System V interprocess
+	communication (IPC) objects and the associated data structures
+	from the system.
 config BUSYBOX_IPCS
-	bool "ipcs"
+	bool "ipcs (11 kb)"
 	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  The ipcs utility is used to provide information on the currently
-	  allocated System V interprocess (IPC) objects in the system.
+	The ipcs utility is used to provide information on the currently
+	allocated System V interprocess (IPC) objects in the system.
 config BUSYBOX_LAST
-	bool "last"
+	bool "last (6.2 kb)"
 	default y
 	depends on BUSYBOX_FEATURE_WTMP
 	help
-	  'last' displays a list of the last users that logged into the system.
+	'last' displays a list of the last users that logged into the system.
 
 config BUSYBOX_FEATURE_LAST_FANCY
 	bool "Output extra information"
 	default y
 	depends on BUSYBOX_LAST
 	help
-	  'last' displays detailed information about the last users that
-	  logged into the system (mimics sysvinit last). +900 bytes.
+	'last' displays detailed information about the last users that
+	logged into the system (mimics sysvinit last). +900 bytes.
 config BUSYBOX_LOSETUP
-	bool "losetup"
+	bool "losetup (5.4 kb)"
 	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  losetup is used to associate or detach a loop device with a regular
-	  file or block device, and to query the status of a loop device. This
-	  version does not currently support enabling data encryption.
+	losetup is used to associate or detach a loop device with a regular
+	file or block device, and to query the status of a loop device. This
+	version does not currently support enabling data encryption.
 config BUSYBOX_LSPCI
-	bool "lspci"
+	bool "lspci (5.7 kb)"
 	default y
 	#select PLATFORM_LINUX
 	help
-	  lspci is a utility for displaying information about PCI buses in the
-	  system and devices connected to them.
+	lspci is a utility for displaying information about PCI buses in the
+	system and devices connected to them.
 
-	  This version uses sysfs (/sys/bus/pci/devices) only.
+	This version uses sysfs (/sys/bus/pci/devices) only.
 config BUSYBOX_LSUSB
-	bool "lsusb"
+	bool "lsusb (3.5 kb)"
 	default y
 	#select PLATFORM_LINUX
 	help
-	  lsusb is a utility for displaying information about USB buses in the
-	  system and devices connected to them.
+	lsusb is a utility for displaying information about USB buses in the
+	system and devices connected to them.
 
-	  This version uses sysfs (/sys/bus/usb/devices) only.
+	This version uses sysfs (/sys/bus/usb/devices) only.
 config BUSYBOX_MDEV
-	bool "mdev"
+	bool "mdev (16 kb)"
 	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  mdev is a mini-udev implementation for dynamically creating device
-	  nodes in the /dev directory.
+	mdev is a mini-udev implementation for dynamically creating device
+	nodes in the /dev directory.
 
-	  For more information, please see docs/mdev.txt
+	For more information, please see docs/mdev.txt
 
 config BUSYBOX_FEATURE_MDEV_CONF
 	bool "Support /etc/mdev.conf"
 	default y
 	depends on BUSYBOX_MDEV
 	help
-	  Add support for the mdev config file to control ownership and
-	  permissions of the device nodes.
+	Add support for the mdev config file to control ownership and
+	permissions of the device nodes.
 
-	  For more information, please see docs/mdev.txt
+	For more information, please see docs/mdev.txt
 
 config BUSYBOX_FEATURE_MDEV_RENAME
 	bool "Support subdirs/symlinks"
 	default y
 	depends on BUSYBOX_FEATURE_MDEV_CONF
 	help
-	  Add support for renaming devices and creating symlinks.
+	Add support for renaming devices and creating symlinks.
 
-	  For more information, please see docs/mdev.txt
+	For more information, please see docs/mdev.txt
 
 config BUSYBOX_FEATURE_MDEV_RENAME_REGEXP
 	bool "Support regular expressions substitutions when renaming device"
 	default y
 	depends on BUSYBOX_FEATURE_MDEV_RENAME
 	help
-	  Add support for regular expressions substitutions when renaming
-	  device.
+	Add support for regular expressions substitutions when renaming
+	device.
 
 config BUSYBOX_FEATURE_MDEV_EXEC
 	bool "Support command execution at device addition/removal"
 	default y
 	depends on BUSYBOX_FEATURE_MDEV_CONF
 	help
-	  This adds support for an optional field to /etc/mdev.conf for
-	  executing commands when devices are created/removed.
+	This adds support for an optional field to /etc/mdev.conf for
+	executing commands when devices are created/removed.
 
-	  For more information, please see docs/mdev.txt
+	For more information, please see docs/mdev.txt
 
 config BUSYBOX_FEATURE_MDEV_LOAD_FIRMWARE
-	bool "Support loading of firmwares"
+	bool "Support loading of firmware"
 	default y
 	depends on BUSYBOX_MDEV
 	help
-	  Some devices need to load firmware before they can be usable.
+	Some devices need to load firmware before they can be usable.
 
-	  These devices will request userspace look up the files in
-	  /lib/firmware/ and if it exists, send it to the kernel for
-	  loading into the hardware.
+	These devices will request userspace look up the files in
+	/lib/firmware/ and if it exists, send it to the kernel for
+	loading into the hardware.
 config BUSYBOX_MESG
-	bool "mesg"
+	bool "mesg (1.2 kb)"
 	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
+	Mesg controls access to your terminal by others. It is typically
+	used to allow or disallow other users to write to your terminal
 
 config BUSYBOX_FEATURE_MESG_ENABLE_ONLY_GROUP
 	bool "Enable writing to tty only by group, not by everybody"
 	default y
 	depends on BUSYBOX_MESG
 	help
-	  Usually, ttys are owned by group "tty", and "write" tool is
-	  setgid to this group. This way, "mesg y" only needs to enable
-	  "write by owning group" bit in tty mode.
+	Usually, ttys are owned by group "tty", and "write" tool is
+	setgid to this group. This way, "mesg y" only needs to enable
+	"write by owning group" bit in tty mode.
 
-	  If you set this option to N, "mesg y" will enable writing
-	  by anybody at all. This is not recommended.
+	If you set this option to N, "mesg y" will enable writing
+	by anybody at all. This is not recommended.
 config BUSYBOX_MKE2FS
-	bool "mke2fs"
+	bool "mke2fs (9.7 kb)"
 	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  Utility to create EXT2 filesystems.
+	Utility to create EXT2 filesystems.
 
 config BUSYBOX_MKFS_EXT2
-	bool "mkfs.ext2"
+	bool "mkfs.ext2 (9.8 kb)"
 	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  Alias to "mke2fs".
+	Alias to "mke2fs".
 config BUSYBOX_MKFS_MINIX
 	bool "mkfs_minix"
 	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  The minix filesystem is a nice, small, compact, read-write filesystem
-	  with little overhead. If you wish to be able to create minix
-	  filesystems this utility will do the job for you.
+	The minix filesystem is a nice, small, compact, read-write filesystem
+	with little overhead. If you wish to be able to create minix
+	filesystems this utility will do the job for you.
 
 config BUSYBOX_FEATURE_MINIX2
 	bool "Support Minix fs v2 (fsck_minix/mkfs_minix)"
 	default y
 	depends on BUSYBOX_FSCK_MINIX || BUSYBOX_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.
+	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 BUSYBOX_MKFS_REISER
 	bool "mkfs_reiser"
 	default n
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  Utility to create ReiserFS filesystems.
-	  Note: this applet needs a lot of testing and polishing.
+	Utility to create ReiserFS filesystems.
+	Note: this applet needs a lot of testing and polishing.
 config BUSYBOX_MKDOSFS
-	bool "mkdosfs"
+	bool "mkdosfs (6.8 kb)"
 	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  Utility to create FAT32 filesystems.
+	Utility to create FAT32 filesystems.
 
 config BUSYBOX_MKFS_VFAT
-	bool "mkfs.vfat"
+	bool "mkfs.vfat (6.8 kb)"
 	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  Alias to "mkdosfs".
+	Alias to "mkdosfs".
 config BUSYBOX_MKSWAP
-	bool "mkswap"
+	bool "mkswap (5.8 kb)"
 	default y
 	help
-	  The mkswap utility is used to configure a file or disk partition as
-	  Linux swap space. This allows Linux to use the entire file or
-	  partition as if it were additional RAM, which can greatly increase
-	  the capability of low-memory machines. This additional memory is
-	  much slower than real RAM, but can be very helpful at preventing your
-	  applications being killed by the Linux out of memory (OOM) killer.
-	  Once you have created swap space using 'mkswap' you need to enable
-	  the swap space using the 'swapon' utility.
+	The mkswap utility is used to configure a file or disk partition as
+	Linux swap space. This allows Linux to use the entire file or
+	partition as if it were additional RAM, which can greatly increase
+	the capability of low-memory machines. This additional memory is
+	much slower than real RAM, but can be very helpful at preventing your
+	applications being killed by the Linux out of memory (OOM) killer.
+	Once you have created swap space using 'mkswap' you need to enable
+	the swap space using the 'swapon' utility.
 
 config BUSYBOX_FEATURE_MKSWAP_UUID
 	bool "UUID support"
 	default y
 	depends on BUSYBOX_MKSWAP
 	help
-	  Generate swap spaces with universally unique identifiers.
+	Generate swap spaces with universally unique identifiers.
 config BUSYBOX_MORE
-	bool "more"
+	bool "more (6.7 kb)"
 	default y
 	help
-	  more is a simple utility which allows you to read text one screen
-	  sized page at a time. If you want to read text that is larger than
-	  the screen, and you are using anything faster than a 300 baud modem,
-	  you will probably find this utility very helpful. If you don't have
-	  any need to reading text files, you can leave this disabled.
+	more is a simple utility which allows you to read text one screen
+	sized page at a time. If you want to read text that is larger than
+	the screen, and you are using anything faster than a 300 baud modem,
+	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 BUSYBOX_MOUNT
-	bool "mount"
+	bool "mount (30 kb)"
 	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  All files and filesystems in Unix are arranged into one big directory
-	  tree. The 'mount' utility is used to graft a filesystem onto a
-	  particular part of the tree. A filesystem can either live on a block
-	  device, or it can be accessible over the network, as is the case with
-	  NFS filesystems. Most people using BusyBox will also want to enable
-	  the 'mount' utility.
+	All files and filesystems in Unix are arranged into one big directory
+	tree. The 'mount' utility is used to graft a filesystem onto a
+	particular part of the tree. A filesystem can either live on a block
+	device, or it can be accessible over the network, as is the case with
+	NFS filesystems.
 
 config BUSYBOX_FEATURE_MOUNT_FAKE
-	bool "Support option -f"
+	bool "Support -f (fake mount)"
 	default y
 	depends on BUSYBOX_MOUNT
 	help
-	  Enable support for faking a file system mount.
+	Enable support for faking a file system mount.
 
 config BUSYBOX_FEATURE_MOUNT_VERBOSE
-	bool "Support option -v"
+	bool "Support -v (verbose)"
 	default y
 	depends on BUSYBOX_MOUNT
 	help
-	  Enable multi-level -v[vv...] verbose messages. Useful if you
-	  debug mount problems and want to see what is exactly passed
-	  to the kernel.
+	Enable multi-level -v[vv...] verbose messages. Useful if you
+	debug mount problems and want to see what is exactly passed
+	to the kernel.
 
 config BUSYBOX_FEATURE_MOUNT_HELPERS
 	bool "Support mount helpers"
 	default n
 	depends on BUSYBOX_MOUNT
 	help
-	  Enable mounting of virtual file systems via external helpers.
-	  E.g. "mount obexfs#-b00.11.22.33.44.55 /mnt" will in effect call
-	  "obexfs -b00.11.22.33.44.55 /mnt"
-	  Also "mount -t sometype [-o opts] fs /mnt" will try
-	  "sometype [-o opts] fs /mnt" if simple mount syscall fails.
-	  The idea is to use such virtual filesystems in /etc/fstab.
+	Enable mounting of virtual file systems via external helpers.
+	E.g. "mount obexfs#-b00.11.22.33.44.55 /mnt" will in effect call
+	"obexfs -b00.11.22.33.44.55 /mnt"
+	Also "mount -t sometype [-o opts] fs /mnt" will try
+	"sometype [-o opts] fs /mnt" if simple mount syscall fails.
+	The idea is to use such virtual filesystems in /etc/fstab.
 
 config BUSYBOX_FEATURE_MOUNT_LABEL
 	bool "Support specifying devices by label or UUID"
@@ -623,273 +614,298 @@ config BUSYBOX_FEATURE_MOUNT_LABEL
 	depends on BUSYBOX_MOUNT
 	select BUSYBOX_VOLUMEID
 	help
-	  This allows for specifying a device by label or uuid, rather than by
-	  name. This feature utilizes the same functionality as blkid/findfs.
-	  This also enables label or uuid support for swapon.
+	This allows for specifying a device by label or uuid, rather than by
+	name. This feature utilizes the same functionality as blkid/findfs.
 
 config BUSYBOX_FEATURE_MOUNT_NFS
 	bool "Support mounting NFS file systems on Linux < 2.6.23"
 	default n
 	depends on BUSYBOX_MOUNT
-	select BUSYBOX_FEATURE_HAVE_RPC
 	select BUSYBOX_FEATURE_SYSLOG
 	help
-	  Enable mounting of NFS file systems on Linux kernels prior
-	  to version 2.6.23. Note that in this case mounting of NFS
-	  over IPv6 will not be possible.
+	Enable mounting of NFS file systems on Linux kernels prior
+	to version 2.6.23. Note that in this case mounting of NFS
+	over IPv6 will not be possible.
 
-	  Note that this option links in RPC support from libc,
-	  which is rather large (~10 kbytes on uclibc).
+	Note that this option links in RPC support from libc,
+	which is rather large (~10 kbytes on uclibc).
 
 config BUSYBOX_FEATURE_MOUNT_CIFS
 	bool "Support mounting CIFS/SMB file systems"
 	default y
 	depends on BUSYBOX_MOUNT
 	help
-	  Enable support for samba mounts.
+	Enable support for samba mounts.
 
 config BUSYBOX_FEATURE_MOUNT_FLAGS
 	depends on BUSYBOX_MOUNT
 	bool "Support lots of -o flags"
 	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.
+	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 BUSYBOX_FEATURE_MOUNT_FSTAB
 	depends on BUSYBOX_MOUNT
-	bool "Support /etc/fstab and -a"
+	bool "Support /etc/fstab and -a (mount all)"
 	default y
 	help
-	  Support mount all and looking for files in /etc/fstab.
+	Support mount all and looking for files in /etc/fstab.
 
 config BUSYBOX_FEATURE_MOUNT_OTHERTAB
 	depends on BUSYBOX_FEATURE_MOUNT_FSTAB
 	bool "Support -T <alt_fstab>"
 	default y
 	help
-	  Support mount -T (specifying an alternate fstab)
+	Support mount -T (specifying an alternate fstab)
 config BUSYBOX_MOUNTPOINT
-	bool "mountpoint"
+	bool "mountpoint (4.5 kb)"
 	default y
 	help
-	  mountpoint checks if the directory is a mountpoint.
+	mountpoint checks if the directory is a mountpoint.
 config BUSYBOX_NSENTER
-	bool "nsenter"
+	bool "nsenter (8.6 kb)"
 	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  Run program with namespaces of other processes.
-
-config BUSYBOX_FEATURE_NSENTER_LONG_OPTS
-	bool "Enable long options"
-	default y
-	depends on BUSYBOX_NSENTER && BUSYBOX_LONG_OPTS
-	help
-	  Support long options for the nsenter applet. This makes
-	  the busybox implementation more compatible with upstream.
+	Run program with namespaces of other processes.
 config BUSYBOX_PIVOT_ROOT
-	bool "pivot_root"
+	bool "pivot_root (898 bytes)"
 	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  The pivot_root utility swaps the mount points for the root filesystem
-	  with some other mounted filesystem. This allows you to do all sorts
-	  of wild and crazy things with your Linux system and is far more
-	  powerful than 'chroot'.
+	The pivot_root utility swaps the mount points for the root filesystem
+	with some other mounted filesystem. This allows you to do all sorts
+	of wild and crazy things with your Linux system and is far more
+	powerful than 'chroot'.
 
-	  Note: This is for initrd in linux 2.4. Under initramfs (introduced
-	  in linux 2.6) use switch_root instead.
+	Note: This is for initrd in linux 2.4. Under initramfs (introduced
+	in linux 2.6) use switch_root instead.
 config BUSYBOX_RDATE
-	bool "rdate"
+	bool "rdate (6 kb)"
 	default y
 	help
-	  The rdate utility allows you to synchronize the date and time of your
-	  system clock with the date and time of a remote networked system using
-	  the RFC868 protocol, which is built into the inetd daemon on most
-	  systems.
+	The rdate utility allows you to synchronize the date and time of your
+	system clock with the date and time of a remote networked system using
+	the RFC868 protocol, which is built into the inetd daemon on most
+	systems.
 config BUSYBOX_RDEV
-	bool "rdev"
+	bool "rdev (1.4 kb)"
 	default y
 	help
-	  Print the device node associated with the filesystem mounted at '/'.
+	Print the device node associated with the filesystem mounted at '/'.
 config BUSYBOX_READPROFILE
-	bool "readprofile"
+	bool "readprofile (7.2 kb)"
 	default y
 	#select PLATFORM_LINUX
 	help
-	  This allows you to parse /proc/profile for basic profiling.
+	This allows you to parse /proc/profile for basic profiling.
 config BUSYBOX_RENICE
-	bool "renice"
+	bool "renice (3.8 kb)"
 	default y
 	help
-	  Renice alters the scheduling priority of one or more running
-	  processes.
+	Renice alters the scheduling priority of one or more running
+	processes.
 config BUSYBOX_REV
-	bool "rev"
+	bool "rev (4.5 kb)"
 	default y
 	help
-	  Reverse lines of a file or files.
+	Reverse lines of a file or files.
 config BUSYBOX_RTCWAKE
-	bool "rtcwake"
+	bool "rtcwake (6.4 kb)"
 	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  Enter a system sleep state until specified wakeup time.
+	Enter a system sleep state until specified wakeup time.
 config BUSYBOX_SCRIPT
-	bool "script"
+	bool "script (8 kb)"
 	default y
 	help
-	  The script makes typescript of terminal session.
+	The script makes typescript of terminal session.
 config BUSYBOX_SCRIPTREPLAY
-	bool "scriptreplay"
+	bool "scriptreplay (2.6 kb)"
 	default y
 	help
-	  This program replays a typescript, using timing information
-	  given by script -t.
+	This program replays a typescript, using timing information
+	given by script -t.
 config BUSYBOX_SETARCH
-	bool "setarch"
+	bool "setarch (3.4 kb)"
 	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  The linux32 utility is used to create a 32bit environment for the
-	  specified program (usually a shell). It only makes sense to have
-	  this util on a system that supports both 64bit and 32bit userland
-	  (like amd64/x86, ppc64/ppc, sparc64/sparc, etc...).
+	The linux32 utility is used to create a 32bit environment for the
+	specified program (usually a shell). It only makes sense to have
+	this util on a system that supports both 64bit and 32bit userland
+	(like amd64/x86, ppc64/ppc, sparc64/sparc, etc...).
 
 config BUSYBOX_LINUX32
-	bool "linux32"
+	bool "linux32 (3.2 kb)"
 	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  Alias to "setarch linux32".
+	Alias to "setarch linux32".
 
 config BUSYBOX_LINUX64
-	bool "linux64"
+	bool "linux64 (3.2 kb)"
 	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  Alias to "setarch linux64".
+	Alias to "setarch linux64".
 config BUSYBOX_SETPRIV
-	bool "setpriv"
+	bool "setpriv (3.4 kb)"
 	default y
 	select BUSYBOX_PLATFORM_LINUX
 	select BUSYBOX_LONG_OPTS
 	help
-	  Run a program with different Linux privilege settings.
-	  Requires kernel >= 3.5
+	Run a program with different Linux privilege settings.
+	Requires kernel >= 3.5
+
+config BUSYBOX_FEATURE_SETPRIV_DUMP
+	bool "Support dumping current privilege state"
+	default y
+	depends on BUSYBOX_SETPRIV
+	help
+	Enables the "--dump" switch to print out the current privilege
+	state. This is helpful for diagnosing problems.
+
+config BUSYBOX_FEATURE_SETPRIV_CAPABILITIES
+	bool "Support capabilities"
+	default y
+	depends on BUSYBOX_SETPRIV
+	help
+	Capabilities can be used to grant processes additional rights
+	without the necessity to always execute as the root user.
+	Enabling this option enables "--dump" to show information on
+	capabilities.
+
+config BUSYBOX_FEATURE_SETPRIV_CAPABILITY_NAMES
+	bool "Support capability names"
+	default y
+	depends on BUSYBOX_SETPRIV && BUSYBOX_FEATURE_SETPRIV_CAPABILITIES
+	help
+	Capabilities can be either referenced via a human-readble name,
+	e.g. "net_admin", or using their index, e.g. "cap_12". Enabling
+	this option allows using the human-readable names in addition to
+	the index-based names.
 config BUSYBOX_SETSID
-	bool "setsid"
+	bool "setsid (3.9 kb)"
 	default y
 	help
-	  setsid runs a program in a new session
+	setsid runs a program in a new session
 config BUSYBOX_SWAPON
-	bool "swapon"
+	bool "swapon (4.9 kb)"
 	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  This option enables the 'swapon' utility.
-	  Once you have created some swap space using 'mkswap', you also need
-	  to enable your swap space with the 'swapon' utility. The 'swapoff'
-	  utility is used, typically at system shutdown, to disable any swap
-	  space. If you are not using any swap space, you can leave this
-	  option disabled.
+	Once you have created some swap space using 'mkswap', you also need
+	to enable your swap space with the 'swapon' utility. The 'swapoff'
+	utility is used, typically at system shutdown, to disable any swap
+	space. If you are not using any swap space, you can leave this
+	option disabled.
 
 config BUSYBOX_FEATURE_SWAPON_DISCARD
 	bool "Support discard option -d"
 	default y
 	depends on BUSYBOX_SWAPON
 	help
-	  Enable support for discarding swap area blocks at swapon and/or as
-	  the kernel frees them. This option enables both the -d option on
-	  'swapon' and the 'discard' option for swap entries in /etc/fstab.
+	Enable support for discarding swap area blocks at swapon and/or as
+	the kernel frees them. This option enables both the -d option on
+	'swapon' and the 'discard' option for swap entries in /etc/fstab.
 
 config BUSYBOX_FEATURE_SWAPON_PRI
 	bool "Support priority option -p"
 	default y
 	depends on BUSYBOX_SWAPON
 	help
-	  Enable support for setting swap device priority in swapon.
+	Enable support for setting swap device priority in swapon.
 
 config BUSYBOX_SWAPOFF
-	bool "swapoff"
+	bool "swapoff (4.3 kb)"
 	default y
 	select BUSYBOX_PLATFORM_LINUX
+
+config BUSYBOX_FEATURE_SWAPONOFF_LABEL
+	bool "Support specifying devices by label or UUID"
+	default y
+	depends on BUSYBOX_SWAPON || BUSYBOX_SWAPOFF
+	select BUSYBOX_VOLUMEID
 	help
-	  This option enables the 'swapoff' utility.
+	This allows for specifying a device by label or uuid, rather than by
+	name. This feature utilizes the same functionality as blkid/findfs.
 config BUSYBOX_SWITCH_ROOT
-	bool "switch_root"
+	bool "switch_root (5.2 kb)"
 	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  The switch_root utility is used from initramfs to select a new
-	  root device. Under initramfs, you have to use this instead of
-	  pivot_root. (Stop reading here if you don't care why.)
+	The switch_root utility is used from initramfs to select a new
+	root device. Under initramfs, you have to use this instead of
+	pivot_root. (Stop reading here if you don't care why.)
+
+	Booting with initramfs extracts a gzipped cpio archive into rootfs
+	(which is a variant of ramfs/tmpfs). Because rootfs can't be moved
+	or unmounted*, pivot_root will not work from initramfs. Instead,
+	switch_root deletes everything out of rootfs (including itself),
+	does a mount --move that overmounts rootfs with the new root, and
+	then execs the specified init program.
 
-	  Booting with initramfs extracts a gzipped cpio archive into rootfs
-	  (which is a variant of ramfs/tmpfs). Because rootfs can't be moved
-	  or unmounted*, pivot_root will not work from initramfs. Instead,
-	  switch_root deletes everything out of rootfs (including itself),
-	  does a mount --move that overmounts rootfs with the new root, and
-	  then execs the specified init program.
+	* Because the Linux kernel uses rootfs internally as the starting
+	and ending point for searching through the kernel's doubly linked
+	list of active mount points. That's why.
 
-	  * Because the Linux kernel uses rootfs internally as the starting
-	  and ending point for searching through the kernel's doubly linked
-	  list of active mount points. That's why.
 config BUSYBOX_TASKSET
-	bool "taskset"
+	bool "taskset (4.1 kb)"
 	default y
 	help
-	  Retrieve or set a processes's CPU affinity.
-	  This requires sched_{g,s}etaffinity support in your libc.
+	Retrieve or set a processes's CPU affinity.
+	This requires sched_{g,s}etaffinity support in your libc.
 
 config BUSYBOX_FEATURE_TASKSET_FANCY
 	bool "Fancy output"
 	default y
 	depends on BUSYBOX_TASKSET
 	help
-	  Needed for machines with more than 32-64 CPUs:
-	  affinity parameter 0xHHHHHHHHHHHHHHHHHHHH can be arbitrarily long
-	  in this case. Otherwise, it is limited to sizeof(long).
+	Needed for machines with more than 32-64 CPUs:
+	affinity parameter 0xHHHHHHHHHHHHHHHHHHHH can be arbitrarily long
+	in this case. Otherwise, it is limited to sizeof(long).
 config BUSYBOX_UEVENT
-	bool "uevent"
+	bool "uevent (3.2 kb)"
 	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  uevent is a netlink listener for kernel uevent notifications
-	  sent via netlink. It is usually used for dynamic device creation.
+	uevent is a netlink listener for kernel uevent notifications
+	sent via netlink. It is usually used for dynamic device creation.
 config BUSYBOX_UMOUNT
-	bool "umount"
+	bool "umount (4.5 kb)"
 	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  When you want to remove a mounted filesystem from its current mount
-	  point, for example when you are shutting down the system, the
-	  'umount' utility is the tool to use. If you enabled the 'mount'
-	  utility, you almost certainly also want to enable 'umount'.
+	When you want to remove a mounted filesystem from its current mount
+	point, for example when you are shutting down the system, the
+	'umount' utility is the tool to use. If you enabled the 'mount'
+	utility, you almost certainly also want to enable 'umount'.
 
 config BUSYBOX_FEATURE_UMOUNT_ALL
-	bool "Support option -a"
+	bool "Support -a (unmount all)"
 	default y
 	depends on BUSYBOX_UMOUNT
 	help
-	  Support -a option to unmount all currently mounted filesystems.
+	Support -a option to unmount all currently mounted filesystems.
 config BUSYBOX_UNSHARE
-	bool "unshare"
+	bool "unshare (9.2 kb)"
 	default y
 	depends on !BUSYBOX_NOMMU
 	select BUSYBOX_PLATFORM_LINUX
 	select BUSYBOX_LONG_OPTS
 	help
-	  Run program with some namespaces unshared from parent.
+	Run program with some namespaces unshared from parent.
 config BUSYBOX_WALL
-	bool "wall"
+	bool "wall (2.5 kb)"
 	default y
 	depends on BUSYBOX_FEATURE_UTMP
 	help
-	  Write a message to all users that are logged in.
+	Write a message to all users that are logged in.
 
 comment "Common options for mount/umount"
 	depends on BUSYBOX_MOUNT || BUSYBOX_UMOUNT
@@ -899,29 +915,29 @@ config BUSYBOX_FEATURE_MOUNT_LOOP
 	default y
 	depends on BUSYBOX_MOUNT || BUSYBOX_UMOUNT
 	help
-	  Enabling this feature allows automatic mounting of files (containing
-	  filesystem images) via the linux kernel's loopback devices.
-	  The mount command will detect you are trying to mount a file instead
-	  of a block device, and transparently associate the file with a
-	  loopback device. The umount command will also free that loopback
-	  device.
+	Enabling this feature allows automatic mounting of files (containing
+	filesystem images) via the linux kernel's loopback devices.
+	The mount command will detect you are trying to mount a file instead
+	of a block device, and transparently associate the file with a
+	loopback device. The umount command will also free that loopback
+	device.
 
-	  You can still use the 'losetup' utility (to manually associate files
-	  with loop devices) if you need to do something advanced, such as
-	  specify an offset or cryptographic options to the loopback device.
-	  (If you don't want umount to free the loop device, use "umount -D".)
+	You can still use the 'losetup' utility (to manually associate files
+	with loop devices) if you need to do something advanced, such as
+	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 BUSYBOX_FEATURE_MOUNT_LOOP_CREATE
 	bool "Create new loopback devices if needed"
 	default y
 	depends on BUSYBOX_FEATURE_MOUNT_LOOP
 	help
-	  Linux kernels >= 2.6.24 support unlimited loopback devices. They are
-	  allocated for use when trying to use a loop device. The loop device
-	  must however exist.
+	Linux kernels >= 2.6.24 support unlimited loopback devices. They are
+	allocated for use when trying to use a loop device. The loop device
+	must however exist.
 
-	  This feature lets mount to try to create next /dev/loopN device
-	  if it does not find a free one.
+	This feature lets mount to try to create next /dev/loopN device
+	if it does not find a free one.
 
 config BUSYBOX_FEATURE_MTAB_SUPPORT
 	bool "Support old /etc/mtab file"
@@ -929,23 +945,23 @@ config BUSYBOX_FEATURE_MTAB_SUPPORT
 	depends on BUSYBOX_MOUNT || BUSYBOX_UMOUNT
 	select BUSYBOX_FEATURE_MOUNT_FAKE
 	help
-	  Historically, Unix systems kept track of the currently mounted
-	  partitions in the file "/etc/mtab". These days, the kernel exports
-	  the list of currently mounted partitions in "/proc/mounts", rendering
-	  the old mtab file obsolete. (In modern systems, /etc/mtab should be
-	  a symlink to /proc/mounts.)
-
-	  The only reason to have mount maintain an /etc/mtab file itself is if
-	  your stripped-down embedded system does not have a /proc directory.
-	  If you must use this, keep in mind it's inherently brittle (for
-	  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 writable, tends to get easily confused
-	  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.
+	Historically, Unix systems kept track of the currently mounted
+	partitions in the file "/etc/mtab". These days, the kernel exports
+	the list of currently mounted partitions in "/proc/mounts", rendering
+	the old mtab file obsolete. (In modern systems, /etc/mtab should be
+	a symlink to /proc/mounts.)
+
+	The only reason to have mount maintain an /etc/mtab file itself is if
+	your stripped-down embedded system does not have a /proc directory.
+	If you must use this, keep in mind it's inherently brittle (for
+	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 writable, tends to get easily confused
+	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.
 
 source "config/busybox/util-linux/volume_id/Config.in"
 
diff --git a/config/busybox/util-linux/volume_id/Config.in b/config/busybox/util-linux/volume_id/Config.in
index c40f584da..6d903a141 100644
--- a/config/busybox/util-linux/volume_id/Config.in
+++ b/config/busybox/util-linux/volume_id/Config.in
@@ -28,9 +28,9 @@ config BUSYBOX_FEATURE_VOLUMEID_EXFAT
 	default y
 	depends on BUSYBOX_VOLUMEID
 	help
-	  exFAT (extended FAT) is a proprietary file system designed especially
-	  for flash drives. It has many features from NTFS, but with less
-	  overhead. exFAT is used on most SDXC cards for consumer electronics.
+	exFAT (extended FAT) is a proprietary file system designed especially
+	for flash drives. It has many features from NTFS, but with less
+	overhead. exFAT is used on most SDXC cards for consumer electronics.
 config BUSYBOX_FEATURE_VOLUMEID_EXT
 	bool "Ext filesystem"
 	default y
@@ -40,10 +40,10 @@ config BUSYBOX_FEATURE_VOLUMEID_F2FS
 	default y
 	depends on BUSYBOX_VOLUMEID
 	help
-	  F2FS (aka Flash-Friendly File System) is a log-structured file system,
-	  which is adapted to newer forms of storage. F2FS also remedies some
-	  known issues of the older log structured file systems, such as high
-	  cleaning overhead.
+	F2FS (aka Flash-Friendly File System) is a log-structured file system,
+	which is adapted to newer forms of storage. F2FS also remedies some
+	known issues of the older log structured file systems, such as high
+	cleaning overhead.
 config BUSYBOX_FEATURE_VOLUMEID_FAT
 	bool "fat filesystem"
 	default y
@@ -72,21 +72,25 @@ config BUSYBOX_FEATURE_VOLUMEID_LUKS
 	bool "luks filesystem"
 	default y
 	depends on BUSYBOX_VOLUMEID
+config BUSYBOX_FEATURE_VOLUMEID_MINIX
+	bool "minix filesystem"
+	default y
+	depends on BUSYBOX_VOLUMEID
 config BUSYBOX_FEATURE_VOLUMEID_NILFS
 	bool "nilfs filesystem"
 	default y
 	depends on BUSYBOX_VOLUMEID
 	help
-	  NILFS is a New Implementation of a Log-Structured File System (LFS)
-	  that supports continuous snapshots. This provides features like
-	  versioning of the entire filesystem, restoration of files that
-	  were deleted a few minutes ago. NILFS keeps consistency like
-	  conventional LFS, so it provides quick recovery after system crashes.
+	NILFS is a New Implementation of a Log-Structured File System (LFS)
+	that supports continuous snapshots. This provides features like
+	versioning of the entire filesystem, restoration of files that
+	were deleted a few minutes ago. NILFS keeps consistency like
+	conventional LFS, so it provides quick recovery after system crashes.
 
-	  The possible use of NILFS includes versioning, tamper detection,
-	  SOX compliance logging, and so forth. It can serve as an alternative
-	  filesystem for Linux desktop environment, or as a basis of advanced
-	  storage appliances.
+	The possible use of NILFS includes versioning, tamper detection,
+	SOX compliance logging, and so forth. It can serve as an alternative
+	filesystem for Linux desktop environment, or as a basis of advanced
+	storage appliances.
 config BUSYBOX_FEATURE_VOLUMEID_NTFS
 	bool "ntfs filesystem"
 	default y
@@ -108,10 +112,10 @@ config BUSYBOX_FEATURE_VOLUMEID_SQUASHFS
 	default y
 	depends on BUSYBOX_VOLUMEID && BUSYBOX_FEATURE_BLKID_TYPE
 	help
-	  Squashfs is a compressed read-only filesystem for Linux. Squashfs is
-	  intended for general read-only filesystem use and in constrained block
-	  device/memory systems (e.g. embedded systems) where low overhead is
-	  needed.
+	Squashfs is a compressed read-only filesystem for Linux. Squashfs is
+	intended for general read-only filesystem use and in constrained block
+	device/memory systems (e.g. embedded systems) where low overhead is
+	needed.
 config BUSYBOX_FEATURE_VOLUMEID_SYSV
 	bool "sysv filesystem"
 	default y
@@ -121,8 +125,8 @@ config BUSYBOX_FEATURE_VOLUMEID_UBIFS
 	default y
 	depends on BUSYBOX_VOLUMEID
 	help
-	  UBIFS (Unsorted Block Image File System) is a file
-	  system for use with raw flash memory media.
+	UBIFS (Unsorted Block Image File System) is a file
+	system for use with raw flash memory media.
 config BUSYBOX_FEATURE_VOLUMEID_UDF
 	bool "udf filesystem"
 	default y
@@ -151,10 +155,6 @@ config BUSYBOX_FEATURE_VOLUMEID_UDF
 ###	bool "mac filesystem"
 ###	default y
 ###	depends on VOLUMEID
-### config FEATURE_VOLUMEID_MINIX
-###	bool "minix filesystem"
-###	default y
-###	depends on VOLUMEID
 ### config FEATURE_VOLUMEID_MSDOS
 ###	bool "msdos filesystem"
 ###	default y