busybox: sync Config.in files

The change was made with the following commands

	cd package/utils/busybox/config
	../convert_menuconfig.pl ~/git-repo/openwrt/openwrt/build_dir/target-mips_24kc_musl/busybox-1.30.1

convert_defaults.pl has no changes other than overwriting defaults for
BUSYBOX_DEFAULT_FEATURE_IPV6

Resolves FS#2146

Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>

25 files changed, 1225 insertions, 825 deletions

diff --git a/package/utils/busybox/config/Config.in b/package/utils/busybox/config/Config.in
index dc279c520b..74493aa475 100644
--- a/package/utils/busybox/config/Config.in
+++ b/package/utils/busybox/config/Config.in
@@ -8,7 +8,7 @@ config BUSYBOX_CONFIG_HAVE_DOT_CONFIG
 	bool
 	default BUSYBOX_DEFAULT_HAVE_DOT_CONFIG
 
-menu "Busybox Settings"
+menu "Settings"
 
 config BUSYBOX_CONFIG_DESKTOP
 	bool "Enable compatibility for full-blown desktop systems"
@@ -693,16 +693,17 @@ config BUSYBOX_CONFIG_EFENCE
 
 endchoice
 
-endmenu
-
 source libbb/Config.in
 
+endmenu
+
 comment "Applets"
 
 source archival/Config.in
 source coreutils/Config.in
 source console-tools/Config.in
 source debianutils/Config.in
+source klibc-utils/Config.in
 source editors/Config.in
 source findutils/Config.in
 source init/Config.in
diff --git a/package/utils/busybox/config/archival/Config.in b/package/utils/busybox/config/archival/Config.in
index 53e81e0cd9..64e4601a86 100644
--- a/package/utils/busybox/config/archival/Config.in
+++ b/package/utils/busybox/config/archival/Config.in
@@ -1,7 +1,7 @@
 # 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.
+# see docs/Kconfig-language.txt.
 #
 
 menu "Archival Utilities"
@@ -27,15 +27,13 @@ config BUSYBOX_CONFIG_FEATURE_SEAMLESS_Z
 	default BUSYBOX_DEFAULT_FEATURE_SEAMLESS_Z  # it is ancient
 
 config BUSYBOX_CONFIG_AR
-	bool "ar"
+	bool "ar (9.5 kb)"
 	default BUSYBOX_DEFAULT_AR  # 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.
 
-	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.
 
@@ -56,22 +54,22 @@ config BUSYBOX_CONFIG_FEATURE_AR_CREATE
 	help
 	This enables archive creation (-c and -r) with busybox ar.
 config BUSYBOX_CONFIG_UNCOMPRESS
-	bool "uncompress"
+	bool "uncompress (7.1 kb)"
 	default BUSYBOX_DEFAULT_UNCOMPRESS  # ancient
 	help
 	uncompress is used to decompress archives created by compress.
 	Not much used anymore, replaced by gzip/gunzip.
 config BUSYBOX_CONFIG_GUNZIP
-	bool "gunzip"
+	bool "gunzip (11 kb)"
 	default BUSYBOX_DEFAULT_GUNZIP
 	select BUSYBOX_CONFIG_FEATURE_GZIP_DECOMPRESS
 	help
 	gunzip is used to decompress archives created by gzip.
-	You can use the `-t' option to test the integrity of
+	You can use the '-t' option to test the integrity of
 	an archive, without decompressing it.
 
 config BUSYBOX_CONFIG_ZCAT
-	bool "zcat"
+	bool "zcat (24 kb)"
 	default BUSYBOX_DEFAULT_ZCAT
 	select BUSYBOX_CONFIG_FEATURE_GZIP_DECOMPRESS
 	help
@@ -82,7 +80,7 @@ config BUSYBOX_CONFIG_FEATURE_GUNZIP_LONG_OPTIONS
 	default BUSYBOX_DEFAULT_FEATURE_GUNZIP_LONG_OPTIONS
 	depends on (BUSYBOX_CONFIG_GUNZIP || BUSYBOX_CONFIG_ZCAT) && BUSYBOX_CONFIG_LONG_OPTS
 config BUSYBOX_CONFIG_BUNZIP2
-	bool "bunzip2"
+	bool "bunzip2 (8.7 kb)"
 	default BUSYBOX_DEFAULT_BUNZIP2
 	select BUSYBOX_CONFIG_FEATURE_BZIP2_DECOMPRESS
 	help
@@ -96,13 +94,13 @@ config BUSYBOX_CONFIG_BUNZIP2
 	should probably say N here.
 
 config BUSYBOX_CONFIG_BZCAT
-	bool "bzcat"
+	bool "bzcat (8.7 kb)"
 	default BUSYBOX_DEFAULT_BZCAT
 	select BUSYBOX_CONFIG_FEATURE_BZIP2_DECOMPRESS
 	help
 	Alias to "bunzip2 -c".
 config BUSYBOX_CONFIG_UNLZMA
-	bool "unlzma"
+	bool "unlzma (7.5 kb)"
 	default BUSYBOX_DEFAULT_UNLZMA
 	help
 	unlzma is a compression utility using the Lempel-Ziv-Markov chain
@@ -110,20 +108,11 @@ config BUSYBOX_CONFIG_UNLZMA
 	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.
-
 config BUSYBOX_CONFIG_LZCAT
-	bool "lzcat"
+	bool "lzcat (7.5 kb)"
 	default BUSYBOX_DEFAULT_LZCAT
 	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_CONFIG_LZMA
 	bool "lzma -d"
@@ -131,22 +120,14 @@ config BUSYBOX_CONFIG_LZMA
 	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_CONFIG_FEATURE_LZMA_FAST
-	bool "Optimize for speed"
-	default BUSYBOX_DEFAULT_FEATURE_LZMA_FAST
-	depends on BUSYBOX_CONFIG_UNLZMA || BUSYBOX_CONFIG_LZCAT || BUSYBOX_CONFIG_LZMA
-	help
-	This option reduces decompression time by about 25% at the cost of
-	a 1K bigger binary.
 config BUSYBOX_CONFIG_UNXZ
-	bool "unxz"
+	bool "unxz (13 kb)"
 	default BUSYBOX_DEFAULT_UNXZ
 	help
 	unxz is a unlzma successor.
 
 config BUSYBOX_CONFIG_XZCAT
-	bool "xzcat"
+	bool "xzcat (13 kb)"
 	default BUSYBOX_DEFAULT_XZCAT
 	help
 	Alias to "unxz -c".
@@ -158,7 +139,7 @@ config BUSYBOX_CONFIG_XZ
 	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_CONFIG_BZIP2
-	bool "bzip2"
+	bool "bzip2 (16 kb)"
 	default BUSYBOX_DEFAULT_BZIP2
 	help
 	bzip2 is a compression utility using the Burrows-Wheeler block
@@ -171,13 +152,21 @@ config BUSYBOX_CONFIG_BZIP2
 	should probably say N here.
 
 config BUSYBOX_CONFIG_BZIP2_SMALL
-	int "Trade size for speed (0:fast 9:slow)"
-	default BUSYBOX_DEFAULT_BZIP2_SMALL
+	int "Trade bytes for speed (0:fast, 9:small)"
+	default BUSYBOX_DEFAULT_BZIP2_SMALL  # all "fast or small" options default to small
 	range 0 9
 	depends on BUSYBOX_CONFIG_BZIP2
 	help
-	0 is faster but larger
-	9 is smaller but slower
+	Trade code size versus speed.
+	Approximate values with gcc-6.3.0 "bzip -9" compressing
+	linux-4.15.tar were:
+	value         time (sec)  code size (386)
+	9 (smallest)       70.11             7687
+	8                  67.93             8091
+	7                  67.88             8405
+	6                  67.78             8624
+	5                  67.05             9427
+	4-0 (fastest)      64.14            12083
 
 config BUSYBOX_CONFIG_FEATURE_BZIP2_DECOMPRESS
 	bool "Enable decompression"
@@ -188,7 +177,7 @@ config BUSYBOX_CONFIG_FEATURE_BZIP2_DECOMPRESS
 	This will be automatically selected if bunzip2 or bzcat is
 	enabled.
 config BUSYBOX_CONFIG_CPIO
-	bool "cpio"
+	bool "cpio (15 kb)"
 	default BUSYBOX_DEFAULT_CPIO
 	help
 	cpio is an archival utility program used to create, modify, and
@@ -216,7 +205,7 @@ config BUSYBOX_CONFIG_FEATURE_CPIO_P
 	help
 	Passthrough mode. Rarely used.
 config BUSYBOX_CONFIG_DPKG
-	bool "dpkg"
+	bool "dpkg (43 kb)"
 	default BUSYBOX_DEFAULT_DPKG
 	select BUSYBOX_CONFIG_FEATURE_SEAMLESS_GZ
 	help
@@ -226,7 +215,7 @@ config BUSYBOX_CONFIG_DPKG
 	This implementation of dpkg has a number of limitations,
 	you should use the official dpkg if possible.
 config BUSYBOX_CONFIG_DPKG_DEB
-	bool "dpkg_deb"
+	bool "dpkg-deb (30 kb)"
 	default BUSYBOX_DEFAULT_DPKG_DEB
 	select BUSYBOX_CONFIG_FEATURE_SEAMLESS_GZ
 	help
@@ -237,7 +226,7 @@ config BUSYBOX_CONFIG_DPKG_DEB
 	Unless you have a specific application which requires dpkg-deb,
 	say N here.
 config BUSYBOX_CONFIG_GZIP
-	bool "gzip"
+	bool "gzip (17 kb)"
 	default BUSYBOX_DEFAULT_GZIP
 	help
 	gzip is used to compress files.
@@ -279,22 +268,22 @@ config BUSYBOX_CONFIG_FEATURE_GZIP_DECOMPRESS
 	This will be automatically selected if gunzip or zcat is
 	enabled.
 config BUSYBOX_CONFIG_LZOP
-	bool "lzop"
+	bool "lzop (12 kb)"
 	default BUSYBOX_DEFAULT_LZOP
 	help
 	Lzop compression/decompresion.
 
 config BUSYBOX_CONFIG_UNLZOP
-	bool "unlzop"
+	bool "unlzop (13 kb)"
 	default BUSYBOX_DEFAULT_UNLZOP  # INCOMPAT: upstream lzop does not provide such tool
 	help
 	Lzop decompresion.
 
 config BUSYBOX_CONFIG_LZOPCAT
-	bool "lzopcat"
+	bool "lzopcat (13 kb)"
 	default BUSYBOX_DEFAULT_LZOPCAT  # INCOMPAT: upstream lzop does not provide such tool
 	help
-	Alias to "unlzop -c".
+	Alias to "lzop -dc".
 
 config BUSYBOX_CONFIG_LZOP_COMPR_HIGH
 	bool "lzop compression levels 7,8,9 (not very useful)"
@@ -305,17 +294,17 @@ config BUSYBOX_CONFIG_LZOP_COMPR_HIGH
 	are actually slower than gzip at equivalent compression ratios
 	and take up 3.2K of code.
 config BUSYBOX_CONFIG_RPM
-	bool "rpm"
+	bool "rpm (32 kb)"
 	default BUSYBOX_DEFAULT_RPM
 	help
 	Mini RPM applet - queries and extracts RPM packages.
 config BUSYBOX_CONFIG_RPM2CPIO
-	bool "rpm2cpio"
+	bool "rpm2cpio (21 kb)"
 	default BUSYBOX_DEFAULT_RPM2CPIO
 	help
 	Converts a RPM file into a CPIO archive.
 config BUSYBOX_CONFIG_TAR
-	bool "tar"
+	bool "tar (39 kb)"
 	default BUSYBOX_DEFAULT_TAR
 	help
 	tar is an archiving program. It's commonly used with gzip to
@@ -341,7 +330,7 @@ config BUSYBOX_CONFIG_FEATURE_TAR_AUTODETECT
 	tarballs. Currently it works only on files (not pipes etc).
 
 config BUSYBOX_CONFIG_FEATURE_TAR_FROM
-	bool "Enable -X (exclude from) and -T (include from) options)"
+	bool "Enable -X (exclude from) and -T (include from) options"
 	default BUSYBOX_DEFAULT_FEATURE_TAR_FROM
 	depends on BUSYBOX_CONFIG_TAR
 	help
@@ -403,7 +392,7 @@ config BUSYBOX_CONFIG_FEATURE_TAR_SELINUX
 	With this option busybox supports restoring SELinux labels
 	when extracting files from tar archives.
 config BUSYBOX_CONFIG_UNZIP
-	bool "unzip"
+	bool "unzip (26 kb)"
 	default BUSYBOX_DEFAULT_UNZIP
 	help
 	unzip will list or extract files from a ZIP archive,
@@ -436,4 +425,12 @@ config BUSYBOX_CONFIG_FEATURE_UNZIP_XZ
 	default BUSYBOX_DEFAULT_FEATURE_UNZIP_XZ
 	depends on BUSYBOX_CONFIG_FEATURE_UNZIP_CDF && BUSYBOX_CONFIG_DESKTOP
 
+config BUSYBOX_CONFIG_FEATURE_LZMA_FAST
+	bool "Optimize lzma for speed"
+	default BUSYBOX_DEFAULT_FEATURE_LZMA_FAST
+	depends on BUSYBOX_CONFIG_UNLZMA || BUSYBOX_CONFIG_LZCAT || BUSYBOX_CONFIG_LZMA || BUSYBOX_CONFIG_FEATURE_SEAMLESS_LZMA
+	help
+	This option reduces decompression time by about 25% at the cost of
+	a 1K bigger binary.
+
 endmenu
diff --git a/package/utils/busybox/config/console-tools/Config.in b/package/utils/busybox/config/console-tools/Config.in
index 69815efa57..9f8a257ebe 100644
--- a/package/utils/busybox/config/console-tools/Config.in
+++ b/package/utils/busybox/config/console-tools/Config.in
@@ -1,57 +1,57 @@
 # 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.
+# see docs/Kconfig-language.txt.
 #
 
 menu "Console Utilities"
 
 config BUSYBOX_CONFIG_CHVT
-	bool "chvt"
+	bool "chvt (2 kb)"
 	default BUSYBOX_DEFAULT_CHVT
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
 	This program is used to change to another terminal.
 	Example: chvt 4 (change to terminal /dev/tty4)
 config BUSYBOX_CONFIG_CLEAR
-	bool "clear"
+	bool "clear (tiny)"
 	default BUSYBOX_DEFAULT_CLEAR
 	help
 	This program clears the terminal screen.
 config BUSYBOX_CONFIG_DEALLOCVT
-	bool "deallocvt"
+	bool "deallocvt (1.9 kb)"
 	default BUSYBOX_DEFAULT_DEALLOCVT
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
 	This program deallocates unused virtual consoles.
 config BUSYBOX_CONFIG_DUMPKMAP
-	bool "dumpkmap"
+	bool "dumpkmap (1.6 kb)"
 	default BUSYBOX_DEFAULT_DUMPKMAP
 	select BUSYBOX_CONFIG_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.
 config BUSYBOX_CONFIG_FGCONSOLE
-	bool "fgconsole"
+	bool "fgconsole (1.5 kb)"
 	default BUSYBOX_DEFAULT_FGCONSOLE
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
 	This program prints active (foreground) console number.
 config BUSYBOX_CONFIG_KBD_MODE
-	bool "kbd_mode"
+	bool "kbd_mode (4.1 kb)"
 	default BUSYBOX_DEFAULT_KBD_MODE
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
 	This program reports and sets keyboard mode.
 config BUSYBOX_CONFIG_LOADFONT
-	bool "loadfont"
+	bool "loadfont (5.2 kb)"
 	default BUSYBOX_DEFAULT_LOADFONT
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
 	This program loads a console font from standard input.
 
 config BUSYBOX_CONFIG_SETFONT
-	bool "setfont"
+	bool "setfont (24 kb)"
 	default BUSYBOX_DEFAULT_SETFONT
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
@@ -85,27 +85,27 @@ config BUSYBOX_CONFIG_FEATURE_LOADFONT_RAW
 	default BUSYBOX_DEFAULT_FEATURE_LOADFONT_RAW
 	depends on BUSYBOX_CONFIG_LOADFONT || BUSYBOX_CONFIG_SETFONT
 config BUSYBOX_CONFIG_LOADKMAP
-	bool "loadkmap"
+	bool "loadkmap (1.8 kb)"
 	default BUSYBOX_DEFAULT_LOADKMAP
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
 	This program loads a keyboard translation table from
 	standard input.
 config BUSYBOX_CONFIG_OPENVT
-	bool "openvt"
+	bool "openvt (7.2 kb)"
 	default BUSYBOX_DEFAULT_OPENVT
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
 	This program is used to start a command on an unused
 	virtual terminal.
 config BUSYBOX_CONFIG_RESET
-	bool "reset"
+	bool "reset (345 bytes)"
 	default BUSYBOX_DEFAULT_RESET
 	help
 	This program is used to reset the terminal screen, if it
 	gets messed up.
 config BUSYBOX_CONFIG_RESIZE
-	bool "resize"
+	bool "resize (903 bytes)"
 	default BUSYBOX_DEFAULT_RESIZE
 	help
 	This program is used to (re)set the width and height of your current
@@ -121,32 +121,34 @@ config BUSYBOX_CONFIG_FEATURE_RESIZE_PRINT
 	E.g.:
 	COLUMNS=80;LINES=44;export COLUMNS LINES;
 config BUSYBOX_CONFIG_SETCONSOLE
-	bool "setconsole"
+	bool "setconsole (3.6 kb)"
 	default BUSYBOX_DEFAULT_SETCONSOLE
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
-	This program redirects the system console to another device,
+	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_CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS
 	bool "Enable long options"
 	default BUSYBOX_DEFAULT_FEATURE_SETCONSOLE_LONG_OPTIONS
 	depends on BUSYBOX_CONFIG_SETCONSOLE && BUSYBOX_CONFIG_LONG_OPTS
 config BUSYBOX_CONFIG_SETKEYCODES
-	bool "setkeycodes"
+	bool "setkeycodes (2.1 kb)"
 	default BUSYBOX_DEFAULT_SETKEYCODES
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
 	This program loads entries into the kernel's scancode-to-keycode
 	map, allowing unusual keyboards to generate usable keycodes.
 config BUSYBOX_CONFIG_SETLOGCONS
-	bool "setlogcons"
+	bool "setlogcons (1.8 kb)"
 	default BUSYBOX_DEFAULT_SETLOGCONS
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
 	This program redirects the output console of kernel messages.
 config BUSYBOX_CONFIG_SHOWKEY
-	bool "showkey"
+	bool "showkey (4.7 kb)"
 	default BUSYBOX_DEFAULT_SHOWKEY
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
diff --git a/package/utils/busybox/config/coreutils/Config.in b/package/utils/busybox/config/coreutils/Config.in
index 5a36d34204..76e59a571d 100644
--- a/package/utils/busybox/config/coreutils/Config.in
+++ b/package/utils/busybox/config/coreutils/Config.in
@@ -1,25 +1,32 @@
 # 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.
+# see docs/Kconfig-language.txt.
 #
 
 menu "Coreutils"
 
 config BUSYBOX_CONFIG_BASENAME
-	bool "basename"
+	bool "basename (438 bytes)"
 	default BUSYBOX_DEFAULT_BASENAME
 	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.
 config BUSYBOX_CONFIG_CAT
-	bool "cat"
+	bool "cat (5.6 kb)"
 	default BUSYBOX_DEFAULT_CAT
 	help
 	cat is used to concatenate files and print them to the standard
 	output. Enable this option if you wish to enable the 'cat' utility.
 
+config BUSYBOX_CONFIG_FEATURE_CATN
+	bool "Enable -n and -b options"
+	default BUSYBOX_DEFAULT_FEATURE_CATN
+	depends on BUSYBOX_CONFIG_CAT
+	help
+	-n numbers all output lines while -b numbers nonempty output lines.
+
 config BUSYBOX_CONFIG_FEATURE_CATV
 	bool "cat -v[etA]"
 	default BUSYBOX_DEFAULT_FEATURE_CATV
@@ -27,17 +34,17 @@ config BUSYBOX_CONFIG_FEATURE_CATV
 	help
 	Display nonprinting characters as escape sequences
 config BUSYBOX_CONFIG_CHGRP
-	bool "chgrp"
+	bool "chgrp (7.6 kb)"
 	default BUSYBOX_DEFAULT_CHGRP
 	help
 	chgrp is used to change the group ownership of files.
 config BUSYBOX_CONFIG_CHMOD
-	bool "chmod"
+	bool "chmod (5.5 kb)"
 	default BUSYBOX_DEFAULT_CHMOD
 	help
 	chmod is used to change the access permission of files.
 config BUSYBOX_CONFIG_CHOWN
-	bool "chown"
+	bool "chown (7.6 kb)"
 	default BUSYBOX_DEFAULT_CHOWN
 	help
 	chown is used to change the user and/or group ownership
@@ -48,24 +55,24 @@ config BUSYBOX_CONFIG_FEATURE_CHOWN_LONG_OPTIONS
 	default BUSYBOX_DEFAULT_FEATURE_CHOWN_LONG_OPTIONS
 	depends on BUSYBOX_CONFIG_CHOWN && BUSYBOX_CONFIG_LONG_OPTS
 config BUSYBOX_CONFIG_CHROOT
-	bool "chroot"
+	bool "chroot (3.7 kb)"
 	default BUSYBOX_DEFAULT_CHROOT
 	help
 	chroot is used to change the root directory and run a command.
-	The default command is `/bin/sh'.
+	The default command is '/bin/sh'.
 config BUSYBOX_CONFIG_CKSUM
-	bool "cksum"
+	bool "cksum (4.1 kb)"
 	default BUSYBOX_DEFAULT_CKSUM
 	help
 	cksum is used to calculate the CRC32 checksum of a file.
 config BUSYBOX_CONFIG_COMM
-	bool "comm"
+	bool "comm (4.2 kb)"
 	default BUSYBOX_DEFAULT_COMM
 	help
 	comm is used to compare two files line by line and return
 	a three-column output.
 config BUSYBOX_CONFIG_CP
-	bool "cp"
+	bool "cp (10 kb)"
 	default BUSYBOX_DEFAULT_CP
 	help
 	cp is used to copy files and directories.
@@ -77,14 +84,19 @@ config BUSYBOX_CONFIG_FEATURE_CP_LONG_OPTIONS
 	help
 	Enable long options.
 	Also add support for --parents option.
+
+config BUSYBOX_CONFIG_FEATURE_CP_REFLINK
+	bool "Enable --reflink[=auto]"
+	default BUSYBOX_DEFAULT_FEATURE_CP_REFLINK
+	depends on BUSYBOX_CONFIG_FEATURE_CP_LONG_OPTIONS
 config BUSYBOX_CONFIG_CUT
-	bool "cut"
+	bool "cut (5.8 kb)"
 	default BUSYBOX_DEFAULT_CUT
 	help
 	cut is used to print selected parts of lines from
 	each file to stdout.
 config BUSYBOX_CONFIG_DATE
-	bool "date"
+	bool "date (7 kb)"
 	default BUSYBOX_DEFAULT_DATE
 	help
 	date is used to set the system date or display the
@@ -101,8 +113,8 @@ config BUSYBOX_CONFIG_FEATURE_DATE_ISOFMT
 # defaults to "no": stat's nanosecond field is a bit non-portable
 config BUSYBOX_CONFIG_FEATURE_DATE_NANO
 	bool "Support %[num]N nanosecond format specifier"
-	default BUSYBOX_DEFAULT_FEATURE_DATE_NANO
-	depends on BUSYBOX_CONFIG_DATE  # syscall(__NR_clock_gettime)
+	default BUSYBOX_DEFAULT_FEATURE_DATE_NANO  # syscall(__NR_clock_gettime)
+	depends on BUSYBOX_CONFIG_DATE
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
 	Support %[num]N format specifier. Adds ~250 bytes of code.
@@ -123,7 +135,7 @@ config BUSYBOX_CONFIG_FEATURE_DATE_COMPAT
 	the same format. With it on, 'date DATE' additionally supports
 	MMDDhhmm[[YY]YY][.ss] format.
 config BUSYBOX_CONFIG_DD
-	bool "dd"
+	bool "dd (7.5 kb)"
 	default BUSYBOX_DEFAULT_DD
 	help
 	dd copies a file (from standard input to standard output,
@@ -135,7 +147,7 @@ config BUSYBOX_CONFIG_FEATURE_DD_SIGNAL_HANDLING
 	default BUSYBOX_DEFAULT_FEATURE_DD_SIGNAL_HANDLING
 	depends on BUSYBOX_CONFIG_DD
 	help
-	Sending a SIGUSR1 signal to a running `dd' process makes it
+	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.
 
@@ -153,7 +165,7 @@ config BUSYBOX_CONFIG_FEATURE_DD_THIRD_STATUS_LINE
 	elapsed time and speed.
 
 config BUSYBOX_CONFIG_FEATURE_DD_IBS_OBS
-	bool "Enable ibs, obs and conv options"
+	bool "Enable ibs, obs, iflag, oflag and conv options"
 	default BUSYBOX_DEFAULT_FEATURE_DD_IBS_OBS
 	depends on BUSYBOX_CONFIG_DD
 	help
@@ -167,7 +179,7 @@ config BUSYBOX_CONFIG_FEATURE_DD_STATUS
 	help
 	Enable support for status=noxfer/none option.
 config BUSYBOX_CONFIG_DF
-	bool "df"
+	bool "df (6.8 kb)"
 	default BUSYBOX_DEFAULT_DF
 	help
 	df reports the amount of disk space used and available
@@ -182,42 +194,40 @@ config BUSYBOX_CONFIG_FEATURE_DF_FANCY
 	-i Inodes
 	-B <SIZE> Blocksize
 config BUSYBOX_CONFIG_DIRNAME
-	bool "dirname"
+	bool "dirname (329 bytes)"
 	default BUSYBOX_DEFAULT_DIRNAME
 	help
 	dirname is used to strip a non-directory suffix from
 	a file name.
 config BUSYBOX_CONFIG_DOS2UNIX
-	bool "dos2unix"
+	bool "dos2unix (5.2 kb)"
 	default BUSYBOX_DEFAULT_DOS2UNIX
 	help
 	dos2unix is used to convert a text file from DOS format to
 	UNIX format, and vice versa.
 
 config BUSYBOX_CONFIG_UNIX2DOS
-	bool "unix2dos"
+	bool "unix2dos (5.2 kb)"
 	default BUSYBOX_DEFAULT_UNIX2DOS
 	help
 	unix2dos is used to convert a text file from UNIX format to
 	DOS format, and vice versa.
 config BUSYBOX_CONFIG_DU
-	bool "du (default blocksize of 512 bytes)"
+	bool "du (6.3 kb)"
 	default BUSYBOX_DEFAULT_DU
 	help
 	du is used to report the amount of disk space used
 	for specified files.
 
 config BUSYBOX_CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K
-	bool "Use a default blocksize of 1024 bytes (1K)"
+	bool "Use default blocksize of 1024 bytes (else it's 512 bytes)"
 	default BUSYBOX_DEFAULT_FEATURE_DU_DEFAULT_BLOCKSIZE_1K
 	depends on BUSYBOX_CONFIG_DU
-	help
-	Use a blocksize of (1K) instead of the default 512b.
 config BUSYBOX_CONFIG_ECHO
-	bool "echo (basic SuSv3 version taking no options)"
+	bool "echo (1.8 kb)"
 	default BUSYBOX_DEFAULT_ECHO
 	help
-	echo is used to print a specified string to stdout.
+	echo prints a specified string to stdout.
 
 # this entry also appears in shell/Config.in, next to the echo builtin
 config BUSYBOX_CONFIG_FEATURE_FANCY_ECHO
@@ -225,40 +235,25 @@ config BUSYBOX_CONFIG_FEATURE_FANCY_ECHO
 	default BUSYBOX_DEFAULT_FEATURE_FANCY_ECHO
 	depends on BUSYBOX_CONFIG_ECHO || BUSYBOX_CONFIG_ASH_ECHO || BUSYBOX_CONFIG_HUSH_ECHO
 config BUSYBOX_CONFIG_ENV
-	bool "env"
+	bool "env (4 kb)"
 	default BUSYBOX_DEFAULT_ENV
 	help
 	env is used to set an environment variable and run
 	a command; without options it displays the current
 	environment.
-
-config BUSYBOX_CONFIG_FEATURE_ENV_LONG_OPTIONS
-	bool "Enable long options"
-	default BUSYBOX_DEFAULT_FEATURE_ENV_LONG_OPTIONS
-	depends on BUSYBOX_CONFIG_ENV && BUSYBOX_CONFIG_LONG_OPTS
 config BUSYBOX_CONFIG_EXPAND
-	bool "expand"
+	bool "expand (5.1 kb)"
 	default BUSYBOX_DEFAULT_EXPAND
 	help
 	By default, convert all tabs to spaces.
 
-config BUSYBOX_CONFIG_FEATURE_EXPAND_LONG_OPTIONS
-	bool "Enable long options"
-	default BUSYBOX_DEFAULT_FEATURE_EXPAND_LONG_OPTIONS
-	depends on BUSYBOX_CONFIG_EXPAND && BUSYBOX_CONFIG_LONG_OPTS
-
 config BUSYBOX_CONFIG_UNEXPAND
-	bool "unexpand"
+	bool "unexpand (5.3 kb)"
 	default BUSYBOX_DEFAULT_UNEXPAND
 	help
 	By default, convert only leading sequences of blanks to tabs.
-
-config BUSYBOX_CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS
-	bool "Enable long options"
-	default BUSYBOX_DEFAULT_FEATURE_UNEXPAND_LONG_OPTIONS
-	depends on BUSYBOX_CONFIG_UNEXPAND && BUSYBOX_CONFIG_LONG_OPTS
 config BUSYBOX_CONFIG_EXPR
-	bool "expr"
+	bool "expr (6.6 kb)"
 	default BUSYBOX_DEFAULT_EXPR
 	help
 	expr is used to calculate numbers and print the result
@@ -273,27 +268,27 @@ config BUSYBOX_CONFIG_EXPR_MATH_SUPPORT_64
 	the applet slightly larger, but will allow computation with very
 	large numbers.
 config BUSYBOX_CONFIG_FACTOR
-	bool "factor"
+	bool "factor (2.7 kb)"
 	default BUSYBOX_DEFAULT_FACTOR
 	help
 	factor factorizes integers
 config BUSYBOX_CONFIG_FALSE
-	bool "false"
+	bool "false (tiny)"
 	default BUSYBOX_DEFAULT_FALSE
 	help
 	false returns an exit code of FALSE (1).
 config BUSYBOX_CONFIG_FOLD
-	bool "fold"
+	bool "fold (4.6 kb)"
 	default BUSYBOX_DEFAULT_FOLD
 	help
 	Wrap text to fit a specific width.
 config BUSYBOX_CONFIG_FSYNC
-	bool "fsync"
+	bool "fsync (3.6 kb)"
 	default BUSYBOX_DEFAULT_FSYNC
 	help
 	fsync is used to flush file-related cached blocks to disk.
 config BUSYBOX_CONFIG_HEAD
-	bool "head"
+	bool "head (3.8 kb)"
 	default BUSYBOX_DEFAULT_HEAD
 	help
 	head is used to print the first specified number of lines
@@ -304,24 +299,24 @@ config BUSYBOX_CONFIG_FEATURE_FANCY_HEAD
 	default BUSYBOX_DEFAULT_FEATURE_FANCY_HEAD
 	depends on BUSYBOX_CONFIG_HEAD
 config BUSYBOX_CONFIG_HOSTID
-	bool "hostid"
+	bool "hostid (286 bytes)"
 	default BUSYBOX_DEFAULT_HOSTID
 	help
 	hostid prints the numeric identifier (in hexadecimal) for
 	the current host.
 config BUSYBOX_CONFIG_ID
-	bool "id"
+	bool "id (7 kb)"
 	default BUSYBOX_DEFAULT_ID
 	help
 	id displays the current user and group ID names.
 
 config BUSYBOX_CONFIG_GROUPS
-	bool "groups"
+	bool "groups (6.7 kb)"
 	default BUSYBOX_DEFAULT_GROUPS
 	help
 	Print the group names associated with current user id.
 config BUSYBOX_CONFIG_INSTALL
-	bool "install"
+	bool "install (12 kb)"
 	default BUSYBOX_DEFAULT_INSTALL
 	help
 	Copy files and set attributes.
@@ -331,22 +326,22 @@ config BUSYBOX_CONFIG_FEATURE_INSTALL_LONG_OPTIONS
 	default BUSYBOX_DEFAULT_FEATURE_INSTALL_LONG_OPTIONS
 	depends on BUSYBOX_CONFIG_INSTALL && BUSYBOX_CONFIG_LONG_OPTS
 config BUSYBOX_CONFIG_LINK
-	bool "link"
+	bool "link (3.2 kb)"
 	default BUSYBOX_DEFAULT_LINK
 	help
 	link creates hard links between files.
 config BUSYBOX_CONFIG_LN
-	bool "ln"
+	bool "ln (4.9 kb)"
 	default BUSYBOX_DEFAULT_LN
 	help
 	ln is used to create hard or soft links between files.
 config BUSYBOX_CONFIG_LOGNAME
-	bool "logname"
+	bool "logname (1.1 kb)"
 	default BUSYBOX_DEFAULT_LOGNAME
 	help
 	logname is used to print the current user's login name.
 config BUSYBOX_CONFIG_LS
-	bool "ls"
+	bool "ls (14 kb)"
 	default BUSYBOX_DEFAULT_LS
 	help
 	ls is used to list the contents of directories.
@@ -410,31 +405,31 @@ config BUSYBOX_CONFIG_FEATURE_LS_COLOR_IS_DEFAULT
 	configurable, and the output may not be legible on
 	many output screens.
 config BUSYBOX_CONFIG_MD5SUM
-	bool "md5sum"
+	bool "md5sum (6.5 kb)"
 	default BUSYBOX_DEFAULT_MD5SUM
 	help
-	md5sum is used to print or check MD5 checksums.
+	Compute and check MD5 message digest
 
 config BUSYBOX_CONFIG_SHA1SUM
-	bool "sha1sum"
+	bool "sha1sum (5.9 kb)"
 	default BUSYBOX_DEFAULT_SHA1SUM
 	help
 	Compute and check SHA1 message digest
 
 config BUSYBOX_CONFIG_SHA256SUM
-	bool "sha256sum"
+	bool "sha256sum (7 kb)"
 	default BUSYBOX_DEFAULT_SHA256SUM
 	help
 	Compute and check SHA256 message digest
 
 config BUSYBOX_CONFIG_SHA512SUM
-	bool "sha512sum"
+	bool "sha512sum (7.4 kb)"
 	default BUSYBOX_DEFAULT_SHA512SUM
 	help
 	Compute and check SHA512 message digest
 
 config BUSYBOX_CONFIG_SHA3SUM
-	bool "sha3sum"
+	bool "sha3sum (6.1 kb)"
 	default BUSYBOX_DEFAULT_SHA3SUM
 	help
 	Compute and check SHA3 message digest
@@ -451,91 +446,81 @@ config BUSYBOX_CONFIG_FEATURE_MD5_SHA1_SUM_CHECK
 	against pre-calculated hash values.
 	-s and -w are useful options when verifying checksums.
 config BUSYBOX_CONFIG_MKDIR
-	bool "mkdir"
+	bool "mkdir (4.5 kb)"
 	default BUSYBOX_DEFAULT_MKDIR
 	help
 	mkdir is used to create directories with the specified names.
-
-config BUSYBOX_CONFIG_FEATURE_MKDIR_LONG_OPTIONS
-	bool "Enable long options"
-	default BUSYBOX_DEFAULT_FEATURE_MKDIR_LONG_OPTIONS
-	depends on BUSYBOX_CONFIG_MKDIR && BUSYBOX_CONFIG_LONG_OPTS
 config BUSYBOX_CONFIG_MKFIFO
-	bool "mkfifo"
+	bool "mkfifo (3.8 kb)"
 	default BUSYBOX_DEFAULT_MKFIFO
 	help
 	mkfifo is used to create FIFOs (named pipes).
 	The 'mknod' program can also create FIFOs.
 config BUSYBOX_CONFIG_MKNOD
-	bool "mknod"
+	bool "mknod (4.5 kb)"
 	default BUSYBOX_DEFAULT_MKNOD
 	help
 	mknod is used to create FIFOs or block/character special
 	files with the specified names.
 config BUSYBOX_CONFIG_MKTEMP
-	bool "mktemp"
+	bool "mktemp (4.2 kb)"
 	default BUSYBOX_DEFAULT_MKTEMP
 	help
 	mktemp is used to create unique temporary files
 config BUSYBOX_CONFIG_MV
-	bool "mv"
+	bool "mv (10 kb)"
 	default BUSYBOX_DEFAULT_MV
 	help
 	mv is used to move or rename files or directories.
-
-config BUSYBOX_CONFIG_FEATURE_MV_LONG_OPTIONS
-	bool "Enable long options"
-	default BUSYBOX_DEFAULT_FEATURE_MV_LONG_OPTIONS
-	depends on BUSYBOX_CONFIG_MV && BUSYBOX_CONFIG_LONG_OPTS
 config BUSYBOX_CONFIG_NICE
-	bool "nice"
+	bool "nice (2.1 kb)"
 	default BUSYBOX_DEFAULT_NICE
 	help
 	nice runs a program with modified scheduling priority.
 config BUSYBOX_CONFIG_NL
-	bool "nl"
+	bool "nl (4.6 kb)"
 	default BUSYBOX_DEFAULT_NL
 	help
 	nl is used to number lines of files.
 config BUSYBOX_CONFIG_NOHUP
-	bool "nohup"
+	bool "nohup (2 kb)"
 	default BUSYBOX_DEFAULT_NOHUP
 	help
 	run a command immune to hangups, with output to a non-tty.
 config BUSYBOX_CONFIG_NPROC
-	bool "nproc"
+	bool "nproc (3.7 kb)"
 	default BUSYBOX_DEFAULT_NPROC
 	help
 	Print number of CPUs
 config BUSYBOX_CONFIG_OD
-	bool "od"
+	bool "od (11 kb)"
 	default BUSYBOX_DEFAULT_OD
 	help
 	od is used to dump binary files in octal and other formats.
 config BUSYBOX_CONFIG_PASTE
-	bool "paste"
+	bool "paste (4.9 kb)"
 	default BUSYBOX_DEFAULT_PASTE
 	help
 	paste is used to paste lines of different files together
 	and write the result to stdout
 config BUSYBOX_CONFIG_PRINTENV
-	bool "printenv"
+	bool "printenv (1.3 kb)"
 	default BUSYBOX_DEFAULT_PRINTENV
 	help
 	printenv is used to print all or part of environment.
 config BUSYBOX_CONFIG_PRINTF
-	bool "printf"
+	bool "printf (3.8 kb)"
 	default BUSYBOX_DEFAULT_PRINTF
 	help
 	printf is used to format and print specified strings.
-	It's similar to `echo' except it has more options.
+	It's similar to 'echo' except it has more options.
 config BUSYBOX_CONFIG_PWD
-	bool "pwd"
+	bool "pwd (3.7 kb)"
 	default BUSYBOX_DEFAULT_PWD
 	help
 	pwd is used to print the current directory.
 config BUSYBOX_CONFIG_READLINK
-	bool "readlink"
+	bool "readlink (4 kb)"
 	default BUSYBOX_DEFAULT_READLINK
 	help
 	This program reads a symbolic link and returns the name
@@ -548,55 +533,47 @@ config BUSYBOX_CONFIG_FEATURE_READLINK_FOLLOW
 	help
 	Enable the readlink option (-f).
 config BUSYBOX_CONFIG_REALPATH
-	bool "realpath"
+	bool "realpath (1.6 kb)"
 	default BUSYBOX_DEFAULT_REALPATH
 	help
 	Return the canonicalized absolute pathname.
 	This isn't provided by GNU shellutils, but where else does it belong.
 config BUSYBOX_CONFIG_RM
-	bool "rm"
+	bool "rm (5.4 kb)"
 	default BUSYBOX_DEFAULT_RM
 	help
 	rm is used to remove files or directories.
 config BUSYBOX_CONFIG_RMDIR
-	bool "rmdir"
+	bool "rmdir (3.5 kb)"
 	default BUSYBOX_DEFAULT_RMDIR
 	help
 	rmdir is used to remove empty directories.
-
-config BUSYBOX_CONFIG_FEATURE_RMDIR_LONG_OPTIONS
-	bool "Enable long options"
-	default BUSYBOX_DEFAULT_FEATURE_RMDIR_LONG_OPTIONS
-	depends on BUSYBOX_CONFIG_RMDIR && BUSYBOX_CONFIG_LONG_OPTS
-	help
-	Support long options for the rmdir applet, including
-	--ignore-fail-on-non-empty for compatibility with GNU rmdir.
 config BUSYBOX_CONFIG_SEQ
-	bool "seq"
+	bool "seq (3.8 kb)"
 	default BUSYBOX_DEFAULT_SEQ
 	help
 	print a sequence of numbers
 config BUSYBOX_CONFIG_SHRED
-	bool "shred"
+	bool "shred (4.9 kb)"
 	default BUSYBOX_DEFAULT_SHRED
 	help
 	Overwrite a file to hide its contents, and optionally delete it
 config BUSYBOX_CONFIG_SHUF
-	bool "shuf"
+	bool "shuf (5.4 kb)"
 	default BUSYBOX_DEFAULT_SHUF
 	help
 	Generate random permutations
 config BUSYBOX_CONFIG_SLEEP
-	bool "sleep"
+	bool "sleep (2 kb)"
 	default BUSYBOX_DEFAULT_SLEEP
 	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
+		sleep 1d 2h 3m 15s
 	- fancy with fractional numbers:
-	    sleep 2.3s 4.5h sleeps for 16202.3 seconds
+		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.
 
@@ -606,32 +583,33 @@ config BUSYBOX_CONFIG_FEATURE_FANCY_SLEEP
 	depends on BUSYBOX_CONFIG_SLEEP
 	help
 	Allow sleep to pause for specified minutes, hours, and days.
-
-config BUSYBOX_CONFIG_FEATURE_FLOAT_SLEEP
-	bool "Enable fractional arguments"
-	default BUSYBOX_DEFAULT_FEATURE_FLOAT_SLEEP
-	depends on BUSYBOX_CONFIG_FEATURE_FANCY_SLEEP
-	help
-	Allow for fractional numeric parameters.
 config BUSYBOX_CONFIG_SORT
-	bool "sort"
+	bool "sort (7.7 kb)"
 	default BUSYBOX_DEFAULT_SORT
 	help
 	sort is used to sort lines of text in specified files.
 
 config BUSYBOX_CONFIG_FEATURE_SORT_BIG
-	bool "Full SuSv3 compliant sort (support -ktcsbdfiozgM)"
+	bool "Full SuSv3 compliant sort (support -ktcbdfiogM)"
 	default BUSYBOX_DEFAULT_FEATURE_SORT_BIG
 	depends on BUSYBOX_CONFIG_SORT
 	help
-	Without this, sort only supports -r, -u, and an integer version
+	Without this, sort only supports -rusz, 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
+
+config BUSYBOX_CONFIG_FEATURE_SORT_OPTIMIZE_MEMORY
+	bool "Use less memory (but might be slower)"
+	default BUSYBOX_DEFAULT_FEATURE_SORT_OPTIMIZE_MEMORY   # defaults to N since we are size-paranoid tribe
+	depends on BUSYBOX_CONFIG_SORT
+	help
+	Attempt to use less memory (by storing only one copy
+	of duplicated lines, and such). Useful if you work on huge files.
 config BUSYBOX_CONFIG_SPLIT
-	bool "split"
+	bool "split (5 kb)"
 	default BUSYBOX_DEFAULT_SPLIT
 	help
 	Split a file into pieces.
@@ -645,7 +623,7 @@ config BUSYBOX_CONFIG_FEATURE_SPLIT_FANCY
 	Supports additional suffixes 'b' for 512 bytes,
 	'g' for 1GiB for the -b option.
 config BUSYBOX_CONFIG_STAT
-	bool "stat"
+	bool "stat (11 kb)"
 	default BUSYBOX_DEFAULT_STAT
 	help
 	display file or filesystem status.
@@ -668,17 +646,17 @@ config BUSYBOX_CONFIG_FEATURE_STAT_FILESYSTEM
 	Without this, stat will not support the '-f' option to display
 	information about filesystem status.
 config BUSYBOX_CONFIG_STTY
-	bool "stty"
+	bool "stty (8.9 kb)"
 	default BUSYBOX_DEFAULT_STTY
 	help
 	stty is used to change and print terminal line settings.
 config BUSYBOX_CONFIG_SUM
-	bool "sum"
+	bool "sum (4 kb)"
 	default BUSYBOX_DEFAULT_SUM
 	help
 	checksum and count the blocks in a file
 config BUSYBOX_CONFIG_SYNC
-	bool "sync"
+	bool "sync (3.8 kb)"
 	default BUSYBOX_DEFAULT_SYNC
 	help
 	sync is used to flush filesystem buffers.
@@ -690,12 +668,12 @@ config BUSYBOX_CONFIG_FEATURE_SYNC_FANCY
 	sync -d FILE... executes fdatasync() on each FILE.
 	sync -f FILE... executes syncfs() on each FILE.
 config BUSYBOX_CONFIG_TAC
-	bool "tac"
+	bool "tac (3.9 kb)"
 	default BUSYBOX_DEFAULT_TAC
 	help
 	tac is used to concatenate and print files in reverse.
 config BUSYBOX_CONFIG_TAIL
-	bool "tail"
+	bool "tail (6.8 kb)"
 	default BUSYBOX_DEFAULT_TAIL
 	help
 	tail is used to print the last specified number of lines
@@ -707,13 +685,13 @@ config BUSYBOX_CONFIG_FEATURE_FANCY_TAIL
 	depends on BUSYBOX_CONFIG_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
+	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_CONFIG_TEE
-	bool "tee"
+	bool "tee (4.2 kb)"
 	default BUSYBOX_DEFAULT_TEE
 	help
 	tee is used to read from standard input and write
@@ -726,7 +704,7 @@ config BUSYBOX_CONFIG_FEATURE_TEE_USE_BLOCK_IO
 	help
 	Enable this option for a faster tee, at expense of size.
 config BUSYBOX_CONFIG_TEST
-	bool "test"
+	bool "test (4.1 kb)"
 	default BUSYBOX_DEFAULT_TEST
 	help
 	test is used to check file types and compare values,
@@ -752,13 +730,13 @@ config BUSYBOX_CONFIG_FEATURE_TEST_64
 	help
 	Enable 64-bit support in test.
 config BUSYBOX_CONFIG_TIMEOUT
-	bool "timeout"
+	bool "timeout (6 kb)"
 	default BUSYBOX_DEFAULT_TIMEOUT
 	help
 	Runs a program and watches it. If it does not terminate in
 	specified number of seconds, it is sent a signal.
 config BUSYBOX_CONFIG_TOUCH
-	bool "touch"
+	bool "touch (5.9 kb)"
 	default BUSYBOX_DEFAULT_TOUCH
 	help
 	touch is used to create or change the access and/or
@@ -779,7 +757,7 @@ config BUSYBOX_CONFIG_FEATURE_TOUCH_SUSV3
 	help
 	Enable touch to use a reference file or a given date/time argument.
 config BUSYBOX_CONFIG_TR
-	bool "tr"
+	bool "tr (5.1 kb)"
 	default BUSYBOX_DEFAULT_TR
 	help
 	tr is used to squeeze, and/or delete characters from standard
@@ -804,24 +782,24 @@ config BUSYBOX_CONFIG_FEATURE_TR_EQUIV
 	useful for cases when no other way of expressing a character
 	is possible.
 config BUSYBOX_CONFIG_TRUE
-	bool "true"
+	bool "true (tiny)"
 	default BUSYBOX_DEFAULT_TRUE
 	help
 	true returns an exit code of TRUE (0).
 config BUSYBOX_CONFIG_TRUNCATE
-	bool "truncate"
+	bool "truncate (4.2 kb)"
 	default BUSYBOX_DEFAULT_TRUNCATE
 	help
 	truncate truncates files to a given size. If a file does
 	not exist, it is created unless told otherwise.
 config BUSYBOX_CONFIG_TTY
-	bool "tty"
+	bool "tty (3.6 kb)"
 	default BUSYBOX_DEFAULT_TTY
 	help
 	tty is used to print the name of the current terminal to
 	standard output.
 config BUSYBOX_CONFIG_UNAME
-	bool "uname"
+	bool "uname (3.9 kb)"
 	default BUSYBOX_DEFAULT_UNAME
 	help
 	uname is used to print system information.
@@ -833,38 +811,44 @@ config BUSYBOX_CONFIG_UNAME_OSNAME
 	help
 	Sets the operating system name reported by uname -o.  The
 	default BUSYBOX_DEFAULT_UNAME_OSNAME "GNU/Linux".
+
+config BUSYBOX_CONFIG_BB_ARCH
+	bool "arch (1.1 kb)"
+	default BUSYBOX_DEFAULT_BB_ARCH
+	help
+	Same as uname -m.
 config BUSYBOX_CONFIG_UNIQ
-	bool "uniq"
+	bool "uniq (4.9 kb)"
 	default BUSYBOX_DEFAULT_UNIQ
 	help
 	uniq is used to remove duplicate lines from a sorted file.
 config BUSYBOX_CONFIG_UNLINK
-	bool "unlink"
+	bool "unlink (3.2 kb)"
 	default BUSYBOX_DEFAULT_UNLINK
 	help
 	unlink deletes a file by calling unlink()
 config BUSYBOX_CONFIG_USLEEP
-	bool "usleep"
+	bool "usleep (1.3 kb)"
 	default BUSYBOX_DEFAULT_USLEEP
 	help
 	usleep is used to pause for a specified number of microseconds.
 config BUSYBOX_CONFIG_UUDECODE
-	bool "uudecode"
+	bool "uudecode (5.8 kb)"
 	default BUSYBOX_DEFAULT_UUDECODE
 	help
 	uudecode is used to decode a uuencoded file.
 config BUSYBOX_CONFIG_BASE64
-	bool "base64"
+	bool "base64 (4.9 kb)"
 	default BUSYBOX_DEFAULT_BASE64
 	help
 	Base64 encode and decode
 config BUSYBOX_CONFIG_UUENCODE
-	bool "uuencode"
+	bool "uuencode (4.4 kb)"
 	default BUSYBOX_DEFAULT_UUENCODE
 	help
 	uuencode is used to uuencode a file.
 config BUSYBOX_CONFIG_WC
-	bool "wc"
+	bool "wc (4.5 kb)"
 	default BUSYBOX_DEFAULT_WC
 	help
 	wc is used to print the number of bytes, words, and lines,
@@ -877,37 +861,37 @@ config BUSYBOX_CONFIG_FEATURE_WC_LARGE
 	help
 	Use "unsigned long long" for counter variables.
 config BUSYBOX_CONFIG_WHO
-      bool "who"
-      default BUSYBOX_DEFAULT_WHO
-      depends on BUSYBOX_CONFIG_FEATURE_UTMP
-      help
-        who is used to show who is logged on.
+	bool "who (3.9 kb)"
+	default BUSYBOX_DEFAULT_WHO
+	depends on BUSYBOX_CONFIG_FEATURE_UTMP
+	help
+	Print users currently logged on.
 
 config BUSYBOX_CONFIG_W
-      bool "w"
-      default BUSYBOX_DEFAULT_W
-      depends on BUSYBOX_CONFIG_FEATURE_UTMP
-      help
-        w is used to show who is logged on.
+	bool "w (3.8 kb)"
+	default BUSYBOX_DEFAULT_W
+	depends on BUSYBOX_CONFIG_FEATURE_UTMP
+	help
+	Print users currently logged on.
 
 config BUSYBOX_CONFIG_USERS
-      bool "users"
-      default BUSYBOX_DEFAULT_USERS
-      depends on BUSYBOX_CONFIG_FEATURE_UTMP
-      help
-        Print users currently logged on.
+	bool "users (3.4 kb)"
+	default BUSYBOX_DEFAULT_USERS
+	depends on BUSYBOX_CONFIG_FEATURE_UTMP
+	help
+	Print users currently logged on.
 config BUSYBOX_CONFIG_WHOAMI
-	bool "whoami"
+	bool "whoami (3.2 kb)"
 	default BUSYBOX_DEFAULT_WHOAMI
 	help
 	whoami is used to print the username of the current
 	user id (same as id -un).
 config BUSYBOX_CONFIG_YES
-	bool "yes"
+	bool "yes (1.2 kb)"
 	default BUSYBOX_DEFAULT_YES
 	help
 	yes is used to repeatedly output a specific string, or
-	the default string `y'.
+	the default string 'y'.
 
 comment "Common options"
 
diff --git a/package/utils/busybox/config/debianutils/Config.in b/package/utils/busybox/config/debianutils/Config.in
index 137481c989..15abb08e63 100644
--- a/package/utils/busybox/config/debianutils/Config.in
+++ b/package/utils/busybox/config/debianutils/Config.in
@@ -1,18 +1,18 @@
 # 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.
+# see docs/Kconfig-language.txt.
 #
 
 menu "Debian Utilities"
 
 config BUSYBOX_CONFIG_PIPE_PROGRESS
-	bool "pipe_progress"
+	bool "pipe_progress (275 bytes)"
 	default BUSYBOX_DEFAULT_PIPE_PROGRESS
 	help
 	Display a dot to indicate pipe activity.
 config BUSYBOX_CONFIG_RUN_PARTS
-	bool "run-parts"
+	bool "run-parts (6.1 kb)"
 	default BUSYBOX_DEFAULT_RUN_PARTS
 	help
 	run-parts is a utility designed to run all the scripts in a directory.
@@ -38,9 +38,9 @@ config BUSYBOX_CONFIG_FEATURE_RUN_PARTS_FANCY
 	help
 	Support additional options:
 	-l --list print the names of the all matching files (not
-	            limited to executables), but don't actually run them.
+	limited to executables), but don't actually run them.
 config BUSYBOX_CONFIG_START_STOP_DAEMON
-	bool "start-stop-daemon"
+	bool "start-stop-daemon (12 kb)"
 	default BUSYBOX_DEFAULT_START_STOP_DAEMON
 	help
 	start-stop-daemon is used to control the creation and
@@ -61,7 +61,7 @@ config BUSYBOX_CONFIG_FEATURE_START_STOP_DAEMON_FANCY
 	-v|--verbose
 	-N|--nicelevel N
 config BUSYBOX_CONFIG_WHICH
-	bool "which"
+	bool "which (3.8 kb)"
 	default BUSYBOX_DEFAULT_WHICH
 	help
 	which is used to find programs in your PATH and
diff --git a/package/utils/busybox/config/e2fsprogs/Config.in b/package/utils/busybox/config/e2fsprogs/Config.in
index bc3403bd70..19713acd3e 100644
--- a/package/utils/busybox/config/e2fsprogs/Config.in
+++ b/package/utils/busybox/config/e2fsprogs/Config.in
@@ -1,31 +1,31 @@
 # 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.
+# see docs/Kconfig-language.txt.
 #
 
 menu "Linux Ext2 FS Progs"
 
 config BUSYBOX_CONFIG_CHATTR
-	bool "chattr"
+	bool "chattr (3.8 kb)"
 	default BUSYBOX_DEFAULT_CHATTR
 	help
 	chattr changes the file attributes on a second extended file system.
 config BUSYBOX_CONFIG_FSCK
-	bool "fsck"
+	bool "fsck (7.4 kb)"
 	default BUSYBOX_DEFAULT_FSCK
 	help
 	fsck is used to check and optionally repair one or more filesystems.
 	In actuality, fsck is simply a front-end for the various file system
 	checkers (fsck.fstype) available under Linux.
 config BUSYBOX_CONFIG_LSATTR
-	bool "lsattr"
+	bool "lsattr (5.5 kb)"
 	default BUSYBOX_DEFAULT_LSATTR
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
 	lsattr lists the file attributes on a second extended file system.
 config BUSYBOX_CONFIG_TUNE2FS
-	bool "tune2fs"
+	bool "tune2fs (4.4 kb)"
 	default BUSYBOX_DEFAULT_TUNE2FS  # off: it is too limited compared to upstream version
 	help
 	tune2fs allows the system administrator to adjust various tunable
diff --git a/package/utils/busybox/config/editors/Config.in b/package/utils/busybox/config/editors/Config.in
index 46723bea76..c0fbef1939 100644
--- a/package/utils/busybox/config/editors/Config.in
+++ b/package/utils/busybox/config/editors/Config.in
@@ -1,17 +1,16 @@
 # 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.
+# see docs/Kconfig-language.txt.
 #
 
 menu "Editors"
 
 config BUSYBOX_CONFIG_AWK
-	bool "awk"
+	bool "awk (23 kb)"
 	default BUSYBOX_DEFAULT_AWK
 	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_CONFIG_FEATURE_AWK_LIBM
 	bool "Enable math functions (requires libm)"
@@ -19,7 +18,7 @@ config BUSYBOX_CONFIG_FEATURE_AWK_LIBM
 	depends on BUSYBOX_CONFIG_AWK
 	help
 	Enable math functions of the Awk programming language.
-	NOTE: This will require libm to be present for linking.
+	NOTE: This requires libm to be present for linking.
 
 config BUSYBOX_CONFIG_FEATURE_AWK_GNU_EXTENSIONS
 	bool "Enable a few GNU extensions"
@@ -29,16 +28,16 @@ config BUSYBOX_CONFIG_FEATURE_AWK_GNU_EXTENSIONS
 	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);}' ...
+	This enables the use of awk library files.
+	Example: awk -f mylib.awk -e '{print myfunction($1);}' ...
 config BUSYBOX_CONFIG_CMP
-	bool "cmp"
+	bool "cmp (4.9 kb)"
 	default BUSYBOX_DEFAULT_CMP
 	help
 	cmp is used to compare two files and returns the result
 	to standard output.
 config BUSYBOX_CONFIG_DIFF
-	bool "diff"
+	bool "diff (13 kb)"
 	default BUSYBOX_DEFAULT_DIFF
 	help
 	diff compares two files or directories and outputs the
@@ -58,25 +57,25 @@ config BUSYBOX_CONFIG_FEATURE_DIFF_DIR
 	This option enables support for directory and subdirectory
 	comparison.
 config BUSYBOX_CONFIG_ED
-	bool "ed"
+	bool "ed (21 kb)"
 	default BUSYBOX_DEFAULT_ED
 	help
 	The original 1970's Unix text editor, from the days of teletypes.
 	Small, simple, evil. Part of SUSv3. If you're not already using
 	this, you don't need it.
 config BUSYBOX_CONFIG_PATCH
-	bool "patch"
+	bool "patch (9.4 kb)"
 	default BUSYBOX_DEFAULT_PATCH
 	help
 	Apply a unified diff formatted patch.
 config BUSYBOX_CONFIG_SED
-	bool "sed"
+	bool "sed (12 kb)"
 	default BUSYBOX_DEFAULT_SED
 	help
 	sed is used to perform text transformations on a file
 	or input from a pipeline.
 config BUSYBOX_CONFIG_VI
-	bool "vi"
+	bool "vi (23 kb)"
 	default BUSYBOX_DEFAULT_VI
 	help
 	'vi' is a text editor. More specifically, it is the One True
@@ -116,7 +115,7 @@ config BUSYBOX_CONFIG_FEATURE_VI_YANKMARK
 	default BUSYBOX_DEFAULT_FEATURE_VI_YANKMARK
 	depends on BUSYBOX_CONFIG_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_CONFIG_FEATURE_VI_SEARCH
 	bool "Enable search and replace cmds"
diff --git a/package/utils/busybox/config/findutils/Config.in b/package/utils/busybox/config/findutils/Config.in
index 0e9a1392f7..bebcbb39ef 100644
--- a/package/utils/busybox/config/findutils/Config.in
+++ b/package/utils/busybox/config/findutils/Config.in
@@ -1,13 +1,13 @@
 # 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.
+# see docs/Kconfig-language.txt.
 #
 
 menu "Finding Utilities"
 
 config BUSYBOX_CONFIG_FIND
-	bool "find"
+	bool "find (14 kb)"
 	default BUSYBOX_DEFAULT_FIND
 	help
 	find is used to search your system to find specified files.
@@ -51,6 +51,11 @@ config BUSYBOX_CONFIG_FEATURE_FIND_TYPE
 	Enable searching based on file type (file,
 	directory, socket, device, etc.).
 
+config BUSYBOX_CONFIG_FEATURE_FIND_EXECUTABLE
+	bool "Enable -executable: file is executable"
+	default BUSYBOX_DEFAULT_FEATURE_FIND_EXECUTABLE
+	depends on BUSYBOX_CONFIG_FIND
+
 config BUSYBOX_CONFIG_FEATURE_FIND_XDEV
 	bool "Enable -xdev: 'stay in filesystem'"
 	default BUSYBOX_DEFAULT_FEATURE_FIND_XDEV
@@ -138,6 +143,13 @@ config BUSYBOX_CONFIG_FEATURE_FIND_PRUNE
 	If the file is a directory, don't descend into it. Useful for
 	exclusion .svn and CVS directories.
 
+config BUSYBOX_CONFIG_FEATURE_FIND_QUIT
+	bool "Enable -quit: exit"
+	default BUSYBOX_DEFAULT_FEATURE_FIND_QUIT
+	depends on BUSYBOX_CONFIG_FIND
+	help
+	If this action is reached, 'find' exits.
+
 config BUSYBOX_CONFIG_FEATURE_FIND_DELETE
 	bool "Enable -delete: delete files/dirs"
 	default BUSYBOX_DEFAULT_FEATURE_FIND_DELETE
@@ -175,22 +187,22 @@ config BUSYBOX_CONFIG_FEATURE_FIND_LINKS
 	help
 	Support the 'find -links' option for matching number of links.
 config BUSYBOX_CONFIG_GREP
-	bool "grep"
+	bool "grep (8.6 kb)"
 	default BUSYBOX_DEFAULT_GREP
 	help
 	grep is used to search files for a specified pattern.
 
 config BUSYBOX_CONFIG_EGREP
-	bool "egrep"
+	bool "egrep (7.8 kb)"
 	default BUSYBOX_DEFAULT_EGREP
 	help
-	Alias to "grep -E"
+	Alias to "grep -E".
 
 config BUSYBOX_CONFIG_FGREP
-	bool "fgrep"
+	bool "fgrep (7.8 kb)"
 	default BUSYBOX_DEFAULT_FGREP
 	help
-	Alias to "grep -F"
+	Alias to "grep -F".
 
 config BUSYBOX_CONFIG_FEATURE_GREP_CONTEXT
 	bool "Enable before and after context flags (-A, -B and -C)"
@@ -201,7 +213,7 @@ config BUSYBOX_CONFIG_FEATURE_GREP_CONTEXT
 	context surrounding our matching lines.
 	Print the specified number of context lines (-C).
 config BUSYBOX_CONFIG_XARGS
-	bool "xargs"
+	bool "xargs (7.2 kb)"
 	default BUSYBOX_DEFAULT_XARGS
 	help
 	xargs is used to execute a specified command for
@@ -246,4 +258,14 @@ config BUSYBOX_CONFIG_FEATURE_XARGS_SUPPORT_REPL_STR
 	help
 	Support -I STR and -i[STR] options.
 
+config BUSYBOX_CONFIG_FEATURE_XARGS_SUPPORT_PARALLEL
+	bool "Enable -P N: processes to run in parallel"
+	default BUSYBOX_DEFAULT_FEATURE_XARGS_SUPPORT_PARALLEL
+	depends on BUSYBOX_CONFIG_XARGS
+
+config BUSYBOX_CONFIG_FEATURE_XARGS_SUPPORT_ARGS_FILE
+	bool "Enable -a FILE: use FILE instead of stdin"
+	default BUSYBOX_DEFAULT_FEATURE_XARGS_SUPPORT_ARGS_FILE
+	depends on BUSYBOX_CONFIG_XARGS
+
 endmenu
diff --git a/package/utils/busybox/config/init/Config.in b/package/utils/busybox/config/init/Config.in
index 00eb6175d1..fc6c916a68 100644
--- a/package/utils/busybox/config/init/Config.in
+++ b/package/utils/busybox/config/init/Config.in
@@ -1,13 +1,13 @@
 # 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.
+# see docs/Kconfig-language.txt.
 #
 
 menu "Init Utilities"
 
 config BUSYBOX_CONFIG_BOOTCHARTD
-	bool "bootchartd"
+	bool "bootchartd (10 kb)"
 	default BUSYBOX_DEFAULT_BOOTCHARTD
 	help
 	bootchartd is commonly used to profile the boot process
@@ -27,12 +27,12 @@ config BUSYBOX_CONFIG_FEATURE_BOOTCHARTD_BLOATED_HEADER
 	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`
+	"convenient" info into 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.
@@ -45,23 +45,34 @@ config BUSYBOX_CONFIG_FEATURE_BOOTCHARTD_CONFIG_FILE
 	Enable reading and parsing of $PWD/bootchartd.conf
 	and /etc/bootchartd.conf files.
 config BUSYBOX_CONFIG_HALT
-	bool "halt"
+	bool "halt (4 kb)"
 	default BUSYBOX_DEFAULT_HALT
 	help
 	Stop all processes and halt the system.
 
 config BUSYBOX_CONFIG_POWEROFF
-	bool "poweroff"
+	bool "poweroff (4 kb)"
 	default BUSYBOX_DEFAULT_POWEROFF
 	help
 	Stop all processes and power off the system.
 
 config BUSYBOX_CONFIG_REBOOT
-	bool "reboot"
+	bool "reboot (4 kb)"
 	default BUSYBOX_DEFAULT_REBOOT
 	help
 	Stop all processes and reboot the system.
 
+config BUSYBOX_CONFIG_FEATURE_WAIT_FOR_INIT
+	bool "Before signaling init, make sure it is ready for it"
+	default BUSYBOX_DEFAULT_FEATURE_WAIT_FOR_INIT
+	depends on BUSYBOX_CONFIG_HALT || BUSYBOX_CONFIG_POWEROFF || BUSYBOX_CONFIG_REBOOT
+	help
+	In rare cases, poweroff may be commanded by firmware to OS
+	even before init process exists. On Linux, this spawns
+	"/sbin/poweroff" very early. This option adds code
+	which checks that init is ready to receive poweroff
+	commands. Code size increase of ~80 bytes.
+
 config BUSYBOX_CONFIG_FEATURE_CALL_TELINIT
 	bool "Call telinit on shutdown and reboot"
 	default BUSYBOX_DEFAULT_FEATURE_CALL_TELINIT
@@ -82,7 +93,7 @@ config BUSYBOX_CONFIG_TELINIT_PATH
 	to facilitate proper shutdown, this path is to be used when
 	locating telinit executable.
 config BUSYBOX_CONFIG_INIT
-	bool "init"
+	bool "init (10 kb)"
 	default BUSYBOX_DEFAULT_INIT
 	select BUSYBOX_CONFIG_FEATURE_SYSLOG
 	help
diff --git a/package/utils/busybox/config/klibc-utils/Config.in b/package/utils/busybox/config/klibc-utils/Config.in
new file mode 100644
index 0000000000..95e15b6def
--- /dev/null
+++ b/package/utils/busybox/config/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 docs/Kconfig-language.txt.
+#
+
+menu "klibc-utils"
+
+config BUSYBOX_CONFIG_MINIPS
+	bool "minips (11 kb)"
+	default BUSYBOX_DEFAULT_MINIPS  # for god's sake, just use "ps" name in your scripts
+	help
+	Alias to "ps".
+config BUSYBOX_CONFIG_NUKE
+	bool "nuke (2.9 kb)"
+	default BUSYBOX_DEFAULT_NUKE
+	help
+	Alias to "rm -rf".
+config BUSYBOX_CONFIG_RESUME
+	bool "resume (3.2 kb)"
+	default BUSYBOX_DEFAULT_RESUME
+	help
+	Resume from saved "suspend-to-disk" image
+config BUSYBOX_CONFIG_RUN_INIT
+	bool "run-init (7.7 kb)"
+	default BUSYBOX_DEFAULT_RUN_INIT
+	select BUSYBOX_CONFIG_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/package/utils/busybox/config/libbb/Config.in b/package/utils/busybox/config/libbb/Config.in
index 5be8aedc88..f476e86073 100644
--- a/package/utils/busybox/config/libbb/Config.in
+++ b/package/utils/busybox/config/libbb/Config.in
@@ -1,10 +1,10 @@
 # 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.
+# see docs/Kconfig-language.txt.
 #
 
-menu "Busybox Library Tuning"
+comment "Library Tuning"
 
 config BUSYBOX_CONFIG_FEATURE_USE_BSS_TAIL
 	bool "Use the end of BSS page"
@@ -19,6 +19,7 @@ config BUSYBOX_CONFIG_FEATURE_USE_BSS_TAIL
 
 	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
@@ -36,8 +37,13 @@ config BUSYBOX_CONFIG_FEATURE_USE_BSS_TAIL
 	is known only after final link.
 
 	If you are getting a build error like this:
-	        appletlib.c:(.text.main+0xd): undefined reference to '_end'
+		appletlib.c:(.text.main+0xd): undefined reference to '_end'
 	disable this option.
+config BUSYBOX_CONFIG_FLOAT_DURATION
+	bool "Enable fractional duration arguments"
+	default BUSYBOX_DEFAULT_FLOAT_DURATION
+	help
+	Allow sleep N.NNN, top -d N.NNN etc.
 config BUSYBOX_CONFIG_FEATURE_RTMINMAX
 	bool "Support RTMIN[+n] and RTMAX[-n] signal names"
 	default BUSYBOX_DEFAULT_FEATURE_RTMINMAX
@@ -45,18 +51,29 @@ config BUSYBOX_CONFIG_FEATURE_RTMINMAX
 	Support RTMIN[+n] and RTMAX[-n] signal names
 	in kill, killall etc. This costs ~250 bytes.
 
+config BUSYBOX_CONFIG_FEATURE_RTMINMAX_USE_LIBC_DEFINITIONS
+	bool "Use the definitions of SIGRTMIN/SIGRTMAX provided by libc"
+	default BUSYBOX_DEFAULT_FEATURE_RTMINMAX_USE_LIBC_DEFINITIONS
+	depends on BUSYBOX_CONFIG_FEATURE_RTMINMAX
+	help
+	Some C libraries reserve a few real-time signals for internal
+	use, and adjust the values of SIGRTMIN/SIGRTMAX seen by
+	applications accordingly. Saying yes here means that a signal
+	name RTMIN+n will be interpreted according to the libc definition
+	of SIGRTMIN, and not the raw definition provided by the kernel.
+	This behavior matches "kill -l RTMIN+n" from bash.
+
 choice
 	prompt "Buffer allocation policy"
 	default BUSYBOX_CONFIG_FEATURE_BUFFERS_GO_ON_STACK
 	help
-	There are 3 ways BusyBox can handle buffer allocations:
+	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.
+	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.
+	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_CONFIG_FEATURE_BUFFERS_USE_MALLOC
 	bool "Allocate with Malloc"
@@ -84,7 +101,7 @@ config BUSYBOX_CONFIG_MD5_SMALL
 	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)
+	value               user times (sec)  text size (386)
 	0 (fastest)         1.1                6144
 	1                   1.4                5392
 	2                   3.0                5088
@@ -104,7 +121,7 @@ config BUSYBOX_CONFIG_FEATURE_FAST_TOP
 	bool "Faster /proc scanning code (+100 bytes)"
 	default BUSYBOX_DEFAULT_FEATURE_FAST_TOP  # all "fast or small" options default to small
 	help
-	This option makes top (and ps) ~20% faster (or 20% less CPU hungry),
+	This option makes top and ps ~20% faster (or 20% less CPU hungry),
 	but code size is slightly bigger.
 
 config BUSYBOX_CONFIG_FEATURE_ETC_NETWORKS
@@ -115,6 +132,18 @@ config BUSYBOX_CONFIG_FEATURE_ETC_NETWORKS
 	a rarely used feature which allows you to use names
 	instead of IP/mask pairs in route command.
 
+config BUSYBOX_CONFIG_FEATURE_ETC_SERVICES
+	bool "Consult /etc/services even for well-known ports"
+	default BUSYBOX_DEFAULT_FEATURE_ETC_SERVICES
+	help
+	Look up e.g. "telnet" and "http" in /etc/services file
+	instead of assuming ports 23 and 80.
+	This is almost never necessary (everybody uses standard ports),
+	and it makes sense to avoid reading this file.
+	If you disable this option, in the cases where port is explicitly
+	specified as a service name (e.g. "telnet HOST PORTNAME"),
+	it will still be looked up in /etc/services.
+
 config BUSYBOX_CONFIG_FEATURE_EDITING
 	bool "Command line editing"
 	default BUSYBOX_DEFAULT_FEATURE_EDITING
@@ -188,6 +217,11 @@ config BUSYBOX_CONFIG_FEATURE_EDITING_FANCY_PROMPT
 	Setting this option allows for prompts to use things like \w and
 	\$ and escape codes.
 
+config BUSYBOX_CONFIG_FEATURE_EDITING_WINCH
+	bool "Enable automatic tracking of window size changes"
+	default BUSYBOX_DEFAULT_FEATURE_EDITING_WINCH
+	depends on BUSYBOX_CONFIG_FEATURE_EDITING
+
 config BUSYBOX_CONFIG_FEATURE_EDITING_ASK_TERMINAL
 	bool "Query cursor position from terminal"
 	default BUSYBOX_DEFAULT_FEATURE_EDITING_ASK_TERMINAL
@@ -340,13 +374,17 @@ config BUSYBOX_CONFIG_FEATURE_VERBOSE_CP_MESSAGE
 	default BUSYBOX_DEFAULT_FEATURE_VERBOSE_CP_MESSAGE
 	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
+
+	$ 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
+
+	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_CONFIG_FEATURE_USE_SENDFILE
@@ -414,7 +452,4 @@ config BUSYBOX_CONFIG_FEATURE_HWIB
 	bool "Support infiniband HW"
 	default BUSYBOX_DEFAULT_FEATURE_HWIB
 	help
-	Support for printing infiniband addresses in
-	network applets.
-
-endmenu
+	Support for printing infiniband addresses in network applets.
diff --git a/package/utils/busybox/config/loginutils/Config.in b/package/utils/busybox/config/loginutils/Config.in
index 51bc1a1ad7..465fa519cb 100644
--- a/package/utils/busybox/config/loginutils/Config.in
+++ b/package/utils/busybox/config/loginutils/Config.in
@@ -1,7 +1,7 @@
 # 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.
+# see docs/Kconfig-language.txt.
 #
 
 menu "Login/Password Management Utilities"
@@ -93,27 +93,23 @@ config BUSYBOX_CONFIG_USE_BB_CRYPT_SHA
 	user which has password encrypted with these algorithms.
 
 config BUSYBOX_CONFIG_ADD_SHELL
-       bool "add-shell"
-       default BUSYBOX_DEFAULT_ADD_SHELL if BUSYBOX_CONFIG_DESKTOP
-       help
-         Add shells to /etc/shells.
+	bool "add-shell (3.1 kb)"
+	default BUSYBOX_DEFAULT_ADD_SHELL if BUSYBOX_CONFIG_DESKTOP
+	help
+	Add shells to /etc/shells.
 
 config BUSYBOX_CONFIG_REMOVE_SHELL
-       bool "remove-shell"
-       default BUSYBOX_DEFAULT_REMOVE_SHELL if BUSYBOX_CONFIG_DESKTOP
-       help
-         Remove shells from /etc/shells.
+	bool "remove-shell (3 kb)"
+	default BUSYBOX_DEFAULT_REMOVE_SHELL if BUSYBOX_CONFIG_DESKTOP
+	help
+	Remove shells from /etc/shells.
 config BUSYBOX_CONFIG_ADDGROUP
-	bool "addgroup"
+	bool "addgroup (8.6 kb)"
 	default BUSYBOX_DEFAULT_ADDGROUP
+	select BUSYBOX_CONFIG_LONG_OPTS
 	help
 	Utility for creating a new group account.
 
-config BUSYBOX_CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS
-	bool "Enable long options"
-	default BUSYBOX_DEFAULT_FEATURE_ADDGROUP_LONG_OPTIONS
-	depends on BUSYBOX_CONFIG_ADDGROUP && BUSYBOX_CONFIG_LONG_OPTS
-
 config BUSYBOX_CONFIG_FEATURE_ADDUSER_TO_GROUP
 	bool "Support adding users to groups"
 	default BUSYBOX_DEFAULT_FEATURE_ADDUSER_TO_GROUP
@@ -123,16 +119,12 @@ config BUSYBOX_CONFIG_FEATURE_ADDUSER_TO_GROUP
 	addgroup will add an existing user to an
 	existing group.
 config BUSYBOX_CONFIG_ADDUSER
-	bool "adduser"
+	bool "adduser (15 kb)"
 	default BUSYBOX_DEFAULT_ADDUSER
+	select BUSYBOX_CONFIG_LONG_OPTS
 	help
 	Utility for creating a new user account.
 
-config BUSYBOX_CONFIG_FEATURE_ADDUSER_LONG_OPTIONS
-	bool "Enable long options"
-	default BUSYBOX_DEFAULT_FEATURE_ADDUSER_LONG_OPTIONS
-	depends on BUSYBOX_CONFIG_ADDUSER && BUSYBOX_CONFIG_LONG_OPTS
-
 config BUSYBOX_CONFIG_FEATURE_CHECK_NAMES
 	bool "Enable sanity check on user/group names in adduser and addgroup"
 	default BUSYBOX_DEFAULT_FEATURE_CHECK_NAMES
@@ -168,7 +160,7 @@ config BUSYBOX_CONFIG_LAST_SYSTEM_ID
 	help
 	Last valid system uid or gid for adduser and addgroup
 config BUSYBOX_CONFIG_CHPASSWD
-	bool "chpasswd"
+	bool "chpasswd (18 kb)"
 	default BUSYBOX_DEFAULT_CHPASSWD
 	help
 	Reads a file of user name and password pairs from standard input
@@ -181,27 +173,27 @@ config BUSYBOX_CONFIG_FEATURE_DEFAULT_PASSWD_ALGO
 	help
 	Possible choices are "d[es]", "m[d5]", "s[ha256]" or "sha512".
 config BUSYBOX_CONFIG_CRYPTPW
-	bool "cryptpw"
+	bool "cryptpw (14 kb)"
 	default BUSYBOX_DEFAULT_CRYPTPW
 	help
 	Encrypts the given password with the crypt(3) libc function
 	using the given salt.
 
 config BUSYBOX_CONFIG_MKPASSWD
-	bool "mkpasswd"
+	bool "mkpasswd (15 kb)"
 	default BUSYBOX_DEFAULT_MKPASSWD
 	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.
 config BUSYBOX_CONFIG_DELUSER
-	bool "deluser"
+	bool "deluser (9.1 kb)"
 	default BUSYBOX_DEFAULT_DELUSER
 	help
 	Utility for deleting a user account.
 
 config BUSYBOX_CONFIG_DELGROUP
-	bool "delgroup"
+	bool "delgroup (6.4 kb)"
 	default BUSYBOX_DEFAULT_DELGROUP
 	help
 	Utility for deleting a group account.
@@ -214,7 +206,7 @@ config BUSYBOX_CONFIG_FEATURE_DEL_USER_FROM_GROUP
 	If called with two non-option arguments, deluser
 	or delgroup will remove an user from a specified group.
 config BUSYBOX_CONFIG_GETTY
-	bool "getty"
+	bool "getty (10 kb)"
 	default BUSYBOX_DEFAULT_GETTY
 	select BUSYBOX_CONFIG_FEATURE_SYSLOG
 	help
@@ -232,13 +224,13 @@ config BUSYBOX_CONFIG_GETTY
 	read -r login
 	exec /bin/login "$login"
 config BUSYBOX_CONFIG_LOGIN
-	bool "login"
+	bool "login (24 kb)"
 	default BUSYBOX_DEFAULT_LOGIN
 	select BUSYBOX_CONFIG_FEATURE_SYSLOG
 	help
 	login is used when signing onto a system.
 
-	Note that Busybox binary must be setuid root for this applet to
+	Note that busybox binary must be setuid root for this applet to
 	work properly.
 
 config BUSYBOX_CONFIG_LOGIN_SESSION_AS_CHILD
@@ -277,7 +269,7 @@ config BUSYBOX_CONFIG_FEATURE_SECURETTY
 	The file contains the device names of tty lines (one per line,
 	without leading /dev/) on which root is allowed to login.
 config BUSYBOX_CONFIG_PASSWD
-	bool "passwd"
+	bool "passwd (21 kb)"
 	default BUSYBOX_DEFAULT_PASSWD
 	select BUSYBOX_CONFIG_FEATURE_SYSLOG
 	help
@@ -286,7 +278,7 @@ config BUSYBOX_CONFIG_PASSWD
 	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
+	Note that busybox binary must be setuid root for this applet to
 	work properly.
 
 config BUSYBOX_CONFIG_FEATURE_PASSWD_WEAK_CHECK
@@ -296,7 +288,7 @@ config BUSYBOX_CONFIG_FEATURE_PASSWD_WEAK_CHECK
 	help
 	With this option passwd will refuse new passwords which are "weak".
 config BUSYBOX_CONFIG_SU
-	bool "su"
+	bool "su (19 kb)"
 	default BUSYBOX_DEFAULT_SU
 	select BUSYBOX_CONFIG_FEATURE_SYSLOG
 	help
@@ -320,19 +312,19 @@ config BUSYBOX_CONFIG_FEATURE_SU_BLANK_PW_NEEDS_SECURE_TTY
 	default BUSYBOX_DEFAULT_FEATURE_SU_BLANK_PW_NEEDS_SECURE_TTY
 	depends on BUSYBOX_CONFIG_SU
 config BUSYBOX_CONFIG_SULOGIN
-	bool "sulogin"
+	bool "sulogin (17 kb)"
 	default BUSYBOX_DEFAULT_SULOGIN
 	select BUSYBOX_CONFIG_FEATURE_SYSLOG
 	help
 	sulogin is invoked when the system goes into single user
 	mode (this is done through an entry in inittab).
 config BUSYBOX_CONFIG_VLOCK
-	bool "vlock"
+	bool "vlock (17 kb)"
 	default BUSYBOX_DEFAULT_VLOCK
 	help
 	Build the "vlock" applet which allows you to lock (virtual) terminals.
 
-	Note that Busybox binary must be setuid root for this applet to
+	Note that busybox binary must be setuid root for this applet to
 	work properly.
 
 endmenu
diff --git a/package/utils/busybox/config/mailutils/Config.in b/package/utils/busybox/config/mailutils/Config.in
index 9c2f20c995..a8632471a8 100644
--- a/package/utils/busybox/config/mailutils/Config.in
+++ b/package/utils/busybox/config/mailutils/Config.in
@@ -2,12 +2,12 @@
 menu "Mail Utilities"
 
 config BUSYBOX_CONFIG_MAKEMIME
-	bool "makemime"
+	bool "makemime (5.4 kb)"
 	default BUSYBOX_DEFAULT_MAKEMIME
 	help
 	Create MIME-formatted messages.
 config BUSYBOX_CONFIG_POPMAILDIR
-	bool "popmaildir"
+	bool "popmaildir (10 kb)"
 	default BUSYBOX_DEFAULT_POPMAILDIR
 	help
 	Simple yet powerful POP3 mail popper. Delivers content
@@ -23,7 +23,7 @@ config BUSYBOX_CONFIG_FEATURE_POPMAILDIR_DELIVERY
 	Allow to use a custom program for message actual delivery
 	(-M "prog [args...]").
 config BUSYBOX_CONFIG_REFORMIME
-	bool "reformime"
+	bool "reformime (7.5 kb)"
 	default BUSYBOX_DEFAULT_REFORMIME
 	help
 	Parse MIME-formatted messages.
@@ -36,7 +36,7 @@ config BUSYBOX_CONFIG_FEATURE_REFORMIME_COMPAT
 	Accept (for compatibility only) and ignore options
 	other than -x and -X.
 config BUSYBOX_CONFIG_SENDMAIL
-	bool "sendmail"
+	bool "sendmail (14 kb)"
 	default BUSYBOX_DEFAULT_SENDMAIL
 	help
 	Barebones sendmail.
diff --git a/package/utils/busybox/config/miscutils/Config.in b/package/utils/busybox/config/miscutils/Config.in
index 1f378206b1..dfd04fbd56 100644
--- a/package/utils/busybox/config/miscutils/Config.in
+++ b/package/utils/busybox/config/miscutils/Config.in
@@ -1,20 +1,20 @@
 # 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.
+# see docs/Kconfig-language.txt.
 #
 
 menu "Miscellaneous Utilities"
 
 config BUSYBOX_CONFIG_ADJTIMEX
-	bool "adjtimex"
+	bool "adjtimex (4.7 kb)"
 	default BUSYBOX_DEFAULT_ADJTIMEX
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
 	Adjtimex reads and optionally sets adjustment parameters for
 	the Linux clock adjustment algorithm.
 config BUSYBOX_CONFIG_BBCONFIG
-	bool "bbconfig"
+	bool "bbconfig (9.7 kb)"
 	default BUSYBOX_DEFAULT_BBCONFIG
 	help
 	The bbconfig applet will print the config file with which
@@ -33,8 +33,94 @@ config BUSYBOX_CONFIG_FEATURE_COMPRESS_BBCONFIG
 	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_CONFIG_BC
+	bool "bc (45 kb)"
+	default BUSYBOX_DEFAULT_BC
+	select BUSYBOX_CONFIG_FEATURE_DC_BIG
+	help
+	bc is a command-line, arbitrary-precision calculator with a
+	Turing-complete language. See the GNU bc manual
+	(https://www.gnu.org/software/bc/manual/bc.html) and bc spec
+	(http://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html).
+
+	This bc has five differences to the GNU bc:
+	  1) The period (.) is a shortcut for "last", as in the BSD bc.
+	  2) Arrays are copied before being passed as arguments to
+	     functions. This behavior is required by the bc spec.
+	  3) Arrays can be passed to the builtin "length" function to get
+	     the number of elements in the array. This prints "1":
+		a[0] = 0; length(a[])
+	  4) The precedence of the boolean "not" operator (!) is equal to
+	     that of the unary minus (-) negation operator. This still
+	     allows POSIX-compliant scripts to work while somewhat
+	     preserving expected behavior (versus C) and making parsing
+	     easier.
+	  5) "read()" accepts expressions, not only numeric literals.
+
+config BUSYBOX_CONFIG_DC
+	bool "dc (36 kb)"
+	default BUSYBOX_DEFAULT_DC
+	help
+	dc is a reverse-polish notation command-line calculator which
+	supports unlimited precision arithmetic. See the FreeBSD man page
+	(https://www.unix.com/man-page/FreeBSD/1/dc/) and GNU dc manual
+	(https://www.gnu.org/software/bc/manual/dc-1.05/html_mono/dc.html).
+
+	This dc has a few differences from the two above:
+	  1) When printing a byte stream (command "P"), this dc follows what
+	     the FreeBSD dc does.
+	  2) Implements the GNU extensions for divmod ("~") and
+	     modular exponentiation ("|").
+	  3) Implements all FreeBSD extensions, except for "J" and "M".
+	  4) Like the FreeBSD dc, this dc supports extended registers.
+	     However, they are implemented differently. When it encounters
+	     whitespace where a register should be, it skips the whitespace.
+	     If the character following is not a lowercase letter, an error
+	     is issued. Otherwise, the register name is parsed by the
+	     following regex: [a-z][a-z0-9_]*
+	     This generally means that register names will be surrounded by
+	     whitespace. Examples:
+		l idx s temp L index S temp2 < do_thing
+	     Also note that, like the FreeBSD dc, extended registers are not
+	     allowed unless the "-x" option is given.
+
+if BC || BUSYBOX_CONFIG_DC  # for menuconfig indenting
+
+config BUSYBOX_CONFIG_FEATURE_DC_BIG
+	bool "Use bc code base for dc (larger, more features)"
+	default BUSYBOX_DEFAULT_FEATURE_DC_BIG
+
+config BUSYBOX_CONFIG_FEATURE_DC_LIBM
+	bool "Enable power and exp functions (requires libm)"
+	default BUSYBOX_DEFAULT_FEATURE_DC_LIBM
+	depends on BUSYBOX_CONFIG_DC && !BUSYBOX_CONFIG_BC && !BUSYBOX_CONFIG_FEATURE_DC_BIG
+	help
+	Enable power and exp functions.
+	NOTE: This will require libm to be present for linking.
+
+config BUSYBOX_CONFIG_FEATURE_BC_INTERACTIVE
+	bool "Interactive mode (+4kb)"
+	default BUSYBOX_DEFAULT_FEATURE_BC_INTERACTIVE
+	depends on BUSYBOX_CONFIG_BC || (BUSYBOX_CONFIG_DC && BUSYBOX_CONFIG_FEATURE_DC_BIG)
+	help
+	Enable interactive mode: when started on a tty,
+	^C interrupts execution and returns to command line,
+	errors also return to command line instead of exiting,
+	line editing with history is available.
+
+	With this option off, input can still be taken from tty,
+	but all errors are fatal, ^C is fatal,
+	tty is treated exactly the same as any other
+	standard input (IOW: no line editing).
+
+config BUSYBOX_CONFIG_FEATURE_BC_LONG_OPTIONS
+	bool "Enable bc/dc long options"
+	default BUSYBOX_DEFAULT_FEATURE_BC_LONG_OPTIONS
+	depends on BUSYBOX_CONFIG_BC || (BUSYBOX_CONFIG_DC && BUSYBOX_CONFIG_FEATURE_DC_BIG)
+
+endif
 config BUSYBOX_CONFIG_BEEP
-	bool "beep"
+	bool "beep (2.4 kb)"
 	default BUSYBOX_DEFAULT_BEEP
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
@@ -56,7 +142,7 @@ config BUSYBOX_CONFIG_FEATURE_BEEP_LENGTH_MS
 	help
 	Length in ms for default beep.
 config BUSYBOX_CONFIG_CHAT
-	bool "chat"
+	bool "chat (6.3 kb)"
 	default BUSYBOX_DEFAULT_CHAT
 	help
 	Simple chat utility.
@@ -122,7 +208,7 @@ config BUSYBOX_CONFIG_FEATURE_CHAT_CLR_ABORT
 	help
 	Support CLR_ABORT directive.
 config BUSYBOX_CONFIG_CONSPY
-	bool "conspy"
+	bool "conspy (10 kb)"
 	default BUSYBOX_DEFAULT_CONSPY
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
@@ -131,7 +217,7 @@ config BUSYBOX_CONFIG_CONSPY
 	or        conspy -nd NUM  screenshot of console num
 	or        conspy -cs NUM  poor man's GNU screen like
 config BUSYBOX_CONFIG_CROND
-	bool "crond"
+	bool "crond (14 kb)"
 	default BUSYBOX_DEFAULT_CROND
 	select BUSYBOX_CONFIG_FEATURE_SYSLOG
 	help
@@ -139,12 +225,12 @@ config BUSYBOX_CONFIG_CROND
 	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
+		$ 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_CONFIG_FEATURE_CROND_D
-	bool "Support option -d to redirect output to stderr"
+	bool "Support -d (redirect output to stderr)"
 	depends on BUSYBOX_CONFIG_CROND
 	default BUSYBOX_DEFAULT_FEATURE_CROND_D
 	help
@@ -157,6 +243,22 @@ config BUSYBOX_CONFIG_FEATURE_CROND_CALL_SENDMAIL
 	help
 	Command output will be sent to corresponding user via email.
 
+config BUSYBOX_CONFIG_FEATURE_CROND_SPECIAL_TIMES
+	bool "Support special times (@reboot, @daily, etc) in crontabs"
+	default BUSYBOX_DEFAULT_FEATURE_CROND_SPECIAL_TIMES
+	depends on BUSYBOX_CONFIG_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_CONFIG_FEATURE_CROND_DIR
 	string "crond spool directory"
 	default BUSYBOX_DEFAULT_FEATURE_CROND_DIR
@@ -164,27 +266,13 @@ config BUSYBOX_CONFIG_FEATURE_CROND_DIR
 	help
 	Location of crond spool.
 config BUSYBOX_CONFIG_CRONTAB
-	bool "crontab"
+	bool "crontab (10 kb)"
 	default BUSYBOX_DEFAULT_CRONTAB
 	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
+	Note that busybox binary must be setuid root for this applet to
 	work properly.
-config BUSYBOX_CONFIG_DC
-	bool "dc"
-	default BUSYBOX_DEFAULT_DC
-	help
-	Dc is a reverse-polish desk calculator which supports unlimited
-	precision arithmetic.
-
-config BUSYBOX_CONFIG_FEATURE_DC_LIBM
-	bool "Enable power and exp functions (requires libm)"
-	default BUSYBOX_DEFAULT_FEATURE_DC_LIBM
-	depends on BUSYBOX_CONFIG_DC
-	help
-	Enable power and exp functions.
-	NOTE: This will require libm to be present for linking.
 config BUSYBOX_CONFIG_DEVFSD
 	bool "devfsd (obsolete)"
 	default BUSYBOX_DEFAULT_DEVFSD
@@ -219,8 +307,7 @@ config BUSYBOX_CONFIG_DEVFSD_FG_NP
 	depends on BUSYBOX_CONFIG_DEVFSD
 	help
 	-fg  Run the daemon in the foreground.
-	-np  Exit after parsing the configuration file.
-	       Do not poll for events.
+	-np  Exit after parsing config. Do not poll for events.
 
 config BUSYBOX_CONFIG_DEVFSD_VERBOSE
 	bool "Increases logging (and size)"
@@ -242,18 +329,18 @@ config BUSYBOX_CONFIG_FEATURE_DEVFS
 	/dev/loop0. If your /dev directory has normal names instead of
 	devfs names, you don't want this.
 config BUSYBOX_CONFIG_DEVMEM
-	bool "devmem"
+	bool "devmem (2.5 kb)"
 	default BUSYBOX_DEFAULT_DEVMEM
 	help
 	devmem is a small program that reads and writes from physical
 	memory using /dev/mem.
 config BUSYBOX_CONFIG_FBSPLASH
-	bool "fbsplash"
+	bool "fbsplash (26 kb)"
 	default BUSYBOX_DEFAULT_FBSPLASH
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
 	Shows splash image and progress bar on framebuffer device.
-	Can be used during boot phase of an embedded device. ~2kb.
+	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.
@@ -269,38 +356,37 @@ config BUSYBOX_CONFIG_FBSPLASH
 	    "NN" (ASCII decimal number) - percentage to show on progress bar
 	    "exit" - well you guessed it
 config BUSYBOX_CONFIG_FLASH_ERASEALL
-	bool "flash_eraseall"
+	bool "flash_eraseall (5.9 kb)"
 	default BUSYBOX_DEFAULT_FLASH_ERASEALL  # 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.
 config BUSYBOX_CONFIG_FLASH_LOCK
-	bool "flash_lock"
+	bool "flash_lock (2.1 kb)"
 	default BUSYBOX_DEFAULT_FLASH_LOCK  # 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.
 
 config BUSYBOX_CONFIG_FLASH_UNLOCK
-	bool "flash_unlock"
+	bool "flash_unlock (1.3 kb)"
 	default BUSYBOX_DEFAULT_FLASH_UNLOCK  # 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.
 config BUSYBOX_CONFIG_FLASHCP
-	bool "flashcp"
+	bool "flashcp (5.3 kb)"
 	default BUSYBOX_DEFAULT_FLASHCP  # 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.
 config BUSYBOX_CONFIG_HDPARM
-	bool "hdparm"
+	bool "hdparm (25 kb)"
 	default BUSYBOX_DEFAULT_HDPARM
 	select BUSYBOX_CONFIG_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)....
+	drives.
 
 config BUSYBOX_CONFIG_FEATURE_HDPARM_GET_IDENTITY
 	bool "Support obtaining detailed information directly from drives"
@@ -351,42 +437,47 @@ config BUSYBOX_CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA
 	depends on BUSYBOX_CONFIG_HDPARM
 	help
 	Enable the 'hdparm -d' option to get/set using_dma flag.
+config BUSYBOX_CONFIG_HEXEDIT
+	bool "hexedit (21 kb)"
+	default BUSYBOX_DEFAULT_HEXEDIT
+	help
+	Edit file in hexadecimal.
 config BUSYBOX_CONFIG_I2CGET
-	bool "i2cget"
+	bool "i2cget (5.5 kb)"
 	default BUSYBOX_DEFAULT_I2CGET
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
 	Read from I2C/SMBus chip registers.
 
 config BUSYBOX_CONFIG_I2CSET
-	bool "i2cset"
+	bool "i2cset (6.7 kb)"
 	default BUSYBOX_DEFAULT_I2CSET
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
 	Set I2C registers.
 
 config BUSYBOX_CONFIG_I2CDUMP
-	bool "i2cdump"
+	bool "i2cdump (7.1 kb)"
 	default BUSYBOX_DEFAULT_I2CDUMP
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
 	Examine I2C registers.
 
 config BUSYBOX_CONFIG_I2CDETECT
-	bool "i2cdetect"
+	bool "i2cdetect (7.1 kb)"
 	default BUSYBOX_DEFAULT_I2CDETECT
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
 	Detect I2C chips.
 
 config BUSYBOX_CONFIG_INOTIFYD
-	bool "inotifyd"
+	bool "inotifyd (3.6 kb)"
 	default BUSYBOX_DEFAULT_INOTIFYD  # doesn't build on Knoppix 5
 	help
 	Simple inotify daemon. Reports filesystem changes. Requires
 	kernel >= 2.6.13
 config BUSYBOX_CONFIG_LESS
-	bool "less"
+	bool "less (16 kb)"
 	default BUSYBOX_DEFAULT_LESS
 	help
 	'less' is a pager, meaning that it displays text files. It possesses
@@ -465,13 +556,29 @@ config BUSYBOX_CONFIG_FEATURE_LESS_LINENUMS
 	bool "Enable -N (dynamic switching of line numbers)"
 	default BUSYBOX_DEFAULT_FEATURE_LESS_LINENUMS
 	depends on BUSYBOX_CONFIG_FEATURE_LESS_DASHCMD
+
+config BUSYBOX_CONFIG_FEATURE_LESS_RAW
+	bool "Enable -R ('raw control characters')"
+	default BUSYBOX_DEFAULT_FEATURE_LESS_RAW
+	depends on BUSYBOX_CONFIG_FEATURE_LESS_DASHCMD
+	help
+	This is essential for less applet to work with tools that use colors
+	and paging, such as git, systemd tools or nmcli.
+
+config BUSYBOX_CONFIG_FEATURE_LESS_ENV
+	bool "Take options from $LESS environment variable"
+	default BUSYBOX_DEFAULT_FEATURE_LESS_ENV
+	depends on BUSYBOX_CONFIG_FEATURE_LESS_DASHCMD
+	help
+	This is essential for less applet to work with tools that use colors
+	and paging, such as git, systemd tools or nmcli.
 config BUSYBOX_CONFIG_LOCK
 	bool "lock"
 	default BUSYBOX_DEFAULT_LOCK
 	help
-	Small utility for using locks in scripts
+	  Small utility for using locks in scripts
 config BUSYBOX_CONFIG_LSSCSI
-	bool "lsscsi"
+	bool "lsscsi (2.5 kb)"
 	default BUSYBOX_DEFAULT_LSSCSI
 	#select PLATFORM_LINUX
 	help
@@ -480,7 +587,7 @@ config BUSYBOX_CONFIG_LSSCSI
 
 	This version uses sysfs (/sys/bus/scsi/devices) only.
 config BUSYBOX_CONFIG_MAKEDEVS
-	bool "makedevs"
+	bool "makedevs (9.2 kb)"
 	default BUSYBOX_DEFAULT_MAKEDEVS
 	help
 	'makedevs' is a utility used to create a batch of devices with
@@ -511,50 +618,50 @@ config BUSYBOX_CONFIG_FEATURE_MAKEDEVS_TABLE
 
 endchoice
 config BUSYBOX_CONFIG_MAN
-	bool "man"
+	bool "man (26 kb)"
 	default BUSYBOX_DEFAULT_MAN
 	help
 	Format and display manual pages.
 config BUSYBOX_CONFIG_MICROCOM
-	bool "microcom"
+	bool "microcom (5.7 kb)"
 	default BUSYBOX_DEFAULT_MICROCOM
 	help
 	The poor man's minicom utility for chatting with serial port devices.
 config BUSYBOX_CONFIG_MT
-	bool "mt"
+	bool "mt (2.5 kb)"
 	default BUSYBOX_DEFAULT_MT
 	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.
 config BUSYBOX_CONFIG_NANDWRITE
-	bool "nandwrite"
+	bool "nandwrite (4.8 kb)"
 	default BUSYBOX_DEFAULT_NANDWRITE
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
 	Write to the specified MTD device, with bad blocks awareness
 
 config BUSYBOX_CONFIG_NANDDUMP
-	bool "nanddump"
+	bool "nanddump (5.2 kb)"
 	default BUSYBOX_DEFAULT_NANDDUMP
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
 	Dump the content of raw NAND chip
 config BUSYBOX_CONFIG_PARTPROBE
-	bool "partprobe"
+	bool "partprobe (3.5 kb)"
 	default BUSYBOX_DEFAULT_PARTPROBE
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
 	Ask kernel to rescan partition table.
 config BUSYBOX_CONFIG_RAIDAUTORUN
-	bool "raidautorun"
+	bool "raidautorun (1.3 kb)"
 	default BUSYBOX_DEFAULT_RAIDAUTORUN
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
 	raidautorun tells the kernel md driver to
 	search and start RAID arrays.
 config BUSYBOX_CONFIG_READAHEAD
-	bool "readahead"
+	bool "readahead (1.5 kb)"
 	default BUSYBOX_DEFAULT_READAHEAD
 	depends on BUSYBOX_CONFIG_LFS
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
@@ -571,7 +678,7 @@ config BUSYBOX_CONFIG_READAHEAD
 	As readahead(2) blocks until each file has been read, it is best to
 	run this applet as a background job.
 config BUSYBOX_CONFIG_RFKILL
-	bool "rfkill"
+	bool "rfkill (4.4 kb)"
 	default BUSYBOX_DEFAULT_RFKILL # doesn't build on Ubuntu 9.04
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
@@ -583,41 +690,46 @@ config BUSYBOX_CONFIG_RFKILL
 	rfkill block|unblock wlan : block/unblock all wlan(wifi) devices
 
 config BUSYBOX_CONFIG_RUNLEVEL
-	bool "runlevel"
+	bool "runlevel (559 bytes)"
 	default BUSYBOX_DEFAULT_RUNLEVEL
 	depends on BUSYBOX_CONFIG_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.
 config BUSYBOX_CONFIG_RX
-	bool "rx"
+	bool "rx (2.9 kb)"
 	default BUSYBOX_DEFAULT_RX
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
 	Receive files using the Xmodem protocol.
+config BUSYBOX_CONFIG_SETFATTR
+	bool "setfattr (3.7 kb)"
+	default BUSYBOX_DEFAULT_SETFATTR
+	help
+	Set/delete extended attributes on files
 config BUSYBOX_CONFIG_SETSERIAL
-	bool "setserial"
+	bool "setserial (6.9 kb)"
 	default BUSYBOX_DEFAULT_SETSERIAL
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
 	Retrieve or set Linux serial port.
 config BUSYBOX_CONFIG_STRINGS
-	bool "strings"
+	bool "strings (4.6 kb)"
 	default BUSYBOX_DEFAULT_STRINGS
 	help
 	strings prints the printable character sequences for each file
 	specified.
 config BUSYBOX_CONFIG_TIME
-	bool "time"
+	bool "time (6.8 kb)"
 	default BUSYBOX_DEFAULT_TIME
 	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.
 config BUSYBOX_CONFIG_TTYSIZE
-	bool "ttysize"
+	bool "ttysize (432 bytes)"
 	default BUSYBOX_DEFAULT_TTYSIZE
 	help
 	A replacement for "stty size". Unlike stty, can report only width,
@@ -625,59 +737,59 @@ config BUSYBOX_CONFIG_TTYSIZE
 	error, but returns default 80x24.
 	Usage in shell scripts: width=`ttysize w`.
 config BUSYBOX_CONFIG_UBIATTACH
-	bool "ubiattach"
+	bool "ubiattach (4.2 kb)"
 	default BUSYBOX_DEFAULT_UBIATTACH
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
 	Attach MTD device to an UBI device.
 
 config BUSYBOX_CONFIG_UBIDETACH
-	bool "ubidetach"
+	bool "ubidetach (4.1 kb)"
 	default BUSYBOX_DEFAULT_UBIDETACH
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
 	Detach MTD device from an UBI device.
 
 config BUSYBOX_CONFIG_UBIMKVOL
-	bool "ubimkvol"
+	bool "ubimkvol (5.3 kb)"
 	default BUSYBOX_DEFAULT_UBIMKVOL
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
 	Create a UBI volume.
 
 config BUSYBOX_CONFIG_UBIRMVOL
-	bool "ubirmvol"
+	bool "ubirmvol (4.9 kb)"
 	default BUSYBOX_DEFAULT_UBIRMVOL
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
 	Delete a UBI volume.
 
 config BUSYBOX_CONFIG_UBIRSVOL
-	bool "ubirsvol"
+	bool "ubirsvol (4.2 kb)"
 	default BUSYBOX_DEFAULT_UBIRSVOL
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
 	Resize a UBI volume.
 
 config BUSYBOX_CONFIG_UBIUPDATEVOL
-	bool "ubiupdatevol"
+	bool "ubiupdatevol (5.2 kb)"
 	default BUSYBOX_DEFAULT_UBIUPDATEVOL
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
 	Update a UBI volume.
 config BUSYBOX_CONFIG_UBIRENAME
-	bool "ubirename"
+	bool "ubirename (2.4 kb)"
 	default BUSYBOX_DEFAULT_UBIRENAME
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
 	Utility to rename UBI volumes
 config BUSYBOX_CONFIG_VOLNAME
-	bool "volname"
+	bool "volname (1.6 kb)"
 	default BUSYBOX_DEFAULT_VOLNAME
 	help
 	Prints a CD-ROM volume name.
 config BUSYBOX_CONFIG_WATCHDOG
-	bool "watchdog"
+	bool "watchdog (5.3 kb)"
 	default BUSYBOX_DEFAULT_WATCHDOG
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
diff --git a/package/utils/busybox/config/modutils/Config.in b/package/utils/busybox/config/modutils/Config.in
index de88af6e72..cc2d20813b 100644
--- a/package/utils/busybox/config/modutils/Config.in
+++ b/package/utils/busybox/config/modutils/Config.in
@@ -1,7 +1,7 @@
 # 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.
+# see docs/Kconfig-language.txt.
 #
 
 menu "Linux Module Utilities"
@@ -35,7 +35,7 @@ config BUSYBOX_CONFIG_MODPROBE_SMALL
 	/etc/modules/$module_name files.
 
 config BUSYBOX_CONFIG_DEPMOD
-	bool "depmod"
+	bool "depmod (27 kb)"
 	default BUSYBOX_DEFAULT_DEPMOD
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
@@ -43,13 +43,13 @@ config BUSYBOX_CONFIG_DEPMOD
 	and modules.symbols) that contain dependency information
 	for modprobe.
 config BUSYBOX_CONFIG_INSMOD
-	bool "insmod"
+	bool "insmod (22 kb)"
 	default BUSYBOX_DEFAULT_INSMOD
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
 	insmod is used to load specified modules in the running kernel.
 config BUSYBOX_CONFIG_LSMOD
-	bool "lsmod"
+	bool "lsmod (1.9 kb)"
 	default BUSYBOX_DEFAULT_LSMOD
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
@@ -64,13 +64,13 @@ config BUSYBOX_CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT
 	the format of module-init-tools for Linux kernel 2.6.
 	Increases size somewhat.
 config BUSYBOX_CONFIG_MODINFO
-	bool "modinfo"
+	bool "modinfo (24 kb)"
 	default BUSYBOX_DEFAULT_MODINFO
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
 	Show information about a Linux Kernel module
 config BUSYBOX_CONFIG_MODPROBE
-	bool "modprobe"
+	bool "modprobe (28 kb)"
 	default BUSYBOX_DEFAULT_MODPROBE
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
@@ -88,7 +88,7 @@ config BUSYBOX_CONFIG_FEATURE_MODPROBE_BLACKLIST
 	hardware autodetection scripts to load modules like evdev, frame
 	buffer drivers etc.
 config BUSYBOX_CONFIG_RMMOD
-	bool "rmmod"
+	bool "rmmod (3.3 kb)"
 	default BUSYBOX_DEFAULT_RMMOD
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
@@ -202,12 +202,12 @@ config BUSYBOX_CONFIG_FEATURE_MODUTILS_ALIAS
 	help
 	Generate and parse modules.alias containing aliases for bus
 	identifiers:
-	    alias pcmcia:m*c*f03fn*pfn*pa*pb*pc*pd* parport_cs
+		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
+		alias padlock_aes aes
+		alias aes_i586 aes
+		alias aes_generic aes
 
 	Say Y if unsure.
 
@@ -218,7 +218,7 @@ config BUSYBOX_CONFIG_FEATURE_MODUTILS_SYMBOLS
 	help
 	Generate and parse modules.symbols containing aliases for
 	symbol_request() kernel calls, such as:
-	    alias symbol:usb_sg_init usbcore
+		alias symbol:usb_sg_init usbcore
 
 	Say Y if unsure.
 
diff --git a/package/utils/busybox/config/networking/Config.in b/package/utils/busybox/config/networking/Config.in
index f9063d367e..a7d3d5a2e1 100644
--- a/package/utils/busybox/config/networking/Config.in
+++ b/package/utils/busybox/config/networking/Config.in
@@ -1,7 +1,7 @@
 # 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.
+# see docs/Kconfig-language.txt.
 #
 
 menu "Networking Utilities"
@@ -9,7 +9,6 @@ menu "Networking Utilities"
 config BUSYBOX_CONFIG_FEATURE_IPV6
 	bool "Enable IPv6 support"
 	default BUSYBOX_DEFAULT_FEATURE_IPV6
-	depends on IPV6
 	help
 	Enable IPv6 support in busybox.
 	This adds IPv6 support in the networking applets.
@@ -48,21 +47,31 @@ config BUSYBOX_CONFIG_VERBOSE_RESOLUTION_ERRORS
 	"can't resolve 'hostname.com'" and want to know more.
 	This may increase size of your executable a bit.
 
+config BUSYBOX_CONFIG_FEATURE_TLS_SHA1
+	bool "In TLS code, support ciphers which use deprecated SHA1"
+	depends on BUSYBOX_CONFIG_TLS
+	default BUSYBOX_DEFAULT_FEATURE_TLS_SHA1
+	help
+	Selecting this option increases interoperability with very old
+	servers, but slightly increases code size.
+
+	Most TLS servers support SHA256 today (2018), since SHA1 is
+	considered possibly insecure (although not yet definitely broken).
+
 config BUSYBOX_CONFIG_ARP
-	bool "arp"
+	bool "arp (10 kb)"
 	default BUSYBOX_DEFAULT_ARP
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
 	Manipulate the system ARP cache.
 config BUSYBOX_CONFIG_ARPING
-	bool "arping"
+	bool "arping (9 kb)"
 	default BUSYBOX_DEFAULT_ARPING
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
 	Ping hosts by ARP packets.
-
 config BUSYBOX_CONFIG_BRCTL
-	bool "brctl"
+	bool "brctl (4.7 kb)"
 	default BUSYBOX_DEFAULT_BRCTL
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
@@ -75,9 +84,9 @@ config BUSYBOX_CONFIG_FEATURE_BRCTL_FANCY
 	depends on BUSYBOX_CONFIG_BRCTL
 	help
 	Add support for extended option like:
-	    setageing, setfd, sethello, setmaxage,
-	    setpathcost, setportprio, setbridgeprio,
-	    stp
+		setageing, setfd, sethello, setmaxage,
+		setpathcost, setportprio, setbridgeprio,
+		stp
 	This adds about 600 bytes.
 
 config BUSYBOX_CONFIG_FEATURE_BRCTL_SHOW
@@ -86,30 +95,31 @@ config BUSYBOX_CONFIG_FEATURE_BRCTL_SHOW
 	depends on BUSYBOX_CONFIG_BRCTL && BUSYBOX_CONFIG_FEATURE_BRCTL_FANCY
 	help
 	Add support for option which prints the current config:
-	    show
+		show
 config BUSYBOX_CONFIG_DNSD
-	bool "dnsd"
+	bool "dnsd (9.8 kb)"
 	default BUSYBOX_DEFAULT_DNSD
 	help
 	Small and static DNS server daemon.
 config BUSYBOX_CONFIG_ETHER_WAKE
-	bool "ether-wake"
+	bool "ether-wake (4.9 kb)"
 	default BUSYBOX_DEFAULT_ETHER_WAKE
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
 	Send a magic packet to wake up sleeping machines.
 config BUSYBOX_CONFIG_FTPD
-	bool "ftpd"
+	bool "ftpd (30 kb)"
 	default BUSYBOX_DEFAULT_FTPD
 	help
 	Simple FTP daemon. You have to run it via inetd.
 
 config BUSYBOX_CONFIG_FEATURE_FTPD_WRITE
-	bool "Enable upload commands"
+	bool "Enable -w (upload commands)"
 	default BUSYBOX_DEFAULT_FEATURE_FTPD_WRITE
 	depends on BUSYBOX_CONFIG_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_CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST
 	bool "Enable workaround for RFC-violating clients"
@@ -127,15 +137,21 @@ config BUSYBOX_CONFIG_FEATURE_FTPD_AUTHENTICATION
 	default BUSYBOX_DEFAULT_FEATURE_FTPD_AUTHENTICATION
 	depends on BUSYBOX_CONFIG_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_CONFIG_FTPGET
-	bool "ftpget"
+	bool "ftpget (7.8 kb)"
 	default BUSYBOX_DEFAULT_FTPGET
 	help
 	Retrieve a remote file via FTP.
 
 config BUSYBOX_CONFIG_FTPPUT
-	bool "ftpput"
+	bool "ftpput (7.5 kb)"
 	default BUSYBOX_DEFAULT_FTPPUT
 	help
 	Store a remote file via FTP.
@@ -145,18 +161,18 @@ config BUSYBOX_CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS
 	default BUSYBOX_DEFAULT_FEATURE_FTPGETPUT_LONG_OPTIONS
 	depends on BUSYBOX_CONFIG_LONG_OPTS && (BUSYBOX_CONFIG_FTPGET || BUSYBOX_CONFIG_FTPPUT)
 config BUSYBOX_CONFIG_HOSTNAME
-	bool "hostname"
+	bool "hostname (5.5 kb)"
 	default BUSYBOX_DEFAULT_HOSTNAME
 	help
 	Show or set the system's host name.
 
 config BUSYBOX_CONFIG_DNSDOMAINNAME
-	bool "dnsdomainname"
+	bool "dnsdomainname (3.6 kb)"
 	default BUSYBOX_DEFAULT_DNSDOMAINNAME
 	help
 	Alias to "hostname -d".
 config BUSYBOX_CONFIG_HTTPD
-	bool "httpd"
+	bool "httpd (32 kb)"
 	default BUSYBOX_DEFAULT_HTTPD
 	help
 	HTTP server.
@@ -181,7 +197,7 @@ config BUSYBOX_CONFIG_FEATURE_HTTPD_SETUID
 	different user.
 
 config BUSYBOX_CONFIG_FEATURE_HTTPD_BASIC_AUTH
-	bool "Enable Basic http Authentication"
+	bool "Enable HTTP authentication"
 	default BUSYBOX_DEFAULT_FEATURE_HTTPD_BASIC_AUTH
 	depends on BUSYBOX_CONFIG_HTTPD
 	help
@@ -191,7 +207,7 @@ config BUSYBOX_CONFIG_FEATURE_HTTPD_BASIC_AUTH
 	/adm:toor:PaSsWd
 
 config BUSYBOX_CONFIG_FEATURE_HTTPD_AUTH_MD5
-	bool "Support MD5 crypted passwords for http Authentication"
+	bool "Support MD5-encrypted passwords in HTTP authentication"
 	default BUSYBOX_DEFAULT_FEATURE_HTTPD_AUTH_MD5
 	depends on BUSYBOX_CONFIG_FEATURE_HTTPD_BASIC_AUTH
 	help
@@ -249,7 +265,7 @@ config BUSYBOX_CONFIG_FEATURE_HTTPD_ERROR_PAGES
 	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
+		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.
@@ -262,7 +278,7 @@ config BUSYBOX_CONFIG_FEATURE_HTTPD_PROXY
 	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/
+		P:/url/:http://hostname[:port]/new/path/
 	Then a request to /url/myfile will be forwarded to
 	http://hostname[:port]/new/path/myfile.
 
@@ -274,7 +290,7 @@ config BUSYBOX_CONFIG_FEATURE_HTTPD_GZIP
 	Makes httpd send files using GZIP content encoding if the
 	client supports it and a pre-compressed <file>.gz exists.
 config BUSYBOX_CONFIG_IFCONFIG
-	bool "ifconfig"
+	bool "ifconfig (12 kb)"
 	default BUSYBOX_DEFAULT_IFCONFIG
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
@@ -321,20 +337,20 @@ config BUSYBOX_CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS
 	Setting this will make ifconfig attempt to find the broadcast
 	automatically if the value '+' is used.
 config BUSYBOX_CONFIG_IFENSLAVE
-	bool "ifenslave"
+	bool "ifenslave (13 kb)"
 	default BUSYBOX_DEFAULT_IFENSLAVE
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
 	Userspace application to bind several interfaces
 	to a logical interface (use with kernel bonding driver).
 config BUSYBOX_CONFIG_IFPLUGD
-	bool "ifplugd"
+	bool "ifplugd (10 kb)"
 	default BUSYBOX_DEFAULT_IFPLUGD
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
 	Network interface plug detection daemon.
 config BUSYBOX_CONFIG_IFUP
-	bool "ifup"
+	bool "ifup (14 kb)"
 	default BUSYBOX_DEFAULT_IFUP
 	help
 	Activate the specified interfaces. This applet makes use
@@ -350,7 +366,7 @@ config BUSYBOX_CONFIG_IFUP
 	via busybox or via standalone utilities.
 
 config BUSYBOX_CONFIG_IFDOWN
-	bool "ifdown"
+	bool "ifdown (13 kb)"
 	default BUSYBOX_DEFAULT_IFDOWN
 	help
 	Deactivate the specified interfaces.
@@ -375,11 +391,11 @@ config BUSYBOX_CONFIG_FEATURE_IFUPDOWN_IP
 	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
+	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.
+	utilities, or enable these applets in busybox.
 
 config BUSYBOX_CONFIG_FEATURE_IFUPDOWN_IPV4
 	bool "Support IPv4"
@@ -414,103 +430,129 @@ config BUSYBOX_CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP
 	Otherwise, if udhcpc applet is enabled, it is used.
 	Otherwise, ifup/ifdown will have no support for DHCP.
 config BUSYBOX_CONFIG_INETD
-	bool "inetd"
+	bool "inetd (18 kb)"
 	default BUSYBOX_DEFAULT_INETD
 	select BUSYBOX_CONFIG_FEATURE_SYSLOG
 	help
 	Internet superserver daemon
 
 config BUSYBOX_CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO
-	bool "Support echo service"
+	bool "Support echo service on port 7"
 	default BUSYBOX_DEFAULT_FEATURE_INETD_SUPPORT_BUILTIN_ECHO
 	depends on BUSYBOX_CONFIG_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_CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD
-	bool "Support discard service"
+	bool "Support discard service on port 8"
 	default BUSYBOX_DEFAULT_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD
 	depends on BUSYBOX_CONFIG_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_CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME
-	bool "Support time service"
+	bool "Support time service on port 37"
 	default BUSYBOX_DEFAULT_FEATURE_INETD_SUPPORT_BUILTIN_TIME
 	depends on BUSYBOX_CONFIG_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_CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME
-	bool "Support daytime service"
+	bool "Support daytime service on port 13"
 	default BUSYBOX_DEFAULT_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME
 	depends on BUSYBOX_CONFIG_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_CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN
-	bool "Support chargen service"
+	bool "Support chargen service on port 19"
 	default BUSYBOX_DEFAULT_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN
 	depends on BUSYBOX_CONFIG_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_CONFIG_FEATURE_INETD_RPC
+	bool "Support RPC services"
+	default BUSYBOX_DEFAULT_FEATURE_INETD_RPC  # very rarely used, and needs Sun RPC support in libc
+	depends on BUSYBOX_CONFIG_INETD
+	help
+	Support Sun-RPC based services
 config BUSYBOX_CONFIG_IP
-	bool "ip"
+	bool "ip (35 kb)"
 	default BUSYBOX_DEFAULT_IP
 	select BUSYBOX_CONFIG_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.
+	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_CONFIG_IPADDR
-	bool "ipaddr"
+	bool "ipaddr (14 kb)"
 	default BUSYBOX_DEFAULT_IPADDR
 	select BUSYBOX_CONFIG_FEATURE_IP_ADDRESS
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
-	Support short form of ip addr: ipaddr
+	Short form of "ip addr"
 
 config BUSYBOX_CONFIG_IPLINK
-	bool "iplink"
+	bool "iplink (17 kb)"
 	default BUSYBOX_DEFAULT_IPLINK
 	select BUSYBOX_CONFIG_FEATURE_IP_LINK
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
-	Support short form of ip link: iplink
+	Short form of "ip link"
 
 config BUSYBOX_CONFIG_IPROUTE
-	bool "iproute"
+	bool "iproute (15 kb)"
 	default BUSYBOX_DEFAULT_IPROUTE
 	select BUSYBOX_CONFIG_FEATURE_IP_ROUTE
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
-	Support short form of ip route: iproute
+	Short form of "ip route"
 
 config BUSYBOX_CONFIG_IPTUNNEL
-	bool "iptunnel"
+	bool "iptunnel (9.6 kb)"
 	default BUSYBOX_DEFAULT_IPTUNNEL
 	select BUSYBOX_CONFIG_FEATURE_IP_TUNNEL
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
-	Support short form of ip tunnel: iptunnel
+	Short form of "ip tunnel"
 
 config BUSYBOX_CONFIG_IPRULE
-	bool "iprule"
+	bool "iprule (10 kb)"
 	default BUSYBOX_DEFAULT_IPRULE
 	select BUSYBOX_CONFIG_FEATURE_IP_RULE
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
-	Support short form of ip rule: iprule
+	Short form of "ip rule"
 
 config BUSYBOX_CONFIG_IPNEIGH
-	bool "ipneigh"
+	bool "ipneigh (8.3 kb)"
 	default BUSYBOX_DEFAULT_IPNEIGH
 	select BUSYBOX_CONFIG_FEATURE_IP_NEIGH
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
-	Support short form of ip neigh: ipneigh
+	Short form of "ip neigh"
 
 config BUSYBOX_CONFIG_FEATURE_IP_ADDRESS
 	bool "ip address"
@@ -571,7 +613,7 @@ config BUSYBOX_CONFIG_FEATURE_IP_RARE_PROTOCOLS
 	Ethernet, wireless, infrared, ppp/slip, ip tunnelling
 	link types are supported without this option selected.
 config BUSYBOX_CONFIG_IPCALC
-	bool "ipcalc"
+	bool "ipcalc (4.4 kb)"
 	default BUSYBOX_DEFAULT_IPCALC
 	help
 	ipcalc takes an IP address and netmask and calculates the
@@ -590,14 +632,14 @@ config BUSYBOX_CONFIG_FEATURE_IPCALC_FANCY
 	Adds the options hostname, prefix and silent to the output of
 	"ipcalc".
 config BUSYBOX_CONFIG_FAKEIDENTD
-	bool "fakeidentd"
+	bool "fakeidentd (8.7 kb)"
 	default BUSYBOX_DEFAULT_FAKEIDENTD
 	select BUSYBOX_CONFIG_FEATURE_SYSLOG
 	help
 	fakeidentd listens on the ident port and returns a predefined
 	fake value on any query.
 config BUSYBOX_CONFIG_NAMEIF
-	bool "nameif"
+	bool "nameif (6.6 kb)"
 	default BUSYBOX_DEFAULT_NAMEIF
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	select BUSYBOX_CONFIG_FEATURE_SYSLOG
@@ -609,8 +651,8 @@ config BUSYBOX_CONFIG_NAMEIF
 	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
+		# Comment
+		new_interface_name  XX:XX:XX:XX:XX:XX
 
 config BUSYBOX_CONFIG_FEATURE_NAMEIF_EXTENDED
 	bool "Extended nameif"
@@ -620,34 +662,40 @@ config BUSYBOX_CONFIG_FEATURE_NAMEIF_EXTENDED
 	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
+		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_CONFIG_NBDCLIENT
-	bool "nbd-client"
+	bool "nbd-client (6 kb)"
 	default BUSYBOX_DEFAULT_NBDCLIENT
 	help
 	Network block device client
 config BUSYBOX_CONFIG_NC
-	bool "nc"
+	bool "nc (11 kb)"
 	default BUSYBOX_DEFAULT_NC
 	help
 	A simple Unix utility which reads and writes data across network
 	connections.
 
+config BUSYBOX_CONFIG_NETCAT
+	bool "netcat (11 kb)"
+	default BUSYBOX_DEFAULT_NETCAT
+	help
+	Alias to nc.
+
 config BUSYBOX_CONFIG_NC_SERVER
 	bool "Netcat server options (-l)"
 	default BUSYBOX_DEFAULT_NC_SERVER
-	depends on BUSYBOX_CONFIG_NC
+	depends on BUSYBOX_CONFIG_NC || BUSYBOX_CONFIG_NETCAT
 	help
 	Allow netcat to act as a server.
 
 config BUSYBOX_CONFIG_NC_EXTRA
 	bool "Netcat extensions (-eiw and -f FILE)"
 	default BUSYBOX_DEFAULT_NC_EXTRA
-	depends on BUSYBOX_CONFIG_NC
+	depends on BUSYBOX_CONFIG_NC || BUSYBOX_CONFIG_NETCAT
 	help
 	Add -e (support for executing the rest of the command line after
 	making or receiving a successful connection), -i (delay interval for
@@ -655,8 +703,8 @@ config BUSYBOX_CONFIG_NC_EXTRA
 
 config BUSYBOX_CONFIG_NC_110_COMPAT
 	bool "Netcat 1.10 compatibility (+2.5k)"
-	default BUSYBOX_DEFAULT_NC_110_COMPAT  # off specially for Rob
-	depends on BUSYBOX_CONFIG_NC
+	default BUSYBOX_DEFAULT_NC_110_COMPAT
+	depends on BUSYBOX_CONFIG_NC || BUSYBOX_CONFIG_NETCAT
 	help
 	This option makes nc closely follow original nc-1.10.
 	The code is about 2.5k bigger. It enables
@@ -666,9 +714,9 @@ config BUSYBOX_CONFIG_NETMSG
 	bool "netmsg"
 	default BUSYBOX_DEFAULT_NETMSG
 	help
-	simple program for sending udp broadcast messages
+	  simple program for sending udp broadcast messages
 config BUSYBOX_CONFIG_NETSTAT
-	bool "netstat"
+	bool "netstat (10 kb)"
 	default BUSYBOX_DEFAULT_NETSTAT
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
@@ -690,16 +738,26 @@ config BUSYBOX_CONFIG_FEATURE_NETSTAT_PRG
 	Add support for -p flag to print out PID and program name.
 	+700 bytes of code.
 config BUSYBOX_CONFIG_NSLOOKUP
-	bool "nslookup"
+	bool "nslookup (9.7 kb)"
 	default BUSYBOX_DEFAULT_NSLOOKUP
 	help
 	nslookup is a tool to query Internet name servers.
+
+config BUSYBOX_CONFIG_FEATURE_NSLOOKUP_BIG
+	bool "Use internal resolver code instead of libc"
+	depends on BUSYBOX_CONFIG_NSLOOKUP
+	default BUSYBOX_DEFAULT_FEATURE_NSLOOKUP_BIG
+
+config BUSYBOX_CONFIG_FEATURE_NSLOOKUP_LONG_OPTIONS
+	bool "Enable long options"
+	default BUSYBOX_DEFAULT_FEATURE_NSLOOKUP_LONG_OPTIONS
+	depends on BUSYBOX_CONFIG_FEATURE_NSLOOKUP_BIG && BUSYBOX_CONFIG_LONG_OPTS
 config BUSYBOX_CONFIG_NSLOOKUP_OPENWRT
-	bool "nslookup_lede"
+	bool "nslookup_openwrt"
 	depends on !BUSYBOX_CONFIG_NSLOOKUP
 	default BUSYBOX_DEFAULT_NSLOOKUP_OPENWRT
 	help
-	nslookup is a tool to query Internet name servers (OpenWrt flavor).
+	  nslookup is a tool to query Internet name servers (LEDE flavor).
 
 config BUSYBOX_CONFIG_FEATURE_NSLOOKUP_OPENWRT_LONG_OPTIONS
        bool "Enable long options"
@@ -708,7 +766,7 @@ config BUSYBOX_CONFIG_FEATURE_NSLOOKUP_OPENWRT_LONG_OPTIONS
        help
          Support long options for the nslookup applet.
 config BUSYBOX_CONFIG_NTPD
-	bool "ntpd"
+	bool "ntpd (22 kb)"
 	default BUSYBOX_DEFAULT_NTPD
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
@@ -729,8 +787,13 @@ config BUSYBOX_CONFIG_FEATURE_NTPD_CONF
 	help
 	Make ntpd look in /etc/ntp.conf for peers. Only "server address"
 	is supported.
+
+config BUSYBOX_CONFIG_FEATURE_NTP_AUTH
+	bool "Support md5/sha1 message authentication codes"
+	default BUSYBOX_DEFAULT_FEATURE_NTP_AUTH
+	depends on BUSYBOX_CONFIG_NTPD
 config BUSYBOX_CONFIG_PING
-	bool "ping"
+	bool "ping (10 kb)"
 	default BUSYBOX_DEFAULT_PING
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
@@ -738,58 +801,68 @@ config BUSYBOX_CONFIG_PING
 	elicit an ICMP ECHO_RESPONSE from a host or gateway.
 
 config BUSYBOX_CONFIG_PING6
-	bool "ping6"
+	bool "ping6 (11 kb)"
 	default BUSYBOX_DEFAULT_PING6
 	depends on BUSYBOX_CONFIG_FEATURE_IPV6
 	help
-	This will give you a ping that can talk IPv6.
+	Alias to "ping -6".
 
 config BUSYBOX_CONFIG_FEATURE_FANCY_PING
 	bool "Enable fancy ping output"
 	default BUSYBOX_DEFAULT_FEATURE_FANCY_PING
 	depends on BUSYBOX_CONFIG_PING || BUSYBOX_CONFIG_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_CONFIG_PSCAN
-	bool "pscan"
+	bool "pscan (6 kb)"
 	default BUSYBOX_DEFAULT_PSCAN
 	help
 	Simple network port scanner.
 config BUSYBOX_CONFIG_ROUTE
-	bool "route"
+	bool "route (8.7 kb)"
 	default BUSYBOX_DEFAULT_ROUTE
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
 	Route displays or manipulates the kernel's IP routing tables.
 config BUSYBOX_CONFIG_SLATTACH
-	bool "slattach"
+	bool "slattach (6.2 kb)"
 	default BUSYBOX_DEFAULT_SLATTACH
 	select BUSYBOX_CONFIG_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_CONFIG_SSL_CLIENT
-	bool "ssl_client"
+	bool "ssl_client (25 kb)"
 	default BUSYBOX_DEFAULT_SSL_CLIENT
 	select BUSYBOX_CONFIG_TLS
 	help
 	This tool pipes data to/from a socket, TLS-encrypting it.
+config BUSYBOX_CONFIG_TC
+	bool "tc (8.3 kb)"
+	default BUSYBOX_DEFAULT_TC
+	help
+	Show / manipulate traffic control settings
+
+config BUSYBOX_CONFIG_FEATURE_TC_INGRESS
+	bool "Enable ingress"
+	default BUSYBOX_DEFAULT_FEATURE_TC_INGRESS
+	depends on BUSYBOX_CONFIG_TC
 config BUSYBOX_CONFIG_TCPSVD
-	bool "tcpsvd"
+	bool "tcpsvd (14 kb)"
 	default BUSYBOX_DEFAULT_TCPSVD
 	help
 	tcpsvd listens on a TCP port and runs a program for each new
 	connection.
 
 config BUSYBOX_CONFIG_UDPSVD
-	bool "udpsvd"
+	bool "udpsvd (13 kb)"
 	default BUSYBOX_DEFAULT_UDPSVD
 	help
 	udpsvd listens on an UDP port and runs a program for each new
 	connection.
 config BUSYBOX_CONFIG_TELNET
-	bool "telnet"
+	bool "telnet (8.8 kb)"
 	default BUSYBOX_DEFAULT_TELNET
 	help
 	Telnet is an interface to the TELNET protocol, but is also commonly
@@ -812,14 +885,14 @@ config BUSYBOX_CONFIG_FEATURE_TELNET_AUTOLOGIN
 	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.
+	option enables '-a' and '-l USER' options.
 
 config BUSYBOX_CONFIG_FEATURE_TELNET_WIDTH
 	bool "Enable window size autodetection"
 	default BUSYBOX_DEFAULT_FEATURE_TELNET_WIDTH
 	depends on BUSYBOX_CONFIG_TELNET
 config BUSYBOX_CONFIG_TELNETD
-	bool "telnetd"
+	bool "telnetd (12 kb)"
 	default BUSYBOX_DEFAULT_TELNETD
 	select BUSYBOX_CONFIG_FEATURE_SYSLOG
 	help
@@ -852,7 +925,7 @@ config BUSYBOX_CONFIG_TELNETD
 
 	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:
+	certain that busybox has been installed setuid root:
 
 		chown root.root /bin/busybox
 		chmod 4755 /bin/busybox
@@ -887,26 +960,28 @@ config BUSYBOX_CONFIG_FEATURE_TELNETD_INETD_WAIT
 	way of running tcp services, including telnetd.
 	You most probably want to say N here.
 config BUSYBOX_CONFIG_TFTP
-	bool "tftp"
+	bool "tftp (11 kb)"
 	default BUSYBOX_DEFAULT_TFTP
 	help
-	This enables the Trivial File Transfer Protocol client program. TFTP
-	is usually used for simple, small transfers such as a root image
+	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_CONFIG_FEATURE_TFTP_PROGRESS_BAR
+	bool "Enable progress bar"
+	default BUSYBOX_DEFAULT_FEATURE_TFTP_PROGRESS_BAR
+	depends on BUSYBOX_CONFIG_TFTP
+
 config BUSYBOX_CONFIG_TFTPD
-	bool "tftpd"
+	bool "tftpd (10 kb)"
 	default BUSYBOX_DEFAULT_TFTPD
 	help
-	This enables the Trivial File Transfer Protocol server program.
+	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_CONFIG_TFTP || BUSYBOX_CONFIG_TFTPD
-
 config BUSYBOX_CONFIG_FEATURE_TFTP_GET
 	bool "Enable 'tftp get' and/or tftpd upload code"
 	default BUSYBOX_DEFAULT_FEATURE_TFTP_GET
@@ -936,11 +1011,6 @@ config BUSYBOX_CONFIG_FEATURE_TFTP_BLOCKSIZE
 	Allow tftp to specify block size, and tftpd to understand
 	"blksize" and "tsize" options.
 
-config BUSYBOX_CONFIG_FEATURE_TFTP_PROGRESS_BAR
-	bool "Enable progress bar"
-	default BUSYBOX_DEFAULT_FEATURE_TFTP_PROGRESS_BAR
-	depends on BUSYBOX_CONFIG_TFTP && BUSYBOX_CONFIG_FEATURE_TFTP_BLOCKSIZE
-
 config BUSYBOX_CONFIG_TFTP_DEBUG
 	bool "Enable debug"
 	default BUSYBOX_DEFAULT_TFTP_DEBUG
@@ -952,14 +1022,14 @@ config BUSYBOX_CONFIG_TLS
 	bool #No description makes it a hidden option
 	default BUSYBOX_DEFAULT_TLS
 config BUSYBOX_CONFIG_TRACEROUTE
-	bool "traceroute"
+	bool "traceroute (11 kb)"
 	default BUSYBOX_DEFAULT_TRACEROUTE
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
 	Utility to trace the route of IP packets.
 
 config BUSYBOX_CONFIG_TRACEROUTE6
-	bool "traceroute6"
+	bool "traceroute6 (13 kb)"
 	default BUSYBOX_DEFAULT_TRACEROUTE6
 	depends on BUSYBOX_CONFIG_FEATURE_IPV6
 	help
@@ -978,7 +1048,7 @@ config BUSYBOX_CONFIG_FEATURE_TRACEROUTE_USE_ICMP
 	default BUSYBOX_DEFAULT_FEATURE_TRACEROUTE_USE_ICMP
 	depends on BUSYBOX_CONFIG_TRACEROUTE || BUSYBOX_CONFIG_TRACEROUTE6
 config BUSYBOX_CONFIG_TUNCTL
-	bool "tunctl"
+	bool "tunctl (6.2 kb)"
 	default BUSYBOX_DEFAULT_TUNCTL
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
@@ -992,13 +1062,13 @@ config BUSYBOX_CONFIG_FEATURE_TUNCTL_UG
 	Allow to specify owner and group of newly created interface.
 	340 bytes of pure bloat. Say no here.
 config BUSYBOX_CONFIG_VCONFIG
-	bool "vconfig"
+	bool "vconfig (2.3 kb)"
 	default BUSYBOX_DEFAULT_VCONFIG
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
 	Creates, removes, and configures VLAN interfaces
 config BUSYBOX_CONFIG_WGET
-	bool "wget"
+	bool "wget (38 kb)"
 	default BUSYBOX_DEFAULT_WGET
 	help
 	wget is a utility for non-interactive download of files from HTTP
@@ -1104,12 +1174,12 @@ config BUSYBOX_CONFIG_FEATURE_WGET_OPENSSL
 	(if you enabled it); if openssl can be executed but fails later,
 	wget can't detect this, and download will fail.
 config BUSYBOX_CONFIG_WHOIS
-	bool "whois"
+	bool "whois (6.3 kb)"
 	default BUSYBOX_DEFAULT_WHOIS
 	help
 	whois is a client for the whois directory service
 config BUSYBOX_CONFIG_ZCIP
-	bool "zcip"
+	bool "zcip (8.4 kb)"
 	default BUSYBOX_DEFAULT_ZCIP
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	select BUSYBOX_CONFIG_FEATURE_SYSLOG
diff --git a/package/utils/busybox/config/networking/udhcp/Config.in b/package/utils/busybox/config/networking/udhcp/Config.in
index 6066ded078..212e4a0bcb 100644
--- a/package/utils/busybox/config/networking/udhcp/Config.in
+++ b/package/utils/busybox/config/networking/udhcp/Config.in
@@ -1,58 +1,17 @@
 # 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.
+# see docs/Kconfig-language.txt.
 #
 
-config BUSYBOX_CONFIG_UDHCPC6
-	bool "udhcpc6 (DHCPv6 client, EXPERIMENTAL)"
-	default BUSYBOX_DEFAULT_UDHCPC6  # not yet ready
-	depends on BUSYBOX_CONFIG_FEATURE_IPV6
-	help
-	udhcpc6 is a DHCPv6 client
-
-config BUSYBOX_CONFIG_FEATURE_UDHCPC6_RFC3646
-	bool "Support RFC 3646 (DNS server and search list)"
-	default BUSYBOX_DEFAULT_FEATURE_UDHCPC6_RFC3646
-	depends on BUSYBOX_CONFIG_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_CONFIG_FEATURE_UDHCPC6_RFC4704
-	bool "Support RFC 4704 (Client FQDN)"
-	default BUSYBOX_DEFAULT_FEATURE_UDHCPC6_RFC4704
-	depends on BUSYBOX_CONFIG_UDHCPC6
-	help
-	You can request FQDN to be given by server using "-O fqdn".
-
-config BUSYBOX_CONFIG_FEATURE_UDHCPC6_RFC4833
-	bool "Support RFC 4833 (Timezones)"
-	default BUSYBOX_DEFAULT_FEATURE_UDHCPC6_RFC4833
-	depends on BUSYBOX_CONFIG_UDHCPC6
-	help
-	You can request POSIX timezone with "-O tz" and timezone name
-	with "-O timezone".
-
 config BUSYBOX_CONFIG_UDHCPD
-	bool "udhcpd (DHCP server)"
+	bool "udhcpd (21 kb)"
 	default BUSYBOX_DEFAULT_UDHCPD
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
 	udhcpd is a DHCP server geared primarily toward embedded systems,
 	while striving to be fully functional and RFC compliant.
 
-config BUSYBOX_CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY
-	bool "Rewrite the lease file at every new acknowledge"
-	default BUSYBOX_DEFAULT_FEATURE_UDHCPD_WRITE_LEASES_EARLY
-	depends on BUSYBOX_CONFIG_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_CONFIG_FEATURE_UDHCPD_BASE_IP_ON_MAC
 	bool "Select IP address based on client MAC"
 	default BUSYBOX_DEFAULT_FEATURE_UDHCPD_BASE_IP_ON_MAC
@@ -67,6 +26,16 @@ config BUSYBOX_CONFIG_FEATURE_UDHCPD_BASE_IP_ON_MAC
 	for the same client to (almost always) contain the same
 	IP address.
 
+config BUSYBOX_CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY
+	bool "Rewrite lease file at every new acknowledge"
+	default BUSYBOX_DEFAULT_FEATURE_UDHCPD_WRITE_LEASES_EARLY
+	depends on BUSYBOX_CONFIG_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_CONFIG_DHCPD_LEASES_FILE
 	string "Absolute path to lease file"
 	default BUSYBOX_DEFAULT_DHCPD_LEASES_FILE
@@ -76,7 +45,7 @@ config BUSYBOX_CONFIG_DHCPD_LEASES_FILE
 	of the file. Normally it is safe to leave it untouched.
 
 config BUSYBOX_CONFIG_DUMPLEASES
-	bool "dumpleases"
+	bool "dumpleases (5.1 kb)"
 	default BUSYBOX_DEFAULT_DUMPLEASES
 	help
 	dumpleases displays the leases written out by the udhcpd.
@@ -84,15 +53,15 @@ config BUSYBOX_CONFIG_DUMPLEASES
 	by the absolute time that it expires in seconds from epoch.
 
 config BUSYBOX_CONFIG_DHCPRELAY
-	bool "dhcprelay"
+	bool "dhcprelay (5.2 kb)"
 	default BUSYBOX_DEFAULT_DHCPRELAY
 	help
-	dhcprelay listens for dhcp requests on one or more interfaces
-	and forwards these requests to a different interface or dhcp
+	dhcprelay listens for DHCP requests on one or more interfaces
+	and forwards these requests to a different interface or DHCP
 	server.
 
 config BUSYBOX_CONFIG_UDHCPC
-	bool "udhcpc (DHCP client)"
+	bool "udhcpc (24 kb)"
 	default BUSYBOX_DEFAULT_UDHCPC
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
@@ -126,25 +95,68 @@ config BUSYBOX_CONFIG_FEATURE_UDHCPC_SANITIZEOPT
 config BUSYBOX_CONFIG_UDHCPC_DEFAULT_SCRIPT
 	string "Absolute path to config script"
 	default BUSYBOX_DEFAULT_UDHCPC_DEFAULT_SCRIPT
-	depends on BUSYBOX_CONFIG_UDHCPC
+	depends on BUSYBOX_CONFIG_UDHCPC || BUSYBOX_CONFIG_UDHCPC6
 	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.
 
+# udhcpc6 config is inserted here:
+config BUSYBOX_CONFIG_UDHCPC6
+	bool "udhcpc6 (21 kb)"
+	default BUSYBOX_DEFAULT_UDHCPC6  # not yet ready
+	depends on BUSYBOX_CONFIG_FEATURE_IPV6
+	help
+	udhcpc6 is a DHCPv6 client
+
+config BUSYBOX_CONFIG_FEATURE_UDHCPC6_RFC3646
+	bool "Support RFC 3646 (DNS server and search list)"
+	default BUSYBOX_DEFAULT_FEATURE_UDHCPC6_RFC3646
+	depends on BUSYBOX_CONFIG_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_CONFIG_FEATURE_UDHCPC6_RFC4704
+	bool "Support RFC 4704 (Client FQDN)"
+	default BUSYBOX_DEFAULT_FEATURE_UDHCPC6_RFC4704
+	depends on BUSYBOX_CONFIG_UDHCPC6
+	help
+	You can request FQDN to be given by server using "-O fqdn".
+
+config BUSYBOX_CONFIG_FEATURE_UDHCPC6_RFC4833
+	bool "Support RFC 4833 (Timezones)"
+	default BUSYBOX_DEFAULT_FEATURE_UDHCPC6_RFC4833
+	depends on BUSYBOX_CONFIG_UDHCPC6
+	help
+	You can request POSIX timezone with "-O tz" and timezone name
+	with "-O timezone".
+
+config BUSYBOX_CONFIG_FEATURE_UDHCPC6_RFC5970
+	bool "Support RFC 5970 (Network Boot)"
+	default BUSYBOX_DEFAULT_FEATURE_UDHCPC6_RFC5970
+	depends on BUSYBOX_CONFIG_UDHCPC6
+	help
+	You can request bootfile-url with "-O bootfile_url" and
+	bootfile-params with "-O bootfile_params".
+
+comment "Common options for DHCP applets"
+        depends on BUSYBOX_CONFIG_UDHCPD || BUSYBOX_CONFIG_UDHCPC || BUSYBOX_CONFIG_UDHCPC6 || BUSYBOX_CONFIG_DHCPRELAY
+
 config BUSYBOX_CONFIG_FEATURE_UDHCP_PORT
 	bool "Enable '-P port' option for udhcpd and udhcpc"
 	default BUSYBOX_DEFAULT_FEATURE_UDHCP_PORT
-	depends on BUSYBOX_CONFIG_UDHCPD || BUSYBOX_CONFIG_UDHCPC
+	depends on BUSYBOX_CONFIG_UDHCPD || BUSYBOX_CONFIG_UDHCPC || BUSYBOX_CONFIG_UDHCPC6
 	help
 	At the cost of ~300 bytes, enables -P port option.
 	This feature is typically not needed.
 
 config BUSYBOX_CONFIG_UDHCP_DEBUG
-	int "Maximum verbosity level for udhcp applets (0..9)"
+	int "Maximum verbosity level (0..9)"
 	default BUSYBOX_DEFAULT_UDHCP_DEBUG
 	range 0 9
-	depends on BUSYBOX_CONFIG_UDHCPD || BUSYBOX_CONFIG_UDHCPC || BUSYBOX_CONFIG_DHCPRELAY
+	depends on BUSYBOX_CONFIG_UDHCPD || BUSYBOX_CONFIG_UDHCPC || BUSYBOX_CONFIG_UDHCPC6 || BUSYBOX_CONFIG_DHCPRELAY
 	help
 	Verbosity can be increased with multiple -v options.
 	This option controls how high it can be cranked up.
@@ -152,23 +164,6 @@ config BUSYBOX_CONFIG_UDHCP_DEBUG
 	Bigger values result in bigger code. Levels above 1
 	are very verbose and useful for debugging only.
 
-config BUSYBOX_CONFIG_FEATURE_UDHCP_RFC3397
-	bool "Support RFC3397 domain search (experimental)"
-	default BUSYBOX_DEFAULT_FEATURE_UDHCP_RFC3397
-	depends on BUSYBOX_CONFIG_UDHCPD || BUSYBOX_CONFIG_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.
-
-config BUSYBOX_CONFIG_FEATURE_UDHCP_8021Q
-	bool "Support 802.1Q VLAN parameters"
-	default BUSYBOX_DEFAULT_FEATURE_UDHCP_8021Q
-	depends on BUSYBOX_CONFIG_UDHCPD || BUSYBOX_CONFIG_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.
-
 config BUSYBOX_CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS
 	int "DHCP options slack buffer size"
 	default BUSYBOX_DEFAULT_UDHCPC_SLACK_FOR_BUGGY_SERVERS
@@ -179,15 +174,32 @@ config BUSYBOX_CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS
 	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
+	servers, this may help. The upper limit (924) makes udhcpc accept
 	even 1500 byte packets (maximum-sized ethernet packets).
 
-	This option does not make dhcp[cd] emit non-standard
+	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.
+		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_CONFIG_FEATURE_UDHCP_RFC3397
+	bool "Support RFC 3397 domain search options"
+	default BUSYBOX_DEFAULT_FEATURE_UDHCP_RFC3397
+	depends on BUSYBOX_CONFIG_UDHCPD || BUSYBOX_CONFIG_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.
+
+config BUSYBOX_CONFIG_FEATURE_UDHCP_8021Q
+	bool "Support 802.1Q VLAN parameters options"
+	default BUSYBOX_DEFAULT_FEATURE_UDHCP_8021Q
+	depends on BUSYBOX_CONFIG_UDHCPD || BUSYBOX_CONFIG_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.
diff --git a/package/utils/busybox/config/printutils/Config.in b/package/utils/busybox/config/printutils/Config.in
index 2c608af989..c53ee19d4e 100644
--- a/package/utils/busybox/config/printutils/Config.in
+++ b/package/utils/busybox/config/printutils/Config.in
@@ -1,24 +1,24 @@
 # 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.
+# see docs/Kconfig-language.txt.
 #
 
 menu "Print Utilities"
 
 config BUSYBOX_CONFIG_LPD
-	bool "lpd"
+	bool "lpd (5.5 kb)"
 	default BUSYBOX_DEFAULT_LPD
 	help
 	lpd is a print spooling daemon.
 config BUSYBOX_CONFIG_LPR
-	bool "lpr"
+	bool "lpr (9.9 kb)"
 	default BUSYBOX_DEFAULT_LPR
 	help
 	lpr sends files (or standard input) to a print spooling daemon.
 
 config BUSYBOX_CONFIG_LPQ
-	bool "lpq"
+	bool "lpq (9.9 kb)"
 	default BUSYBOX_DEFAULT_LPQ
 	help
 	lpq is a print spool queue examination and manipulation program.
diff --git a/package/utils/busybox/config/procps/Config.in b/package/utils/busybox/config/procps/Config.in
index 227e2a0f5e..6a0d51f353 100644
--- a/package/utils/busybox/config/procps/Config.in
+++ b/package/utils/busybox/config/procps/Config.in
@@ -1,13 +1,13 @@
 # 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.
+# see docs/Kconfig-language.txt.
 #
 
 menu "Process Utilities"
 
 config BUSYBOX_CONFIG_FREE
-	bool "free"
+	bool "free (3.1 kb)"
 	default BUSYBOX_DEFAULT_FREE
 	select BUSYBOX_CONFIG_PLATFORM_LINUX #sysinfo()
 	help
@@ -15,19 +15,19 @@ config BUSYBOX_CONFIG_FREE
 	memory in the system, as well as the buffers used by the kernel.
 	The shared memory column should be ignored; it is obsolete.
 config BUSYBOX_CONFIG_FUSER
-	bool "fuser"
+	bool "fuser (7 kb)"
 	default BUSYBOX_DEFAULT_FUSER
 	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.
 config BUSYBOX_CONFIG_IOSTAT
-	bool "iostat"
+	bool "iostat (7.6 kb)"
 	default BUSYBOX_DEFAULT_IOSTAT
 	help
 	Report CPU and I/O statistics
 config BUSYBOX_CONFIG_KILL
-	bool "kill"
+	bool "kill (3.1 kb)"
 	default BUSYBOX_DEFAULT_KILL
 	help
 	The command kill sends the specified signal to the specified
@@ -35,7 +35,7 @@ config BUSYBOX_CONFIG_KILL
 	signal is sent.
 
 config BUSYBOX_CONFIG_KILLALL
-	bool "killall"
+	bool "killall (5.6 kb)"
 	default BUSYBOX_DEFAULT_KILLALL
 	help
 	killall sends a signal to all processes running any of the
@@ -43,7 +43,7 @@ config BUSYBOX_CONFIG_KILLALL
 	sent.
 
 config BUSYBOX_CONFIG_KILLALL5
-	bool "killall5"
+	bool "killall5 (5.3 kb)"
 	default BUSYBOX_DEFAULT_KILLALL5
 	help
 	The SystemV killall command. killall5 sends a signal
@@ -51,34 +51,34 @@ config BUSYBOX_CONFIG_KILLALL5
 	in its own session, so it won't kill the shell that is running
 	the script it was called from.
 config BUSYBOX_CONFIG_LSOF
-	bool "lsof"
+	bool "lsof (3.4 kb)"
 	default BUSYBOX_DEFAULT_LSOF
 	help
 	Show open files in the format of:
 	PID <TAB> /path/to/executable <TAB> /path/to/opened/file
 config BUSYBOX_CONFIG_MPSTAT
-	bool "mpstat"
+	bool "mpstat (9.8 kb)"
 	default BUSYBOX_DEFAULT_MPSTAT
 	help
 	Per-processor statistics
 config BUSYBOX_CONFIG_NMETER
-	bool "nmeter"
+	bool "nmeter (11 kb)"
 	default BUSYBOX_DEFAULT_NMETER
 	help
 	Prints selected system stats continuously, one line per update.
 config BUSYBOX_CONFIG_PGREP
-	bool "pgrep"
+	bool "pgrep (6.5 kb)"
 	default BUSYBOX_DEFAULT_PGREP
 	help
 	Look for processes by name.
 
 config BUSYBOX_CONFIG_PKILL
-	bool "pkill"
+	bool "pkill (7.5 kb)"
 	default BUSYBOX_DEFAULT_PKILL
 	help
 	Send signals to processes by name.
 config BUSYBOX_CONFIG_PIDOF
-	bool "pidof"
+	bool "pidof (6.3 kb)"
 	default BUSYBOX_DEFAULT_PIDOF
 	help
 	Pidof finds the process id's (pids) of the named programs. It prints
@@ -100,12 +100,12 @@ config BUSYBOX_CONFIG_FEATURE_PIDOF_OMIT
 	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_CONFIG_PMAP
-       bool "pmap"
-       default BUSYBOX_DEFAULT_PMAP
-       help
-         Display processes' memory mappings.
+	bool "pmap (6 kb)"
+	default BUSYBOX_DEFAULT_PMAP
+	help
+	Display processes' memory mappings.
 config BUSYBOX_CONFIG_POWERTOP
-	bool "powertop"
+	bool "powertop (9.6 kb)"
 	default BUSYBOX_DEFAULT_POWERTOP
 	help
 	Analyze power consumption on Intel-based laptops
@@ -118,32 +118,32 @@ config BUSYBOX_CONFIG_FEATURE_POWERTOP_INTERACTIVE
 	Without this, powertop will only refresh display every 10 seconds.
 	No keyboard commands will work, only ^C to terminate.
 config BUSYBOX_CONFIG_PS
-	bool "ps"
+	bool "ps (11 kb)"
 	default BUSYBOX_DEFAULT_PS
 	help
 	ps gives a snapshot of the current processes.
 
 config BUSYBOX_CONFIG_FEATURE_PS_WIDE
-	bool "Enable wide output option (-w)"
+	bool "Enable wide output (-w)"
 	default BUSYBOX_DEFAULT_FEATURE_PS_WIDE
-	depends on BUSYBOX_CONFIG_PS && !BUSYBOX_CONFIG_DESKTOP
+	depends on (BUSYBOX_CONFIG_PS || BUSYBOX_CONFIG_MINIPS) && !BUSYBOX_CONFIG_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.
 
 config BUSYBOX_CONFIG_FEATURE_PS_LONG
-	bool "Enable long output option (-l)"
+	bool "Enable long output (-l)"
 	default BUSYBOX_DEFAULT_FEATURE_PS_LONG
-	depends on BUSYBOX_CONFIG_PS && !BUSYBOX_CONFIG_DESKTOP
+	depends on (BUSYBOX_CONFIG_PS || BUSYBOX_CONFIG_MINIPS) && !BUSYBOX_CONFIG_DESKTOP
 	help
 	Support argument 'l' for long output.
 	Adds fields PPID, RSS, START, TIME & TTY
 
 config BUSYBOX_CONFIG_FEATURE_PS_TIME
-	bool "Support -o time and -o etime output specifiers"
+	bool "Enable -o time and -o etime specifiers"
 	default BUSYBOX_DEFAULT_FEATURE_PS_TIME
-	depends on BUSYBOX_CONFIG_PS && BUSYBOX_CONFIG_DESKTOP
+	depends on (BUSYBOX_CONFIG_PS || BUSYBOX_CONFIG_MINIPS) && BUSYBOX_CONFIG_DESKTOP
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 
 config BUSYBOX_CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS
@@ -155,32 +155,32 @@ config BUSYBOX_CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS
 	(if you are on Linux 2.4.0+ and use ELF, you don't need this)
 
 config BUSYBOX_CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS
-	bool "Support -o rgroup, -o ruser, -o nice specifiers"
+	bool "Enable -o rgroup, -o ruser, -o nice specifiers"
 	default BUSYBOX_DEFAULT_FEATURE_PS_ADDITIONAL_COLUMNS
-	depends on BUSYBOX_CONFIG_PS && BUSYBOX_CONFIG_DESKTOP
+	depends on (BUSYBOX_CONFIG_PS || BUSYBOX_CONFIG_MINIPS) && BUSYBOX_CONFIG_DESKTOP
 config BUSYBOX_CONFIG_PSTREE
-	bool "pstree"
+	bool "pstree (9.3 kb)"
 	default BUSYBOX_DEFAULT_PSTREE
 	help
 	Display a tree of processes.
 config BUSYBOX_CONFIG_PWDX
-	bool "pwdx"
+	bool "pwdx (3.7 kb)"
 	default BUSYBOX_DEFAULT_PWDX
 	help
 	Report current working directory of a process
 config BUSYBOX_CONFIG_SMEMCAP
-	bool "smemcap"
+	bool "smemcap (2.5 kb)"
 	default BUSYBOX_DEFAULT_SMEMCAP
 	help
 	smemcap is a tool for capturing process data for smem,
 	a memory usage statistic tool.
 config BUSYBOX_CONFIG_BB_SYSCTL
-	bool "sysctl"
+	bool "sysctl (7.4 kb)"
 	default BUSYBOX_DEFAULT_BB_SYSCTL
 	help
 	Configure kernel parameters at runtime.
 config BUSYBOX_CONFIG_TOP
-	bool "top"
+	bool "top (18 kb)"
 	default BUSYBOX_DEFAULT_TOP
 	help
 	The top program provides a dynamic real-time view of a running
@@ -241,7 +241,7 @@ config BUSYBOX_CONFIG_FEATURE_TOPMEM
 	help
 	Enable 's' in top (gives lots of memory info).
 config BUSYBOX_CONFIG_UPTIME
-	bool "uptime"
+	bool "uptime (3.7 kb)"
 	default BUSYBOX_DEFAULT_UPTIME
 	select BUSYBOX_CONFIG_PLATFORM_LINUX #sysinfo()
 	help
@@ -256,7 +256,7 @@ config BUSYBOX_CONFIG_FEATURE_UPTIME_UTMP_SUPPORT
 	help
 	Display the number of users currently logged on.
 config BUSYBOX_CONFIG_WATCH
-	bool "watch"
+	bool "watch (4.4 kb)"
 	default BUSYBOX_DEFAULT_WATCH
 	help
 	watch is used to execute a program periodically, showing
diff --git a/package/utils/busybox/config/runit/Config.in b/package/utils/busybox/config/runit/Config.in
index 6c10519ebe..2c701f2136 100644
--- a/package/utils/busybox/config/runit/Config.in
+++ b/package/utils/busybox/config/runit/Config.in
@@ -1,50 +1,50 @@
 # 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.
+# see docs/Kconfig-language.txt.
 #
 
 menu "Runit Utilities"
 
 config BUSYBOX_CONFIG_CHPST
-	bool "chpst"
+	bool "chpst (9 kb)"
 	default BUSYBOX_DEFAULT_CHPST
 	help
 	chpst changes the process state according to the given options, and
 	execs specified program.
 
 config BUSYBOX_CONFIG_SETUIDGID
-	bool "setuidgid"
+	bool "setuidgid (4 kb)"
 	default BUSYBOX_DEFAULT_SETUIDGID
 	help
 	Sets soft resource limits as specified by options
 
 config BUSYBOX_CONFIG_ENVUIDGID
-	bool "envuidgid"
+	bool "envuidgid (3.9 kb)"
 	default BUSYBOX_DEFAULT_ENVUIDGID
 	help
 	Sets $UID to account's uid and $GID to account's gid
 
 config BUSYBOX_CONFIG_ENVDIR
-	bool "envdir"
+	bool "envdir (2.5 kb)"
 	default BUSYBOX_DEFAULT_ENVDIR
 	help
 	Sets various environment variables as specified by files
 	in the given directory
 
 config BUSYBOX_CONFIG_SOFTLIMIT
-	bool "softlimit"
+	bool "softlimit (4.5 kb)"
 	default BUSYBOX_DEFAULT_SOFTLIMIT
 	help
 	Sets soft resource limits as specified by options
 config BUSYBOX_CONFIG_RUNSV
-	bool "runsv"
+	bool "runsv (7.8 kb)"
 	default BUSYBOX_DEFAULT_RUNSV
 	help
 	runsv starts and monitors a service and optionally an appendant log
 	service.
 config BUSYBOX_CONFIG_RUNSVDIR
-	bool "runsvdir"
+	bool "runsvdir (6.3 kb)"
 	default BUSYBOX_DEFAULT_RUNSVDIR
 	help
 	runsvdir starts a runsv process for each subdirectory, or symlink to
@@ -60,7 +60,7 @@ config BUSYBOX_CONFIG_FEATURE_RUNSVDIR_LOG
 	message (viewable via top/ps). Otherwise (feature is off
 	or no parameter), error messages go to stderr only.
 config BUSYBOX_CONFIG_SV
-	bool "sv"
+	bool "sv (8.5 kb)"
 	default BUSYBOX_DEFAULT_SV
 	help
 	sv reports the current status and controls the state of services
@@ -69,19 +69,26 @@ config BUSYBOX_CONFIG_SV
 config BUSYBOX_CONFIG_SV_DEFAULT_SERVICE_DIR
 	string "Default directory for services"
 	default BUSYBOX_DEFAULT_SV_DEFAULT_SERVICE_DIR
-	depends on BUSYBOX_CONFIG_SV
+	depends on BUSYBOX_CONFIG_SV || BUSYBOX_CONFIG_SVC || BUSYBOX_CONFIG_SVOK
 	help
 	Default directory for services.
 	Defaults to "/var/service"
 
 config BUSYBOX_CONFIG_SVC
-	bool "svc"
+	bool "svc (8.4 kb)"
 	default BUSYBOX_DEFAULT_SVC
 	help
 	svc controls the state of services monitored by the runsv supervisor.
-	It is comaptible with daemontools command with the same name.
+	It is compatible with daemontools command with the same name.
+
+config BUSYBOX_CONFIG_SVOK
+	bool "svok (1.5 kb)"
+	default BUSYBOX_DEFAULT_SVOK
+	help
+	svok checks whether runsv supervisor is running.
+	It is compatible with daemontools command with the same name.
 config BUSYBOX_CONFIG_SVLOGD
-	bool "svlogd"
+	bool "svlogd (16 kb)"
 	default BUSYBOX_DEFAULT_SVLOGD
 	help
 	svlogd continuously reads log data from its standard input, optionally
diff --git a/package/utils/busybox/config/selinux/Config.in b/package/utils/busybox/config/selinux/Config.in
index d572509239..de67a7281b 100644
--- a/package/utils/busybox/config/selinux/Config.in
+++ b/package/utils/busybox/config/selinux/Config.in
@@ -1,80 +1,70 @@
 # 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.
+# see docs/Kconfig-language.txt.
 #
 
 menu "SELinux Utilities"
 	depends on BUSYBOX_CONFIG_SELINUX
 
 config BUSYBOX_CONFIG_CHCON
-	bool "chcon"
+	bool "chcon (8.9 kb)"
 	default BUSYBOX_DEFAULT_CHCON
 	depends on BUSYBOX_CONFIG_SELINUX
 	help
 	Enable support to change the security context of file.
-
-config BUSYBOX_CONFIG_FEATURE_CHCON_LONG_OPTIONS
-	bool "Enable long options"
-	default BUSYBOX_DEFAULT_FEATURE_CHCON_LONG_OPTIONS
-	depends on BUSYBOX_CONFIG_CHCON && BUSYBOX_CONFIG_LONG_OPTS
 config BUSYBOX_CONFIG_GETENFORCE
-	bool "getenforce"
+	bool "getenforce (1.7 kb)"
 	default BUSYBOX_DEFAULT_GETENFORCE
 	depends on BUSYBOX_CONFIG_SELINUX
 	help
 	Enable support to get the current mode of SELinux.
 config BUSYBOX_CONFIG_GETSEBOOL
-	bool "getsebool"
+	bool "getsebool (5.5 kb)"
 	default BUSYBOX_DEFAULT_GETSEBOOL
 	depends on BUSYBOX_CONFIG_SELINUX
 	help
 	Enable support to get SELinux boolean values.
 config BUSYBOX_CONFIG_LOAD_POLICY
-	bool "load_policy"
+	bool "load_policy (1.6 kb)"
 	default BUSYBOX_DEFAULT_LOAD_POLICY
 	depends on BUSYBOX_CONFIG_SELINUX
 	help
 	Enable support to load SELinux policy.
 config BUSYBOX_CONFIG_MATCHPATHCON
-	bool "matchpathcon"
+	bool "matchpathcon (6.1 kb)"
 	default BUSYBOX_DEFAULT_MATCHPATHCON
 	depends on BUSYBOX_CONFIG_SELINUX
 	help
 	Enable support to get default security context of the
 	specified path from the file contexts configuration.
 config BUSYBOX_CONFIG_RUNCON
-	bool "runcon"
+	bool "runcon (6.6 kb)"
 	default BUSYBOX_DEFAULT_RUNCON
 	depends on BUSYBOX_CONFIG_SELINUX
 	help
 	Enable support to run command in specified security context.
-
-config BUSYBOX_CONFIG_FEATURE_RUNCON_LONG_OPTIONS
-	bool "Enable long options"
-	default BUSYBOX_DEFAULT_FEATURE_RUNCON_LONG_OPTIONS
-	depends on BUSYBOX_CONFIG_RUNCON && BUSYBOX_CONFIG_LONG_OPTS
 config BUSYBOX_CONFIG_SELINUXENABLED
-	bool "selinuxenabled"
+	bool "selinuxenabled (321 bytes)"
 	default BUSYBOX_DEFAULT_SELINUXENABLED
 	depends on BUSYBOX_CONFIG_SELINUX
 	help
 	Enable support for this command to be used within shell scripts
 	to determine if selinux is enabled.
 config BUSYBOX_CONFIG_SESTATUS
-	bool "sestatus"
+	bool "sestatus (12 kb)"
 	default BUSYBOX_DEFAULT_SESTATUS
 	depends on BUSYBOX_CONFIG_SELINUX
 	help
 	Displays the status of SELinux.
 config BUSYBOX_CONFIG_SETENFORCE
-	bool "setenforce"
+	bool "setenforce (2.1 kb)"
 	default BUSYBOX_DEFAULT_SETENFORCE
 	depends on BUSYBOX_CONFIG_SELINUX
 	help
 	Enable support to modify the mode SELinux is running in.
 config BUSYBOX_CONFIG_SETFILES
-	bool "setfiles"
+	bool "setfiles (13 kb)"
 	default BUSYBOX_DEFAULT_SETFILES
 	depends on BUSYBOX_CONFIG_SELINUX
 	help
@@ -92,14 +82,14 @@ config BUSYBOX_CONFIG_FEATURE_SETFILES_CHECK_OPTION
 	the specified binary policy) for setfiles. Requires libsepol.
 
 config BUSYBOX_CONFIG_RESTORECON
-	bool "restorecon"
+	bool "restorecon (12 kb)"
 	default BUSYBOX_DEFAULT_RESTORECON
 	depends on BUSYBOX_CONFIG_SELINUX
 	help
 	Enable support to relabel files. The feature is almost
 	the same as setfiles, but usage is a little different.
 config BUSYBOX_CONFIG_SETSEBOOL
-	bool "setsebool"
+	bool "setsebool (1.7 kb)"
 	default BUSYBOX_DEFAULT_SETSEBOOL
 	depends on BUSYBOX_CONFIG_SELINUX
 	help
diff --git a/package/utils/busybox/config/shell/Config.in b/package/utils/busybox/config/shell/Config.in
index 97b7f1cfc8..ddaa333e04 100644
--- a/package/utils/busybox/config/shell/Config.in
+++ b/package/utils/busybox/config/shell/Config.in
@@ -1,7 +1,7 @@
 # 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.
+# see docs/Kconfig-language.txt.
 #
 
 menu "Shells"
@@ -79,12 +79,11 @@ endchoice
 
 
 config BUSYBOX_CONFIG_ASH
-	bool "ash"
+	bool "ash (78 kb)"
 	default BUSYBOX_DEFAULT_ASH
 	depends on !BUSYBOX_CONFIG_NOMMU
 	help
-	Tha 'ash' shell adds about 60k in the default configuration and is
-	the most complete and most pedantically correct shell included with
+	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.
@@ -115,6 +114,22 @@ config BUSYBOX_CONFIG_ASH_BASH_COMPAT
 	default BUSYBOX_DEFAULT_ASH_BASH_COMPAT
 	depends on BUSYBOX_CONFIG_ASH || BUSYBOX_CONFIG_SH_IS_ASH || BUSYBOX_CONFIG_BASH_IS_ASH
 
+config BUSYBOX_CONFIG_ASH_BASH_SOURCE_CURDIR
+	bool "'source' and '.' builtins search current directory after $PATH"
+	default BUSYBOX_DEFAULT_ASH_BASH_SOURCE_CURDIR   # do not encourage non-standard behavior
+	depends on BUSYBOX_CONFIG_ASH_BASH_COMPAT
+	help
+	This is not compliant with standards. Avoid if possible.
+
+config BUSYBOX_CONFIG_ASH_BASH_NOT_FOUND_HOOK
+	bool "command_not_found_handle hook support"
+	default BUSYBOX_DEFAULT_ASH_BASH_NOT_FOUND_HOOK
+	depends on BUSYBOX_CONFIG_ASH_BASH_COMPAT
+	help
+	Enable support for the 'command_not_found_handle' hook function,
+	from GNU bash, which allows for alternative command not found
+	handling.
+
 config BUSYBOX_CONFIG_ASH_JOB_CONTROL
 	bool "Job control"
 	default BUSYBOX_DEFAULT_ASH_JOB_CONTROL
@@ -198,7 +213,7 @@ config BUSYBOX_CONFIG_ASH_CMDCMD
 
 endif # ash options
 config BUSYBOX_CONFIG_CTTYHACK
-	bool "cttyhack"
+	bool "cttyhack (2.4 kb)"
 	default BUSYBOX_DEFAULT_CTTYHACK
 	help
 	One common problem reported on the mailing list is the "can't
@@ -241,10 +256,10 @@ config BUSYBOX_CONFIG_CTTYHACK
 
 	# getty 115200 $(cttyhack)
 config BUSYBOX_CONFIG_HUSH
-	bool "hush"
+	bool "hush (68 kb)"
 	default BUSYBOX_DEFAULT_HUSH
 	help
-	hush is a small shell (25k). It handles the normal flow control
+	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.
@@ -266,6 +281,18 @@ config BUSYBOX_CONFIG_HUSH_BRACE_EXPANSION
 	help
 	Enable {abc,def} extension.
 
+config BUSYBOX_CONFIG_HUSH_LINENO_VAR
+	bool "$LINENO variable"
+	default BUSYBOX_DEFAULT_HUSH_LINENO_VAR
+	depends on BUSYBOX_CONFIG_HUSH_BASH_COMPAT
+
+config BUSYBOX_CONFIG_HUSH_BASH_SOURCE_CURDIR
+	bool "'source' and '.' builtins search current directory after $PATH"
+	default BUSYBOX_DEFAULT_HUSH_BASH_SOURCE_CURDIR   # do not encourage non-standard behavior
+	depends on BUSYBOX_CONFIG_HUSH_BASH_COMPAT
+	help
+	This is not compliant with standards. Avoid if possible.
+
 config BUSYBOX_CONFIG_HUSH_INTERACTIVE
 	bool "Interactive mode"
 	default BUSYBOX_DEFAULT_HUSH_INTERACTIVE
@@ -293,7 +320,7 @@ config BUSYBOX_CONFIG_HUSH_JOB
 	but no separate process group is formed.
 
 config BUSYBOX_CONFIG_HUSH_TICK
-	bool "Support process substitution"
+	bool "Support command substitution"
 	default BUSYBOX_DEFAULT_HUSH_TICK
 	depends on BUSYBOX_CONFIG_HUSH || BUSYBOX_CONFIG_SH_IS_HUSH || BUSYBOX_CONFIG_BASH_IS_HUSH
 	help
@@ -378,6 +405,13 @@ config BUSYBOX_CONFIG_HUSH_EXPORT_N
 	help
 	export -n unexports variables. It is a bash extension.
 
+config BUSYBOX_CONFIG_HUSH_READONLY
+	bool "readonly builtin"
+	default BUSYBOX_DEFAULT_HUSH_READONLY
+	depends on BUSYBOX_CONFIG_HUSH || BUSYBOX_CONFIG_SH_IS_HUSH || BUSYBOX_CONFIG_BASH_IS_HUSH
+	help
+	Enable support for read-only variables.
+
 config BUSYBOX_CONFIG_HUSH_KILL
 	bool "kill builtin (supports kill %jobspec)"
 	default BUSYBOX_DEFAULT_HUSH_KILL
@@ -388,6 +422,11 @@ config BUSYBOX_CONFIG_HUSH_WAIT
 	default BUSYBOX_DEFAULT_HUSH_WAIT
 	depends on BUSYBOX_CONFIG_HUSH || BUSYBOX_CONFIG_SH_IS_HUSH || BUSYBOX_CONFIG_BASH_IS_HUSH
 
+config BUSYBOX_CONFIG_HUSH_COMMAND
+	bool "command builtin"
+	default BUSYBOX_DEFAULT_HUSH_COMMAND
+	depends on BUSYBOX_CONFIG_HUSH || BUSYBOX_CONFIG_SH_IS_HUSH || BUSYBOX_CONFIG_BASH_IS_HUSH
+
 config BUSYBOX_CONFIG_HUSH_TRAP
 	bool "trap builtin"
 	default BUSYBOX_DEFAULT_HUSH_TRAP
@@ -398,6 +437,11 @@ config BUSYBOX_CONFIG_HUSH_TYPE
 	default BUSYBOX_DEFAULT_HUSH_TYPE
 	depends on BUSYBOX_CONFIG_HUSH || BUSYBOX_CONFIG_SH_IS_HUSH || BUSYBOX_CONFIG_BASH_IS_HUSH
 
+config BUSYBOX_CONFIG_HUSH_TIMES
+	bool "times builtin"
+	default BUSYBOX_DEFAULT_HUSH_TIMES
+	depends on BUSYBOX_CONFIG_HUSH || BUSYBOX_CONFIG_SH_IS_HUSH || BUSYBOX_CONFIG_BASH_IS_HUSH
+
 config BUSYBOX_CONFIG_HUSH_READ
 	bool "read builtin"
 	default BUSYBOX_DEFAULT_HUSH_READ
@@ -423,18 +467,16 @@ config BUSYBOX_CONFIG_HUSH_UMASK
 	default BUSYBOX_DEFAULT_HUSH_UMASK
 	depends on BUSYBOX_CONFIG_HUSH || BUSYBOX_CONFIG_SH_IS_HUSH || BUSYBOX_CONFIG_BASH_IS_HUSH
 
+config BUSYBOX_CONFIG_HUSH_GETOPTS
+	bool "getopts builtin"
+	default BUSYBOX_DEFAULT_HUSH_GETOPTS
+	depends on BUSYBOX_CONFIG_HUSH || BUSYBOX_CONFIG_SH_IS_HUSH || BUSYBOX_CONFIG_BASH_IS_HUSH
+
 config BUSYBOX_CONFIG_HUSH_MEMLEAK
 	bool "memleak builtin (debugging)"
 	default BUSYBOX_DEFAULT_HUSH_MEMLEAK
 	depends on BUSYBOX_CONFIG_HUSH || BUSYBOX_CONFIG_SH_IS_HUSH || BUSYBOX_CONFIG_BASH_IS_HUSH
 
-config BUSYBOX_CONFIG_MSH
-	bool "msh (deprecated: aliased to hush)"
-	default BUSYBOX_DEFAULT_MSH
-	select BUSYBOX_CONFIG_HUSH
-	help
-	msh is deprecated and will be removed, please migrate to hush.
-
 
 comment "Options common to all shells"
 if ASH || BUSYBOX_CONFIG_HUSH || BUSYBOX_CONFIG_SH_IS_ASH || BUSYBOX_CONFIG_BASH_IS_ASH || BUSYBOX_CONFIG_SH_IS_HUSH || BUSYBOX_CONFIG_BASH_IS_HUSH
@@ -501,6 +543,13 @@ config BUSYBOX_CONFIG_FEATURE_SH_NOFORK
 	This feature is relatively new. Use with care. Report bugs
 	to project mailing list.
 
+config BUSYBOX_CONFIG_FEATURE_SH_READ_FRAC
+	bool "read -t N.NNN support (+110 bytes)"
+	default BUSYBOX_DEFAULT_FEATURE_SH_READ_FRAC
+	depends on BUSYBOX_CONFIG_ASH || BUSYBOX_CONFIG_HUSH || BUSYBOX_CONFIG_SH_IS_ASH || BUSYBOX_CONFIG_BASH_IS_ASH || BUSYBOX_CONFIG_SH_IS_HUSH || BUSYBOX_CONFIG_BASH_IS_HUSH
+	help
+	Enable support for fractional second timeout in read builtin.
+
 config BUSYBOX_CONFIG_FEATURE_SH_HISTFILESIZE
 	bool "Use $HISTFILESIZE"
 	default BUSYBOX_DEFAULT_FEATURE_SH_HISTFILESIZE
@@ -510,6 +559,20 @@ config BUSYBOX_CONFIG_FEATURE_SH_HISTFILESIZE
 	to set shell history size. Note that its max value is capped
 	by "History size" setting in library tuning section.
 
+config BUSYBOX_CONFIG_FEATURE_SH_EMBEDDED_SCRIPTS
+	bool "Embed scripts in the binary"
+	default BUSYBOX_DEFAULT_FEATURE_SH_EMBEDDED_SCRIPTS
+	depends on BUSYBOX_CONFIG_ASH || BUSYBOX_CONFIG_HUSH || BUSYBOX_CONFIG_SH_IS_ASH || BUSYBOX_CONFIG_BASH_IS_ASH || BUSYBOX_CONFIG_SH_IS_HUSH || BUSYBOX_CONFIG_BASH_IS_HUSH
+	help
+	Allow scripts to be compressed and embedded in the busybox
+	binary. The scripts should be placed in the 'embed' directory
+	at build time. Like applets, scripts can be run as
+	'busybox SCRIPT ...' or by linking their name to the binary.
+
+	This also allows applets to be implemented as scripts: place
+	the script in 'applets_sh' and a stub C file containing
+	configuration in the appropriate subsystem directory.
+
 endif # Options common to all shells
 
 endmenu
diff --git a/package/utils/busybox/config/sysklogd/Config.in b/package/utils/busybox/config/sysklogd/Config.in
index 2fe20f2102..33a5e8238a 100644
--- a/package/utils/busybox/config/sysklogd/Config.in
+++ b/package/utils/busybox/config/sysklogd/Config.in
@@ -1,13 +1,13 @@
 # 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.
+# see docs/Kconfig-language.txt.
 #
 
 menu "System Logging Utilities"
 
 config BUSYBOX_CONFIG_KLOGD
-	bool "klogd"
+	bool "klogd (5.7 kb)"
 	default BUSYBOX_DEFAULT_KLOGD
 	help
 	klogd is a utility which intercepts and logs all
@@ -36,16 +36,16 @@ config BUSYBOX_CONFIG_FEATURE_KLOGD_KLOGCTL
 
 	If in doubt, say 'Y'.
 config BUSYBOX_CONFIG_LOGGER
-	bool "logger"
+	bool "logger (6.3 kb)"
 	default BUSYBOX_DEFAULT_LOGGER
 	select BUSYBOX_CONFIG_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_CONFIG_LOGREAD
-	bool "logread"
+	bool "logread (4.8 kb)"
 	default BUSYBOX_DEFAULT_LOGREAD
 	help
 	If you enabled Circular Buffer support, you almost
@@ -65,7 +65,7 @@ config BUSYBOX_CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING
 	contention at some minor memory expense.
 
 config BUSYBOX_CONFIG_SYSLOGD
-	bool "syslogd"
+	bool "syslogd (13 kb)"
 	default BUSYBOX_DEFAULT_SYSLOGD
 	help
 	The syslogd utility is used to record logs of all the
diff --git a/package/utils/busybox/config/util-linux/Config.in b/package/utils/busybox/config/util-linux/Config.in
index 28b66fc818..20d7818f00 100644
--- a/package/utils/busybox/config/util-linux/Config.in
+++ b/package/utils/busybox/config/util-linux/Config.in
@@ -1,13 +1,13 @@
 # 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.
+# see docs/Kconfig-language.txt.
 #
 
 menu "Linux System Utilities"
 
 config BUSYBOX_CONFIG_ACPID
-	bool "acpid"
+	bool "acpid (9 kb)"
 	default BUSYBOX_DEFAULT_ACPID
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
@@ -29,19 +29,18 @@ config BUSYBOX_CONFIG_FEATURE_ACPID_COMPAT
 	help
 	Accept and ignore compatibility options -g -m -s -S -v.
 config BUSYBOX_CONFIG_BLKDISCARD
-	bool "blkdiscard"
+	bool "blkdiscard (4.3 kb)"
 	default BUSYBOX_DEFAULT_BLKDISCARD
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
 	blkdiscard discards sectors on a given device.
 config BUSYBOX_CONFIG_BLKID
-	bool "blkid"
+	bool "blkid (12 kb)"
 	default BUSYBOX_DEFAULT_BLKID
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	select BUSYBOX_CONFIG_VOLUMEID
 	help
 	Lists labels and UUIDs of all filesystems.
-	WARNING:
-	With all submodules selected, it will add ~8k to busybox.
 
 config BUSYBOX_CONFIG_FEATURE_BLKID_TYPE
 	bool "Print filesystem type"
@@ -50,23 +49,23 @@ config BUSYBOX_CONFIG_FEATURE_BLKID_TYPE
 	help
 	Show TYPE="filesystem type"
 config BUSYBOX_CONFIG_BLOCKDEV
-	bool "blockdev"
+	bool "blockdev (2.3 kb)"
 	default BUSYBOX_DEFAULT_BLOCKDEV
 	help
 	Performs some ioctls with block devices.
 config BUSYBOX_CONFIG_CAL
-	bool "cal"
+	bool "cal (5.8 kb)"
 	default BUSYBOX_DEFAULT_CAL
 	help
 	cal is used to display a monthly calendar.
 config BUSYBOX_CONFIG_CHRT
-	bool "chrt"
+	bool "chrt (4.7 kb)"
 	default BUSYBOX_DEFAULT_CHRT
 	help
-	manipulate real-time attributes of a process.
+	Manipulate real-time attributes of a process.
 	This requires sched_{g,s}etparam support in your libc.
 config BUSYBOX_CONFIG_DMESG
-	bool "dmesg"
+	bool "dmesg (3.7 kb)"
 	default BUSYBOX_DEFAULT_DMESG
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
@@ -88,18 +87,18 @@ config BUSYBOX_CONFIG_FEATURE_DMESG_PRETTY
 	"<#>".
 
 	With this option you will see:
-	    # dmesg
-	    Linux version 2.6.17.4 .....
-	    BIOS-provided physical RAM map:
-	     BIOS-e820: 0000000000000000 - 000000000009f000 (usable)
+		# 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)
+		# dmesg
+		<5>Linux version 2.6.17.4 .....
+		<6>BIOS-provided physical RAM map:
+		<6> BIOS-e820: 0000000000000000 - 000000000009f000 (usable)
 config BUSYBOX_CONFIG_EJECT
-	bool "eject"
+	bool "eject (4 kb)"
 	default BUSYBOX_DEFAULT_EJECT
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
@@ -113,18 +112,18 @@ config BUSYBOX_CONFIG_FEATURE_EJECT_SCSI
 	Add the -s option to eject, this allows to eject SCSI-Devices and
 	usb-storage devices.
 config BUSYBOX_CONFIG_FALLOCATE
-	bool "fallocate"
+	bool "fallocate (4.1 kb)"
 	default BUSYBOX_DEFAULT_FALLOCATE
 	help
 	Preallocate space for files.
 config BUSYBOX_CONFIG_FATATTR
-	bool "fatattr"
+	bool "fatattr (1.9 kb)"
 	default BUSYBOX_DEFAULT_FATATTR
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
 	fatattr lists or changes the file attributes on a fat file system.
 config BUSYBOX_CONFIG_FBSET
-	bool "fbset"
+	bool "fbset (5.9 kb)"
 	default BUSYBOX_DEFAULT_FBSET
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
@@ -152,13 +151,13 @@ config BUSYBOX_CONFIG_FEATURE_FBSET_READMODE
 	default BUSYBOX_DEFAULT_FEATURE_FBSET_READMODE /etc/fb.modes, which can be used to set frame buffer
 	device to pre-defined video modes.
 config BUSYBOX_CONFIG_FDFORMAT
-	bool "fdformat"
+	bool "fdformat (4.4 kb)"
 	default BUSYBOX_DEFAULT_FDFORMAT
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
 	fdformat is used to low-level format a floppy disk.
 config BUSYBOX_CONFIG_FDISK
-	bool "fdisk"
+	bool "fdisk (37 kb)"
 	default BUSYBOX_DEFAULT_FDISK
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
@@ -232,21 +231,19 @@ config BUSYBOX_CONFIG_FEATURE_FDISK_ADVANCED
 	partition, and similarly evil things. Unless you have a very good
 	reason you would be wise to leave this disabled.
 config BUSYBOX_CONFIG_FINDFS
-	bool "findfs"
+	bool "findfs (12 kb)"
 	default BUSYBOX_DEFAULT_FINDFS
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	select BUSYBOX_CONFIG_VOLUMEID
 	help
 	Prints the name of a filesystem with given label or UUID.
-	WARNING:
-	With all submodules selected, it will add ~8k to busybox.
 config BUSYBOX_CONFIG_FLOCK
-	bool "flock"
+	bool "flock (6.3 kb)"
 	default BUSYBOX_DEFAULT_FLOCK
 	help
 	Manage locks from shell scripts
 config BUSYBOX_CONFIG_FDFLUSH
-	bool "fdflush"
+	bool "fdflush (1.3 kb)"
 	default BUSYBOX_DEFAULT_FDFLUSH
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
@@ -259,7 +256,7 @@ config BUSYBOX_CONFIG_FDFLUSH
 	leave this disabled.
 
 config BUSYBOX_CONFIG_FREERAMDISK
-	bool "freeramdisk"
+	bool "freeramdisk (1.3 kb)"
 	default BUSYBOX_DEFAULT_FREERAMDISK
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
@@ -270,7 +267,7 @@ config BUSYBOX_CONFIG_FREERAMDISK
 	ramdisk. If you have no use for freeing memory from a ramdisk, leave
 	this disabled.
 config BUSYBOX_CONFIG_FSCK_MINIX
-	bool "fsck_minix"
+	bool "fsck.minix (13 kb)"
 	default BUSYBOX_DEFAULT_FSCK_MINIX
 	help
 	The minix filesystem is a nice, small, compact, read-write filesystem
@@ -280,20 +277,20 @@ config BUSYBOX_CONFIG_FSCK_MINIX
 	check for and attempt to repair any corruption that occurs to a minix
 	filesystem.
 config BUSYBOX_CONFIG_FSFREEZE
-	bool "fsfreeze"
+	bool "fsfreeze (3.5 kb)"
 	default BUSYBOX_DEFAULT_FSFREEZE
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	select BUSYBOX_CONFIG_LONG_OPTS
 	help
 	Halt new accesses and flush writes on a mounted filesystem.
 config BUSYBOX_CONFIG_FSTRIM
-	bool "fstrim"
+	bool "fstrim (4.4 kb)"
 	default BUSYBOX_DEFAULT_FSTRIM
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
 	Discard unused blocks on a mounted filesystem.
 config BUSYBOX_CONFIG_GETOPT
-	bool "getopt"
+	bool "getopt (5.8 kb)"
 	default BUSYBOX_DEFAULT_GETOPT
 	help
 	The getopt utility is used to break up (parse) options in command
@@ -304,13 +301,13 @@ config BUSYBOX_CONFIG_GETOPT
 	wisely leave this disabled.
 
 config BUSYBOX_CONFIG_FEATURE_GETOPT_LONG
-	bool "Support option -l"
-	default BUSYBOX_DEFAULT_FEATURE_GETOPT_LONG if BUSYBOX_CONFIG_LONG_OPTS
-	depends on BUSYBOX_CONFIG_GETOPT
+	bool "Support -l LONGOPTs"
+	default BUSYBOX_DEFAULT_FEATURE_GETOPT_LONG
+	depends on BUSYBOX_CONFIG_GETOPT && BUSYBOX_CONFIG_LONG_OPTS
 	help
 	Enable support for long options (option -l).
 config BUSYBOX_CONFIG_HEXDUMP
-	bool "hexdump"
+	bool "hexdump (8.6 kb)"
 	default BUSYBOX_DEFAULT_HEXDUMP
 	help
 	The hexdump utility is used to display binary data in a readable
@@ -327,18 +324,18 @@ config BUSYBOX_CONFIG_FEATURE_HEXDUMP_REVERSE
 	aimed to be portable.
 
 config BUSYBOX_CONFIG_HD
-	bool "hd"
+	bool "hd (7.8 kb)"
 	default BUSYBOX_DEFAULT_HD
 	help
 	hd is an alias to hexdump -C.
 config BUSYBOX_CONFIG_XXD
-	bool "xxd"
+	bool "xxd (8.9 kb)"
 	default BUSYBOX_DEFAULT_XXD
 	help
 	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_CONFIG_HWCLOCK
-	bool "hwclock"
+	bool "hwclock (5.8 kb)"
 	default BUSYBOX_DEFAULT_HWCLOCK
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
@@ -347,11 +344,6 @@ config BUSYBOX_CONFIG_HWCLOCK
 	shutdown in the hardware clock, so the hardware will keep the
 	correct time when Linux is _not_ running.
 
-config BUSYBOX_CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS
-	bool "Support long options (--hctosys,...)"
-	default BUSYBOX_DEFAULT_FEATURE_HWCLOCK_LONG_OPTIONS
-	depends on BUSYBOX_CONFIG_HWCLOCK && BUSYBOX_CONFIG_LONG_OPTS
-
 config BUSYBOX_CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS
 	bool "Use FHS /var/lib/hwclock/adjtime"
 	default BUSYBOX_DEFAULT_FEATURE_HWCLOCK_ADJTIME_FHS  # util-linux-ng in Fedora 13 still uses /etc/adjtime
@@ -364,28 +356,28 @@ config BUSYBOX_CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS
 
 	pathname.com/fhs/pub/fhs-2.3.html#VARLIBHWCLOCKSTATEDIRECTORYFORHWCLO
 config BUSYBOX_CONFIG_IONICE
-	bool "ionice"
+	bool "ionice (3.8 kb)"
 	default BUSYBOX_DEFAULT_IONICE
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
 	Set/set program io scheduling class and priority
 	Requires kernel >= 2.6.13
 config BUSYBOX_CONFIG_IPCRM
-	bool "ipcrm"
+	bool "ipcrm (3.2 kb)"
 	default BUSYBOX_DEFAULT_IPCRM
 	help
 	The ipcrm utility allows the removal of System V interprocess
 	communication (IPC) objects and the associated data structures
 	from the system.
 config BUSYBOX_CONFIG_IPCS
-	bool "ipcs"
+	bool "ipcs (11 kb)"
 	default BUSYBOX_DEFAULT_IPCS
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
 	The ipcs utility is used to provide information on the currently
 	allocated System V interprocess (IPC) objects in the system.
 config BUSYBOX_CONFIG_LAST
-	bool "last"
+	bool "last (6.1 kb)"
 	default BUSYBOX_DEFAULT_LAST
 	depends on BUSYBOX_CONFIG_FEATURE_WTMP
 	help
@@ -399,7 +391,7 @@ config BUSYBOX_CONFIG_FEATURE_LAST_FANCY
 	'last' displays detailed information about the last users that
 	logged into the system (mimics sysvinit last). +900 bytes.
 config BUSYBOX_CONFIG_LOSETUP
-	bool "losetup"
+	bool "losetup (5.5 kb)"
 	default BUSYBOX_DEFAULT_LOSETUP
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
@@ -407,7 +399,7 @@ config BUSYBOX_CONFIG_LOSETUP
 	file or block device, and to query the status of a loop device. This
 	version does not currently support enabling data encryption.
 config BUSYBOX_CONFIG_LSPCI
-	bool "lspci"
+	bool "lspci (6.3 kb)"
 	default BUSYBOX_DEFAULT_LSPCI
 	#select PLATFORM_LINUX
 	help
@@ -416,7 +408,7 @@ config BUSYBOX_CONFIG_LSPCI
 
 	This version uses sysfs (/sys/bus/pci/devices) only.
 config BUSYBOX_CONFIG_LSUSB
-	bool "lsusb"
+	bool "lsusb (4.2 kb)"
 	default BUSYBOX_DEFAULT_LSUSB
 	#select PLATFORM_LINUX
 	help
@@ -425,7 +417,7 @@ config BUSYBOX_CONFIG_LSUSB
 
 	This version uses sysfs (/sys/bus/usb/devices) only.
 config BUSYBOX_CONFIG_MDEV
-	bool "mdev"
+	bool "mdev (17 kb)"
 	default BUSYBOX_DEFAULT_MDEV
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
@@ -472,7 +464,7 @@ config BUSYBOX_CONFIG_FEATURE_MDEV_EXEC
 	For more information, please see docs/mdev.txt
 
 config BUSYBOX_CONFIG_FEATURE_MDEV_LOAD_FIRMWARE
-	bool "Support loading of firmwares"
+	bool "Support loading of firmware"
 	default BUSYBOX_DEFAULT_FEATURE_MDEV_LOAD_FIRMWARE
 	depends on BUSYBOX_CONFIG_MDEV
 	help
@@ -482,7 +474,7 @@ config BUSYBOX_CONFIG_FEATURE_MDEV_LOAD_FIRMWARE
 	/lib/firmware/ and if it exists, send it to the kernel for
 	loading into the hardware.
 config BUSYBOX_CONFIG_MESG
-	bool "mesg"
+	bool "mesg (1.4 kb)"
 	default BUSYBOX_DEFAULT_MESG
 	help
 	Mesg controls access to your terminal by others. It is typically
@@ -500,20 +492,20 @@ config BUSYBOX_CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP
 	If you set this option to N, "mesg y" will enable writing
 	by anybody at all. This is not recommended.
 config BUSYBOX_CONFIG_MKE2FS
-	bool "mke2fs"
+	bool "mke2fs (10 kb)"
 	default BUSYBOX_DEFAULT_MKE2FS
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
 	Utility to create EXT2 filesystems.
 
 config BUSYBOX_CONFIG_MKFS_EXT2
-	bool "mkfs.ext2"
+	bool "mkfs.ext2 (10 kb)"
 	default BUSYBOX_DEFAULT_MKFS_EXT2
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
 	Alias to "mke2fs".
 config BUSYBOX_CONFIG_MKFS_MINIX
-	bool "mkfs_minix"
+	bool "mkfs.minix (10 kb)"
 	default BUSYBOX_DEFAULT_MKFS_MINIX
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
@@ -537,20 +529,20 @@ config BUSYBOX_CONFIG_MKFS_REISER
 	Utility to create ReiserFS filesystems.
 	Note: this applet needs a lot of testing and polishing.
 config BUSYBOX_CONFIG_MKDOSFS
-	bool "mkdosfs"
+	bool "mkdosfs (7.2 kb)"
 	default BUSYBOX_DEFAULT_MKDOSFS
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
 	Utility to create FAT32 filesystems.
 
 config BUSYBOX_CONFIG_MKFS_VFAT
-	bool "mkfs.vfat"
+	bool "mkfs.vfat (7.2 kb)"
 	default BUSYBOX_DEFAULT_MKFS_VFAT
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
 	Alias to "mkdosfs".
 config BUSYBOX_CONFIG_MKSWAP
-	bool "mkswap"
+	bool "mkswap (6.3 kb)"
 	default BUSYBOX_DEFAULT_MKSWAP
 	help
 	The mkswap utility is used to configure a file or disk partition as
@@ -569,7 +561,7 @@ config BUSYBOX_CONFIG_FEATURE_MKSWAP_UUID
 	help
 	Generate swap spaces with universally unique identifiers.
 config BUSYBOX_CONFIG_MORE
-	bool "more"
+	bool "more (7 kb)"
 	default BUSYBOX_DEFAULT_MORE
 	help
 	more is a simple utility which allows you to read text one screen
@@ -578,7 +570,7 @@ config BUSYBOX_CONFIG_MORE
 	you will probably find this utility very helpful. If you don't have
 	any need to reading text files, you can leave this disabled.
 config BUSYBOX_CONFIG_MOUNT
-	bool "mount"
+	bool "mount (23 kb)"
 	default BUSYBOX_DEFAULT_MOUNT
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
@@ -586,18 +578,17 @@ config BUSYBOX_CONFIG_MOUNT
 	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.
+	NFS filesystems.
 
 config BUSYBOX_CONFIG_FEATURE_MOUNT_FAKE
-	bool "Support option -f"
+	bool "Support -f (fake mount)"
 	default BUSYBOX_DEFAULT_FEATURE_MOUNT_FAKE
 	depends on BUSYBOX_CONFIG_MOUNT
 	help
 	Enable support for faking a file system mount.
 
 config BUSYBOX_CONFIG_FEATURE_MOUNT_VERBOSE
-	bool "Support option -v"
+	bool "Support -v (verbose)"
 	default BUSYBOX_DEFAULT_FEATURE_MOUNT_VERBOSE
 	depends on BUSYBOX_CONFIG_MOUNT
 	help
@@ -625,7 +616,19 @@ config BUSYBOX_CONFIG_FEATURE_MOUNT_LABEL
 	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.
+
+config BUSYBOX_CONFIG_FEATURE_MOUNT_NFS
+	bool "Support mounting NFS file systems on Linux < 2.6.23"
+	default BUSYBOX_DEFAULT_FEATURE_MOUNT_NFS
+	depends on BUSYBOX_CONFIG_MOUNT
+	select BUSYBOX_CONFIG_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.
+
+	Note that this option links in RPC support from libc,
+	which is rather large (~10 kbytes on uclibc).
 
 config BUSYBOX_CONFIG_FEATURE_MOUNT_CIFS
 	bool "Support mounting CIFS/SMB file systems"
@@ -646,7 +649,7 @@ config BUSYBOX_CONFIG_FEATURE_MOUNT_FLAGS
 
 config BUSYBOX_CONFIG_FEATURE_MOUNT_FSTAB
 	depends on BUSYBOX_CONFIG_MOUNT
-	bool "Support /etc/fstab and -a"
+	bool "Support /etc/fstab and -a (mount all)"
 	default BUSYBOX_DEFAULT_FEATURE_MOUNT_FSTAB
 	help
 	Support mount all and looking for files in /etc/fstab.
@@ -658,26 +661,38 @@ config BUSYBOX_CONFIG_FEATURE_MOUNT_OTHERTAB
 	help
 	Support mount -T (specifying an alternate fstab)
 config BUSYBOX_CONFIG_MOUNTPOINT
-	bool "mountpoint"
+	bool "mountpoint (4.9 kb)"
 	default BUSYBOX_DEFAULT_MOUNTPOINT
 	help
 	mountpoint checks if the directory is a mountpoint.
+config BUSYBOX_CONFIG_NOLOGIN
+	bool "nologin"
+	default BUSYBOX_DEFAULT_NOLOGIN
+	depends on BUSYBOX_CONFIG_FEATURE_SH_EMBEDDED_SCRIPTS
+	help
+	Politely refuse a login
+
+config BUSYBOX_CONFIG_NOLOGIN_DEPENDENCIES
+	bool "Enable dependencies for nologin"
+	default BUSYBOX_DEFAULT_NOLOGIN_DEPENDENCIES
+	depends on BUSYBOX_CONFIG_NOLOGIN
+	select BUSYBOX_CONFIG_CAT
+	select BUSYBOX_CONFIG_ECHO
+	select BUSYBOX_CONFIG_SLEEP
+	help
+	nologin is implemented as a shell script. It requires the
+	following in the runtime environment:
+		cat echo sleep
+	If you know these will be available externally you can
+	disable this option.
 config BUSYBOX_CONFIG_NSENTER
-	bool "nsenter"
+	bool "nsenter (6.5 kb)"
 	default BUSYBOX_DEFAULT_NSENTER
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
 	Run program with namespaces of other processes.
-
-config BUSYBOX_CONFIG_FEATURE_NSENTER_LONG_OPTS
-	bool "Enable long options"
-	default BUSYBOX_DEFAULT_FEATURE_NSENTER_LONG_OPTS
-	depends on BUSYBOX_CONFIG_NSENTER && BUSYBOX_CONFIG_LONG_OPTS
-	help
-	Support long options for the nsenter applet. This makes
-	the busybox implementation more compatible with upstream.
 config BUSYBOX_CONFIG_PIVOT_ROOT
-	bool "pivot_root"
+	bool "pivot_root (1.1 kb)"
 	default BUSYBOX_DEFAULT_PIVOT_ROOT
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
@@ -689,7 +704,7 @@ config BUSYBOX_CONFIG_PIVOT_ROOT
 	Note: This is for initrd in linux 2.4. Under initramfs (introduced
 	in linux 2.6) use switch_root instead.
 config BUSYBOX_CONFIG_RDATE
-	bool "rdate"
+	bool "rdate (5.6 kb)"
 	default BUSYBOX_DEFAULT_RDATE
 	help
 	The rdate utility allows you to synchronize the date and time of your
@@ -697,46 +712,46 @@ config BUSYBOX_CONFIG_RDATE
 	the RFC868 protocol, which is built into the inetd daemon on most
 	systems.
 config BUSYBOX_CONFIG_RDEV
-	bool "rdev"
+	bool "rdev (1.8 kb)"
 	default BUSYBOX_DEFAULT_RDEV
 	help
 	Print the device node associated with the filesystem mounted at '/'.
 config BUSYBOX_CONFIG_READPROFILE
-	bool "readprofile"
+	bool "readprofile (7.1 kb)"
 	default BUSYBOX_DEFAULT_READPROFILE
 	#select PLATFORM_LINUX
 	help
 	This allows you to parse /proc/profile for basic profiling.
 config BUSYBOX_CONFIG_RENICE
-	bool "renice"
+	bool "renice (4.2 kb)"
 	default BUSYBOX_DEFAULT_RENICE
 	help
 	Renice alters the scheduling priority of one or more running
 	processes.
 config BUSYBOX_CONFIG_REV
-	bool "rev"
+	bool "rev (4.4 kb)"
 	default BUSYBOX_DEFAULT_REV
 	help
 	Reverse lines of a file or files.
 config BUSYBOX_CONFIG_RTCWAKE
-	bool "rtcwake"
+	bool "rtcwake (6.8 kb)"
 	default BUSYBOX_DEFAULT_RTCWAKE
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
 	Enter a system sleep state until specified wakeup time.
 config BUSYBOX_CONFIG_SCRIPT
-	bool "script"
+	bool "script (8.6 kb)"
 	default BUSYBOX_DEFAULT_SCRIPT
 	help
 	The script makes typescript of terminal session.
 config BUSYBOX_CONFIG_SCRIPTREPLAY
-	bool "scriptreplay"
+	bool "scriptreplay (2.4 kb)"
 	default BUSYBOX_DEFAULT_SCRIPTREPLAY
 	help
 	This program replays a typescript, using timing information
 	given by script -t.
 config BUSYBOX_CONFIG_SETARCH
-	bool "setarch"
+	bool "setarch (3.6 kb)"
 	default BUSYBOX_DEFAULT_SETARCH
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
@@ -746,37 +761,64 @@ config BUSYBOX_CONFIG_SETARCH
 	(like amd64/x86, ppc64/ppc, sparc64/sparc, etc...).
 
 config BUSYBOX_CONFIG_LINUX32
-	bool "linux32"
+	bool "linux32 (3.3 kb)"
 	default BUSYBOX_DEFAULT_LINUX32
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
 	Alias to "setarch linux32".
 
 config BUSYBOX_CONFIG_LINUX64
-	bool "linux64"
+	bool "linux64 (3.3 kb)"
 	default BUSYBOX_DEFAULT_LINUX64
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
 	Alias to "setarch linux64".
 config BUSYBOX_CONFIG_SETPRIV
-	bool "setpriv"
+	bool "setpriv (6.6 kb)"
 	default BUSYBOX_DEFAULT_SETPRIV
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	select BUSYBOX_CONFIG_LONG_OPTS
 	help
 	Run a program with different Linux privilege settings.
 	Requires kernel >= 3.5
+
+config BUSYBOX_CONFIG_FEATURE_SETPRIV_DUMP
+	bool "Support dumping current privilege state"
+	default BUSYBOX_DEFAULT_FEATURE_SETPRIV_DUMP
+	depends on BUSYBOX_CONFIG_SETPRIV
+	help
+	Enables the "--dump" switch to print out the current privilege
+	state. This is helpful for diagnosing problems.
+
+config BUSYBOX_CONFIG_FEATURE_SETPRIV_CAPABILITIES
+	bool "Support capabilities"
+	default BUSYBOX_DEFAULT_FEATURE_SETPRIV_CAPABILITIES
+	depends on BUSYBOX_CONFIG_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_CONFIG_FEATURE_SETPRIV_CAPABILITY_NAMES
+	bool "Support capability names"
+	default BUSYBOX_DEFAULT_FEATURE_SETPRIV_CAPABILITY_NAMES
+	depends on BUSYBOX_CONFIG_SETPRIV && BUSYBOX_CONFIG_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_CONFIG_SETSID
-	bool "setsid"
+	bool "setsid (3.6 kb)"
 	default BUSYBOX_DEFAULT_SETSID
 	help
 	setsid runs a program in a new session
 config BUSYBOX_CONFIG_SWAPON
-	bool "swapon"
+	bool "swapon (15 kb)"
 	default BUSYBOX_DEFAULT_SWAPON
 	select BUSYBOX_CONFIG_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
@@ -800,13 +842,20 @@ config BUSYBOX_CONFIG_FEATURE_SWAPON_PRI
 	Enable support for setting swap device priority in swapon.
 
 config BUSYBOX_CONFIG_SWAPOFF
-	bool "swapoff"
+	bool "swapoff (14 kb)"
 	default BUSYBOX_DEFAULT_SWAPOFF
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
+
+config BUSYBOX_CONFIG_FEATURE_SWAPONOFF_LABEL
+	bool "Support specifying devices by label or UUID"
+	default BUSYBOX_DEFAULT_FEATURE_SWAPONOFF_LABEL
+	depends on BUSYBOX_CONFIG_SWAPON || BUSYBOX_CONFIG_SWAPOFF
+	select BUSYBOX_CONFIG_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_CONFIG_SWITCH_ROOT
-	bool "switch_root"
+	bool "switch_root (5.5 kb)"
 	default BUSYBOX_DEFAULT_SWITCH_ROOT
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
@@ -824,8 +873,9 @@ config BUSYBOX_CONFIG_SWITCH_ROOT
 	* 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_CONFIG_TASKSET
-	bool "taskset"
+	bool "taskset (4.2 kb)"
 	default BUSYBOX_DEFAULT_TASKSET
 	help
 	Retrieve or set a processes's CPU affinity.
@@ -840,14 +890,14 @@ config BUSYBOX_CONFIG_FEATURE_TASKSET_FANCY
 	affinity parameter 0xHHHHHHHHHHHHHHHHHHHH can be arbitrarily long
 	in this case. Otherwise, it is limited to sizeof(long).
 config BUSYBOX_CONFIG_UEVENT
-	bool "uevent"
+	bool "uevent (3.1 kb)"
 	default BUSYBOX_DEFAULT_UEVENT
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
 	uevent is a netlink listener for kernel uevent notifications
 	sent via netlink. It is usually used for dynamic device creation.
 config BUSYBOX_CONFIG_UMOUNT
-	bool "umount"
+	bool "umount (5.1 kb)"
 	default BUSYBOX_DEFAULT_UMOUNT
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
@@ -857,13 +907,13 @@ config BUSYBOX_CONFIG_UMOUNT
 	utility, you almost certainly also want to enable 'umount'.
 
 config BUSYBOX_CONFIG_FEATURE_UMOUNT_ALL
-	bool "Support option -a"
+	bool "Support -a (unmount all)"
 	default BUSYBOX_DEFAULT_FEATURE_UMOUNT_ALL
 	depends on BUSYBOX_CONFIG_UMOUNT
 	help
 	Support -a option to unmount all currently mounted filesystems.
 config BUSYBOX_CONFIG_UNSHARE
-	bool "unshare"
+	bool "unshare (7.2 kb)"
 	default BUSYBOX_DEFAULT_UNSHARE
 	depends on !BUSYBOX_CONFIG_NOMMU
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
@@ -871,7 +921,7 @@ config BUSYBOX_CONFIG_UNSHARE
 	help
 	Run program with some namespaces unshared from parent.
 config BUSYBOX_CONFIG_WALL
-	bool "wall"
+	bool "wall (2.6 kb)"
 	default BUSYBOX_DEFAULT_WALL
 	depends on BUSYBOX_CONFIG_FEATURE_UTMP
 	help
diff --git a/package/utils/busybox/config/util-linux/volume_id/Config.in b/package/utils/busybox/config/util-linux/volume_id/Config.in
index bfe724fa66..b50fcac34a 100644
--- a/package/utils/busybox/config/util-linux/volume_id/Config.in
+++ b/package/utils/busybox/config/util-linux/volume_id/Config.in
@@ -1,7 +1,7 @@
 # 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.
+# see docs/Kconfig-language.txt.
 #
 
 config BUSYBOX_CONFIG_VOLUMEID
@@ -60,6 +60,16 @@ config BUSYBOX_CONFIG_FEATURE_VOLUMEID_JFS
 	bool "jfs filesystem"
 	default BUSYBOX_DEFAULT_FEATURE_VOLUMEID_JFS
 	depends on BUSYBOX_CONFIG_VOLUMEID
+config BUSYBOX_CONFIG_FEATURE_VOLUMEID_LFS
+	bool "LittleFS filesystem"
+	default BUSYBOX_DEFAULT_FEATURE_VOLUMEID_LFS
+	depends on BUSYBOX_CONFIG_VOLUMEID && BUSYBOX_CONFIG_FEATURE_BLKID_TYPE
+	help
+	LittleFS is a small fail-safe filesystem designed for embedded
+	systems. It has strong copy-on-write guarantees and storage on disk
+	is always kept in a valid state. It also provides a form of dynamic
+	wear levelling for systems that can not fit a full flash translation
+	layer.
 config BUSYBOX_CONFIG_FEATURE_VOLUMEID_LINUXRAID
 	bool "linuxraid"
 	default BUSYBOX_DEFAULT_FEATURE_VOLUMEID_LINUXRAID
@@ -72,6 +82,10 @@ config BUSYBOX_CONFIG_FEATURE_VOLUMEID_LUKS
 	bool "luks filesystem"
 	default BUSYBOX_DEFAULT_FEATURE_VOLUMEID_LUKS
 	depends on BUSYBOX_CONFIG_VOLUMEID
+config BUSYBOX_CONFIG_FEATURE_VOLUMEID_MINIX
+	bool "minix filesystem"
+	default BUSYBOX_DEFAULT_FEATURE_VOLUMEID_MINIX
+	depends on BUSYBOX_CONFIG_VOLUMEID
 config BUSYBOX_CONFIG_FEATURE_VOLUMEID_NILFS
 	bool "nilfs filesystem"
 	default BUSYBOX_DEFAULT_FEATURE_VOLUMEID_NILFS
@@ -151,10 +165,6 @@ config BUSYBOX_CONFIG_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