Import busybox-1.16.x kconfigs symbolsembtk-busybox-kconfigs-1.16.1

Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>

16 files changed, 397 insertions, 146 deletions

diff --git a/busybox-archival.kconfig b/busybox-archival.kconfig
index b537e6f..1a58b34 100644
--- a/busybox-archival.kconfig
+++ b/busybox-archival.kconfig
@@ -105,7 +105,7 @@ config KEMBTK_BUSYB_FEATURE_CPIO_O
 config KEMBTK_BUSYB_FEATURE_CPIO_P
 	bool "Support for passthrough mode"
 	depends on KEMBTK_BUSYB_FEATURE_CPIO_O
-	depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X
+	depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X
 	help
 	  Passthrough mode. Rarely used.
 
@@ -152,16 +152,21 @@ config KEMBTK_BUSYB_GZIP
 	  gzip is used to compress files.
 	  It's probably the most widely used UNIX compression program.
 
+config KEMBTK_BUSYB_FEATURE_GZIP_LONG_OPTIONS
+	bool "Enable long options"
+	depends on KEMBTK_BUSYB_GZIP && KEMBTK_BUSYB_LONG_OPTS
+	help
+	  Enable use of long options, increases size by about 106 Bytes
+
 config KEMBTK_BUSYB_LZOP
 	bool "lzop"
-	depends on EMBTK_BB_VERSION_1_15_X
+	depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X
 	help
 	  Lzop compression/decompresion.
 
 config KEMBTK_BUSYB_LZOP_COMPR_HIGH
 	bool "lzop complession levels 7,8,9 (not very useful)"
 	depends on KEMBTK_BUSYB_LZOP
-	depends on EMBTK_BB_VERSION_1_15_X
 	help
 	  High levels (7,8,9) of lzop compression. These levels
 	  are actually slower than gzip at equivalent compression ratios
@@ -247,6 +252,14 @@ config KEMBTK_BUSYB_FEATURE_TAR_UNAME_GNAME
 	  listings (-t) and preserving permissions when unpacking (-p).
 	  +200 bytes.
 
+config KEMBTK_BUSYB_FEATURE_TAR_NOPRESERVE_TIME
+	bool "Enable -m (do not preserve time) option"
+	depends on KEMBTK_BUSYB_TAR
+	depends on EMBTK_BB_VERSION_1_16_X
+	help
+	  With this option busybox supports GNU tar -m
+	  (do not preserve time) option.
+
 endif #tar
 
 config KEMBTK_BUSYB_UNCOMPRESS
diff --git a/busybox-coreutils.kconfig b/busybox-coreutils.kconfig
index 676847f..5c7d793 100644
--- a/busybox-coreutils.kconfig
+++ b/busybox-coreutils.kconfig
@@ -47,6 +47,13 @@ config KEMBTK_BUSYB_CHOWN
 	  chown is used to change the user and/or group ownership
 	  of files.
 
+config KEMBTK_BUSYB_FEATURE_CHOWN_LONG_OPTIONS
+	bool "Enable long options"
+	depends on KEMBTK_BUSYB_CHOWN && KEMBTK_BUSYB_LONG_OPTS
+	depends on EMBTK_BB_VERSION_1_16_X
+	help
+	  Enable use of long options
+
 config KEMBTK_BUSYB_CHROOT
 	bool "chroot"
 	help
@@ -69,6 +76,14 @@ config KEMBTK_BUSYB_CP
 	help
 	  cp is used to copy files and directories.
 
+config KEMBTK_BUSYB_FEATURE_CP_LONG_OPTIONS
+	bool "Enable long options for cp"
+	depends on KEMBTK_BUSYB_CP && KEMBTK_BUSYB_LONG_OPTS
+	depends on EMBTK_BB_VERSION_1_16_X
+	help
+	  Enable long options for cp.
+	  Also add support for --parents option.
+
 config KEMBTK_BUSYB_CUT
 	bool "cut"
 	help
@@ -89,6 +104,23 @@ config KEMBTK_BUSYB_FEATURE_DATE_ISOFMT
 	  Enable option (-I) to output an ISO-8601 compliant
 	  date/time string.
 
+config KEMBTK_BUSYB_FEATURE_DATE_COMPAT
+	bool "Support weird 'date MMDDhhmm[[YY]YY][.ss]' format"
+	default y
+	depends on KEMBTK_BUSYB_DATE
+	depends on EMBTK_BB_VERSION_1_16_X
+	help
+	  System time can be set by 'date -s KEMBTK_BUSYB_DATE' and simply 'date KEMBTK_BUSYB_DATE',
+	  but formats of KEMBTK_BUSYB_DATE string are different. 'date KEMBTK_BUSYB_DATE' accepts
+	  a rather weird MMDDhhmm[[YY]YY][.ss] format with completely
+	  unnatural placement of year between minutes and seconds.
+	  date -s (and other commands like touch -d) use more sensible
+	  formats (for one, ISO format YYYY-MM-DD hh:mm:ss.ssssss).
+
+	  With this option off, 'date KEMBTK_BUSYB_DATE' is 'date -s KEMBTK_BUSYB_DATE' support
+	  the same format. With it on, 'date KEMBTK_BUSYB_DATE' additionally supports
+	  MMDDhhmm[[YY]YY][.ss] format.
+
 config KEMBTK_BUSYB_DD
 	bool "dd"
 	help
@@ -101,13 +133,22 @@ config KEMBTK_BUSYB_FEATURE_DD_SIGNAL_HANDLING
 	default y
 	depends on KEMBTK_BUSYB_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.
 
 	  $ dd if=/dev/zero of=/dev/null&
 	  $ pid=$! kill -USR1 $pid; sleep 1; kill $pid
-	  10899206+0 records in 10899206+0 records out
+	  10899206+0 records in
+	  10899206+0 records out
+
+config KEMBTK_BUSYB_FEATURE_DD_THIRD_STATUS_LINE
+	bool "Enable the third status line upon signal"
+	depends on KEMBTK_BUSYB_DD && KEMBTK_BUSYB_FEATURE_DD_SIGNAL_HANDLING
+	depends on EMBTK_BB_VERSION_1_16_X
+	help
+	  Displays a coreutils-like third status line with transferred bytes,
+	  elapsed time and speed.
 
 config KEMBTK_BUSYB_FEATURE_DD_IBS_OBS
 	bool "Enable ibs, obs and conv options"
@@ -224,7 +265,7 @@ config KEMBTK_BUSYB_FOLD
 
 config KEMBTK_BUSYB_FSYNC
 	bool "fsync"
-	depends on EMBTK_BB_VERSION_1_15_X
+	depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X
 	help
 	  fsync is used to flush file-related cached blocks to disk.
 
@@ -458,13 +499,13 @@ config KEMBTK_BUSYB_SHA1SUM
 
 config KEMBTK_BUSYB_SHA256SUM
 	bool "sha256sum"
-	depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X
+	depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X
 	help
 	  Compute and check SHA256 message digest
 
 config KEMBTK_BUSYB_SHA512SUM
 	bool "sha512sum"
-	depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X
+	depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X
 	help
 	  Compute and check SHA512 message digest
 
@@ -733,12 +774,12 @@ config KEMBTK_BUSYB_FEATURE_HUMAN_READABLE
 	help
 	  Allow df, du, and ls to have human readable output.
 
-comment "Common options for md5sum, sha1sum"
-	depends on KEMBTK_BUSYB_MD5SUM || KEMBTK_BUSYB_SHA1SUM
+comment "Common options for md5sum, sha1sum, sha256sum, sha512sum"
+	depends on KEMBTK_BUSYB_MD5SUM || KEMBTK_BUSYB_SHA1SUM || KEMBTK_BUSYB_SHA256SUM || KEMBTK_BUSYB_SHA512SUM
 
 config KEMBTK_BUSYB_FEATURE_MD5_SHA1_SUM_CHECK
 	bool "Enable -c, -s and -w options"
-	depends on KEMBTK_BUSYB_MD5SUM || KEMBTK_BUSYB_SHA1SUM
+	depends on KEMBTK_BUSYB_MD5SUM || KEMBTK_BUSYB_SHA1SUM || KEMBTK_BUSYB_SHA256SUM || KEMBTK_BUSYB_SHA512SUM
 	help
 	  Enabling the -c options allows files to be checked
 	  against pre-calculated hash values.
diff --git a/busybox-editors.kconfig b/busybox-editors.kconfig
index 39a7e64..f12eb02 100644
--- a/busybox-editors.kconfig
+++ b/busybox-editors.kconfig
@@ -35,11 +35,19 @@ config KEMBTK_BUSYB_DIFF
 
 config KEMBTK_BUSYB_FEATURE_DIFF_BINARY
 	bool "Enable checks for binary files"
-	default y
 	depends on KEMBTK_BUSYB_DIFF
+	depends on EMBTK_BB_VERSION_1_13_X || EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X
+	default y
+	help
+		This option enables support for checking for binary files
+		before a comparison is carried out.
+
+config KEMBTK_BUSYB_FEATURE_DIFF_LONG_OPTIONS
+	bool "Enable long options"
+	depends on KEMBTK_BUSYB_DIFF && KEMBTK_BUSYB_LONG_OPTS
+	depends on EMBTK_BB_VERSION_1_16_X
 	help
-	  This option enables support for checking for binary files
-	  before a comparison is carried out.
+	  Enable use of long options.
 
 config KEMBTK_BUSYB_FEATURE_DIFF_DIR
 	bool "Enable directory support"
@@ -52,9 +60,10 @@ config KEMBTK_BUSYB_FEATURE_DIFF_DIR
 config KEMBTK_BUSYB_FEATURE_DIFF_MINIMAL
 	bool "Enable -d option to find smaller sets of changes"
 	depends on KEMBTK_BUSYB_DIFF
+	depends on EMBTK_BB_VERSION_1_13_X || EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X
 	help
-	  Enabling this option allows the use of -d to make diff
-	  try hard to find the smallest possible set of changes.
+		Enabling this option allows the use of -d to make diff
+		try hard to find the smallest possible set of changes.
 
 config KEMBTK_BUSYB_ED
 	bool "ed"
diff --git a/busybox-findutils.kconfig b/busybox-findutils.kconfig
index ad8c629..3315f55 100644
--- a/busybox-findutils.kconfig
+++ b/busybox-findutils.kconfig
@@ -170,6 +170,13 @@ config KEMBTK_BUSYB_FEATURE_FIND_CONTEXT
 	help
 	  Support the 'find -context' option for matching security context.
 
+config KEMBTK_BUSYB_FEATURE_FIND_LINKS
+	bool "Enable -links: link count matching"
+	depends on KEMBTK_BUSYB_FIND
+	depends on EMBTK_BB_VERSION_1_16_X
+	help
+	  Support the 'find -links' option for matching number of links.
+
 config KEMBTK_BUSYB_GREP
 	bool "grep"
 	help
diff --git a/busybox-init.kconfig b/busybox-init.kconfig
index 4e70011..c22133c 100644
--- a/busybox-init.kconfig
+++ b/busybox-init.kconfig
@@ -93,7 +93,7 @@ config KEMBTK_BUSYB_HALT
 config KEMBTK_BUSYB_FEATURE_CALL_TELINIT
 	bool "Call telinit on shutdown and reboot"
 	depends on KEMBTK_BUSYB_HALT && !KEMBTK_BUSYB_INIT
-	depends on EMBTK_BB_VERSION_1_15_X
+	depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X
 	help
 	  Call an external program (normally telinit) to facilitate
 	  a switch to a proper runlevel.
@@ -105,7 +105,6 @@ config KEMBTK_BUSYB_TELINIT_PATH
 	string "Path to telinit executable"
 	default "/sbin/telinit"
 	depends on KEMBTK_BUSYB_FEATURE_CALL_TELINIT
-	depends on EMBTK_BB_VERSION_1_15_X
 	help
 	  When busybox halt and friends have to call external telinit
 	  to facilitate proper shutdown, this path is to be used when
diff --git a/busybox-libbb.kconfig b/busybox-libbb.kconfig
index a87e3cf..72d563a 100644
--- a/busybox-libbb.kconfig
+++ b/busybox-libbb.kconfig
@@ -99,18 +99,18 @@ config KEMBTK_BUSYB_FEATURE_EDITING_FANCY_PROMPT
 config KEMBTK_BUSYB_FEATURE_EDITING_ASK_TERMINAL
 	bool "Query cursor position from terminal"
 	depends on KEMBTK_BUSYB_FEATURE_EDITING
-	depends on EMBTK_BB_VERSION_1_15_X
+	depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X
 	help
 	  Allow usage of "ESC [ 6 n" sequence. Terminal answers back with
 	  current cursor position. This information is used to make line
 	  editing more robust in some cases.
 	  If you are not sure whether your terminals respond to this code
-	  correctly, or want to save on code size (about 300 bytes),
+	  correctly, or want to save on code size (about 400 bytes),
 	  then do not turn this option on.
 
 config KEMBTK_BUSYB_FEATURE_NON_POSIX_CP
 	bool "Non-POSIX, but safer, copying to special nodes"
-	depends on EMBTK_BB_VERSION_1_15_X
+	depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X
 	default y
 	help
 	  With this option, "cp file symlink" will delete symlink
@@ -128,9 +128,8 @@ config KEMBTK_BUSYB_FEATURE_VERBOSE_CP_MESSAGE
 	    $ 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 remove '/does_not_exist/file': No such file or directory
+	    cp: cannot create '/does_not_exist/file': No such file or directory
 	    cp: cannot stat '/vmlinuz/file': Not a directory
-	  respectively.
 	  This will cost you ~60 bytes.
 
 config KEMBTK_BUSYB_FEATURE_COPYBUF_KB
diff --git a/busybox-loginutils.kconfig b/busybox-loginutils.kconfig
index 525c08b..6b1ad2b 100644
--- a/busybox-loginutils.kconfig
+++ b/busybox-loginutils.kconfig
@@ -82,7 +82,7 @@ config KEMBTK_BUSYB_USE_BB_CRYPT
 config KEMBTK_BUSYB_USE_BB_CRYPT_SHA
 	bool "Enable SHA256/512 crypt functions"
 	depends on KEMBTK_BUSYB_USE_BB_CRYPT
-	depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X
+	depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X
 	help
 	  Enable this if you have passwords starting with "$5$" or "$6$"
 	  in your /etc/passwd or /etc/shadow files. These passwords
@@ -99,7 +99,7 @@ config KEMBTK_BUSYB_ADDGROUP
 config KEMBTK_BUSYB_FEATURE_ADDGROUP_LONG_OPTIONS
 	bool "Enable long options"
 	depends on KEMBTK_BUSYB_ADDGROUP && KEMBTK_BUSYB_LONG_OPTS
-	depends on EMBTK_BB_VERSION_1_15_X
+	depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X
 	help
 	  Support long options for the addgroup applet.
 
@@ -148,7 +148,7 @@ config KEMBTK_BUSYB_FEATURE_ADDUSER_LONG_OPTIONS
 config KEMBTK_BUSYB_FIRST_SYSTEM_ID
 	int "First valid system uid or gid for adduser and addgroup"
 	depends on KEMBTK_BUSYB_ADDUSER || KEMBTK_BUSYB_ADDGROUP
-	depends on EMBTK_BB_VERSION_1_15_X
+	depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X
 	range 0 64900
 	default 100
 	help
@@ -157,7 +157,7 @@ config KEMBTK_BUSYB_FIRST_SYSTEM_ID
 config KEMBTK_BUSYB_LAST_SYSTEM_ID
 	int "Last valid system uid or gid for adduser and addgroup"
 	depends on KEMBTK_BUSYB_ADDUSER || KEMBTK_BUSYB_ADDGROUP
-	depends on EMBTK_BB_VERSION_1_15_X
+	depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X
 	range 0 64900
 	default 999
 	help
diff --git a/busybox-mailutils.kconfig b/busybox-mailutils.kconfig
index 95e354c..823bc9a 100644
--- a/busybox-mailutils.kconfig
+++ b/busybox-mailutils.kconfig
@@ -48,18 +48,18 @@ config KEMBTK_BUSYB_SENDMAIL
 	  Barebones sendmail.
 
 config KEMBTK_BUSYB_FEATURE_SENDMAIL_MAILX
-	bool "Allow to specify subject, attachments, their charset etc"
-	default y
-	depends on KEMBTK_BUSYB_SENDMAIL
-	depends on EMBTK_BB_VERSION_1_13_X
-	help
-		Allow to specify subject, attachments and their charset.
-		Allow to use custom connection helper.
+       bool "Allow to specify subject, attachments, their charset etc"
+       default y
+       depends on KEMBTK_BUSYB_SENDMAIL
+       depends on EMBTK_BB_VERSION_1_13_X
+       help
+               Allow to specify subject, attachments and their charset.
+               Allow to use custom connection helper.
 
 config KEMBTK_BUSYB_FEATURE_SENDMAIL_MAILXX
-	bool "Allow to specify Cc: addresses and some additional headers"
-	depends on KEMBTK_BUSYB_FEATURE_SENDMAIL_MAILX
-	depends on EMBTK_BB_VERSION_1_13_X
-	help
-		Allow to specify Cc: addresses and some additional headers:
-		Errors-To:
+       bool "Allow to specify Cc: addresses and some additional headers"
+       depends on KEMBTK_BUSYB_FEATURE_SENDMAIL_MAILX
+       depends on EMBTK_BB_VERSION_1_13_X
+       help
+               Allow to specify Cc: addresses and some additional headers:
+               Errors-To:
diff --git a/busybox-miscutils.kconfig b/busybox-miscutils.kconfig
index e7d7723..b53075b 100644
--- a/busybox-miscutils.kconfig
+++ b/busybox-miscutils.kconfig
@@ -21,7 +21,7 @@ config KEMBTK_BUSYB_BBCONFIG
 
 config KEMBTK_BUSYB_BEEP
 	bool "beep"
-	depends on EMBTK_BB_VERSION_1_15_X
+	depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X
 	help
 	  The beep applets beeps in a given freq/Hz.
 
@@ -128,16 +128,16 @@ config KEMBTK_BUSYB_FEATURE_CROND_D
 	  -d sets loglevel to 0 (most verbose) and directs all output to stderr.
 
 config KEMBTK_BUSYB_FEATURE_CROND_CALL_SENDMAIL
-	bool "Using /usr/sbin/sendmail?"
+	bool "Report command output via email (using sendmail)"
 	depends on KEMBTK_BUSYB_CROND
 	help
-	  Support calling /usr/sbin/sendmail for send cmd outputs.
+	  Command output will be sent to corresponding user via email.
 
 config KEMBTK_BUSYB_FEATURE_CROND_DIR
 	string "crond spool directory"
 	default "/var/spool/cron"
 	depends on KEMBTK_BUSYB_CROND || KEMBTK_BUSYB_CRONTAB
-	depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X
+	depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X
 	help
 	  Location of crond spool.
 
@@ -251,30 +251,37 @@ config KEMBTK_BUSYB_FBSPLASH
 	    "NN" (ASCII decimal number) - percentage to show on progress bar
 	    "exit" - well you guessed it
 
+config KEMBTK_BUSYB_FLASHCP
+	bool "flashcp"
+	depends on EMBTK_BB_VERSION_1_16_X
+	help
+	  The flashcp binary, inspired by mtd-utils as of git head 5eceb74f7.
+	  This utility is used to copy images into a KEMBTK_BUSYB_MTD device.
+
 config KEMBTK_BUSYB_FLASH_LOCK
 	bool "flash_lock"
-	depends on EMBTK_BB_VERSION_1_15_X
+	depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X
 	help
 	  The flash_lock binary from mtd-utils as of git head 5ec0c10d0. This
 	  utility locks part or all of the flash device.
 
 config KEMBTK_BUSYB_FLASH_UNLOCK
 	bool "flash_unlock"
-	depends on EMBTK_BB_VERSION_1_15_X
+	depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X
 	help
 	  The flash_unlock binary from mtd-utils as of git head 5ec0c10d0. This
 	  utility unlocks part or all of the flash device.
 
 config KEMBTK_BUSYB_FLASH_ERASEALL
 	bool "flash_eraseall"
-	depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X
+	depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X
 	help
 	  The flash_eraseall binary from mtd-utils as of git head c4c6a59eb.
 	  This utility is used to erase the whole KEMBTK_BUSYB_MTD device.
 
 config KEMBTK_BUSYB_IONICE
 	bool "ionice"
-	depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X
+	depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X
 	help
 	  Set/set program io scheduling class and priority
 	  Requires kernel >= 2.6.13
@@ -542,7 +549,7 @@ config KEMBTK_BUSYB_TIME
 
 config KEMBTK_BUSYB_TIMEOUT
 	bool "timeout"
-	depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X
+	depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X
 	help
 	  Runs a program and watches it. If it does not terminate in
 	  specified number of seconds, it is sent a signal.
@@ -557,10 +564,16 @@ config KEMBTK_BUSYB_TTYSIZE
 
 config KEMBTK_BUSYB_VOLNAME
 	bool "volname"
-	depends on EMBTK_BB_VERSION_1_15_X
+	depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X
 	help
 	  Prints a CD-ROM volume name.
 
+config KEMBTK_BUSYB_WALL
+	bool "wall"
+	depends on EMBTK_BB_VERSION_1_16_X
+	help
+	  Write a message to all users that are logged in.
+
 config KEMBTK_BUSYB_WATCHDOG
 	bool "watchdog"
 	help
diff --git a/busybox-modutils.kconfig b/busybox-modutils.kconfig
index 69f0907..677a518 100644
--- a/busybox-modutils.kconfig
+++ b/busybox-modutils.kconfig
@@ -112,6 +112,22 @@ config KEMBTK_BUSYB_FEATURE_2_4_MODULES
 	  This increases size considerably. Say N unless you plan
 	  to run ancient kernels.
 
+config KEMBTK_BUSYB_FEATURE_INSMOD_TRY_MMAP
+	bool "Try to load module from a mmap'ed area"
+	depends on KEMBTK_BUSYB_INSMOD || KEMBTK_BUSYB_MODPROBE_SMALL
+	depends on EMBTK_BB_VERSION_1_16_X
+	help
+	  This option causes module loading code to try to mmap
+	  module first. If it does not work (for example,
+	  it does not work for compressed modules), module will be read
+	  (and unpacked if needed) into a memory block allocated by malloc.
+
+	  The only case when mmap works but malloc does not is when
+	  you are trying to load a big module on a very memory-constrained
+	  machine. Malloc will momentarily need 2x as much memory as mmap.
+
+	  Choosing N saves about 250 bytes of code (on 32-bit x86).
+
 config KEMBTK_BUSYB_FEATURE_INSMOD_VERSION_CHECKING
 	bool "Enable module version checking"
 	depends on KEMBTK_BUSYB_FEATURE_2_4_MODULES && (KEMBTK_BUSYB_INSMOD || KEMBTK_BUSYB_MODPROBE)
diff --git a/busybox-networking-udhcp.kconfig b/busybox-networking-udhcp.kconfig
index 1398e8b..73fba1f 100644
--- a/busybox-networking-udhcp.kconfig
+++ b/busybox-networking-udhcp.kconfig
@@ -4,22 +4,49 @@
 #
 
 config KEMBTK_BUSYB_APP_UDHCPD
+	bool
+	default n
+	help
+		backward compatibility for busybox-1.1{3,4,5}.x
+
+config KEMBTK_BUSYB_APP_DHCPRELAY
+	bool
+	default n
+	help
+		backward compatibility for busybox-1.1{3,4,5}.x
+
+config KEMBTK_BUSYB_APP_DUMPLEASES
+	bool
+	default n
+	help
+		backward compatibility for busybox-1.1{3,4,5}.x
+
+config KEMBTK_BUSYB_APP_UDHCPC
+	bool
+	default n
+	help
+		backward compatibility for busybox-1.1{3,4,5}.x
+
+config KEMBTK_BUSYB_UDHCPD
 	bool "udhcp server (udhcpd)"
+	select KEMBTK_BUSYB_APP_UDHCPD
 	help
 	  udhcpd is a DHCP server geared primarily toward embedded systems,
 	  while striving to be fully functional and RFC compliant.
 
-config KEMBTK_BUSYB_APP_DHCPRELAY
+config KEMBTK_BUSYB_DHCPRELAY
 	bool "dhcprelay"
-	depends on KEMBTK_BUSYB_APP_UDHCPD
+	depends on KEMBTK_BUSYB_UDHCPD
+	select KEMBTK_BUSYB_APP_DHCPRELAY
 	help
 	  dhcprelay listens for dhcp requests on one or more interfaces
 	  and forwards these requests to a different interface or dhcp
 	  server.
 
-config KEMBTK_BUSYB_APP_DUMPLEASES
+config KEMBTK_BUSYB_DUMPLEASES
 	bool "Lease display utility (dumpleases)"
-	depends on KEMBTK_BUSYB_APP_UDHCPD
+	depends on KEMBTK_BUSYB_UDHCPD
+	select KEMBTK_BUSYB_APP_DUMPLEASES
 	help
 	  dumpleases displays the leases written out by the udhcpd server.
 	  Lease times are stored in the file by time remaining in lease, or
@@ -27,7 +54,7 @@ config KEMBTK_BUSYB_APP_DUMPLEASES
 
 config KEMBTK_BUSYB_FEATURE_UDHCPD_WRITE_LEASES_EARLY
 	bool "Rewrite the lease file at every new acknowledge"
-	depends on KEMBTK_BUSYB_APP_UDHCPD
+	depends on KEMBTK_BUSYB_UDHCPD
 	help
 	  If selected, udhcpd will write a new file with leases every
 	  time a new lease has been accepted, thus eliminating the need
@@ -37,13 +64,14 @@ config KEMBTK_BUSYB_FEATURE_UDHCPD_WRITE_LEASES_EARLY
 config KEMBTK_BUSYB_DHCPD_LEASES_FILE
 	string "Absolute path to lease file"
 	default "/var/lib/misc/udhcpd.leases"
-	depends on KEMBTK_BUSYB_APP_UDHCPD
+	depends on KEMBTK_BUSYB_UDHCPD
 	help
 	  udhcpd stores addresses in a lease file. This is the absolute path
 	  of the file. Normally it is safe to leave it untouched.
 
-config KEMBTK_BUSYB_APP_UDHCPC
+config KEMBTK_BUSYB_UDHCPC
 	bool "udhcp client (udhcpc)"
+	select KEMBTK_BUSYB_APP_UDHCPC
 	help
 	  udhcpc is a DHCP client geared primarily toward embedded systems,
 	  while striving to be fully functional and RFC compliant.
@@ -54,7 +82,7 @@ config KEMBTK_BUSYB_APP_UDHCPC
 config KEMBTK_BUSYB_FEATURE_UDHCPC_ARPING
 	bool "Verify that the offered address is free, using KEMBTK_BUSYB_ARP ping"
 	default y
-	depends on KEMBTK_BUSYB_APP_UDHCPC
+	depends on KEMBTK_BUSYB_UDHCPC
 	help
 	  If selected, udhcpc will send KEMBTK_BUSYB_ARP probes and make sure
 	  the offered address is really not in use by anyone. The client
@@ -63,7 +91,7 @@ config KEMBTK_BUSYB_FEATURE_UDHCPC_ARPING
 
 config KEMBTK_BUSYB_FEATURE_UDHCP_PORT
 	bool "Enable '-P port' option for udhcpd and udhcpc"
-	depends on KEMBTK_BUSYB_APP_UDHCPD || KEMBTK_BUSYB_APP_UDHCPC
+	depends on KEMBTK_BUSYB_UDHCPD || KEMBTK_BUSYB_UDHCPC
 	help
 	  At the cost of ~300 bytes, enables -P port option.
 	  This feature is typically not needed.
@@ -72,7 +100,7 @@ config KEMBTK_BUSYB_UDHCP_DEBUG
 	int "Maximum verbosity level for udhcp applets (0..9)"
 	default 0
 	range 0 9
-	depends on KEMBTK_BUSYB_APP_UDHCPD || KEMBTK_BUSYB_APP_UDHCPC || KEMBTK_BUSYB_APP_DHCPRELAY
+	depends on KEMBTK_BUSYB_UDHCPD || KEMBTK_BUSYB_UDHCPC || KEMBTK_BUSYB_DHCPRELAY
 	help
 	  Verbosity can be increased with multiple -v options.
 	  This options controls how high it can be cranked up.
@@ -82,7 +110,7 @@ config KEMBTK_BUSYB_UDHCP_DEBUG
 
 config KEMBTK_BUSYB_FEATURE_UDHCP_RFC3397
 	bool "Support for RFC3397 domain search (experimental)"
-	depends on KEMBTK_BUSYB_APP_UDHCPD || KEMBTK_BUSYB_APP_UDHCPC
+	depends on KEMBTK_BUSYB_UDHCPD || KEMBTK_BUSYB_UDHCPC
 	help
 	  If selected, both client and server will support passing of domain
 	  search lists via option 119, specified in RFC3397.
@@ -90,7 +118,7 @@ config KEMBTK_BUSYB_FEATURE_UDHCP_RFC3397
 config KEMBTK_BUSYB_UDHCPC_DEFAULT_SCRIPT
 	string "Absolute path to config script"
 	default "/usr/share/udhcpc/default.script"
-	depends on KEMBTK_BUSYB_APP_UDHCPC
+	depends on KEMBTK_BUSYB_UDHCPC
 	help
 	  This script is called after udhcpc receives an answer. See
 	  examples/udhcp for a working example. Normally it is safe
@@ -100,7 +128,7 @@ config KEMBTK_BUSYB_UDHCPC_SLACK_FOR_BUGGY_SERVERS
 	int "DHCP options slack buffer size"
 	default 80
 	range 0 924
-	depends on KEMBTK_BUSYB_APP_UDHCPD || KEMBTK_BUSYB_APP_UDHCPC
+	depends on KEMBTK_BUSYB_UDHCPD || KEMBTK_BUSYB_UDHCPC
 	help
 	  Some buggy DHCP servers send DHCP offer packets with option
 	  field larger than we expect (which might also be considered a
diff --git a/busybox-networking.kconfig b/busybox-networking.kconfig
index 40241c1..1caff91 100644
--- a/busybox-networking.kconfig
+++ b/busybox-networking.kconfig
@@ -15,7 +15,7 @@ config KEMBTK_BUSYB_FEATURE_IPV6
 
 config KEMBTK_BUSYB_FEATURE_UNIX_LOCAL
 	bool "Enable Unix domain socket support (usually not needed)"
-	depends on EMBTK_BB_VERSION_1_15_X
+	depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X
 	help
 	  Enable Unix domain socket support in all busybox networking
 	  applets.  Address of the form local:/path/to/unix/socket
@@ -98,7 +98,7 @@ config KEMBTK_BUSYB_FAKEIDENTD
 
 config KEMBTK_BUSYB_FTPD
 	bool "ftpd"
-	depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X
+	depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X
 	help
 	  simple FTP daemon. You have to run it via inetd.
 
@@ -109,6 +109,18 @@ config KEMBTK_BUSYB_FEATURE_FTP_WRITE
 	help
 	  Enable all kinds of FTP upload commands (-w option)
 
+config KEMBTK_BUSYB_FEATURE_FTPD_ACCEPT_BROKEN_LIST
+	bool "Enable workaround for RFC-violating clients"
+	default y
+	depends on KEMBTK_BUSYB_FTPD
+	depends on EMBTK_BB_VERSION_1_16_X
+	help
+	  Some ftp-clients (among them KDE's Konqueror) issue illegal
+	  "LIST -la" requests. This option works around those problems.
+	  It might prevent you from listing files starting with "-" and
+	  it increases the code size by ~40 bytes.
+	  Most other ftp servers seem to behave similar to this.
+
 config KEMBTK_BUSYB_FTPGET
 	bool "ftpget"
 	help
@@ -151,12 +163,12 @@ config KEMBTK_BUSYB_FEATURE_HTTPD_USE_SENDFILE
 	  instead of read/write loop.
 
 config KEMBTK_BUSYB_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP
-	bool "Support reloading of global config file on HUP signal"
-	depends on KEMBTK_BUSYB_HTTPD
-	depends on EMBTK_BB_VERSION_1_13_X
-	help
-		This option enables processing of SIGHUP to reload cached
-		configuration settings.
+       bool "Support reloading of global config file on HUP signal"
+       depends on KEMBTK_BUSYB_HTTPD
+       depends on EMBTK_BB_VERSION_1_13_X
+       help
+               This option enables processing of SIGHUP to reload cached
+               configuration settings.
 
 config KEMBTK_BUSYB_FEATURE_HTTPD_SETUID
 	bool "Enable -u <user> option"
@@ -183,12 +195,12 @@ config KEMBTK_BUSYB_FEATURE_HTTPD_AUTH_MD5
 	  using md5 passwords.
 
 config KEMBTK_BUSYB_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES
-	bool "Support loading additional MIME types at run-time"
-	depends on KEMBTK_BUSYB_HTTPD
-	depends on EMBTK_BB_VERSION_1_13_X
-	help
-		This option enables support for additional MIME types at
-		run-time to be specified in the configuration file.
+       bool "Support loading additional MIME types at run-time"
+       depends on KEMBTK_BUSYB_HTTPD
+       depends on EMBTK_BB_VERSION_1_13_X
+       help
+               This option enables support for additional MIME types at
+               run-time to be specified in the configuration file.
 
 config KEMBTK_BUSYB_FEATURE_HTTPD_CGI
 	bool "Support Common Gateway Interface (CGI)"
@@ -298,7 +310,7 @@ config KEMBTK_BUSYB_IFENSLAVE
 
 config KEMBTK_BUSYB_IFPLUGD
 	bool "ifplugd"
-	depends on EMBTK_BB_VERSION_1_15_X
+	depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X
 	help
 	  Network interface plug detection daemon.
 
@@ -626,6 +638,20 @@ config KEMBTK_BUSYB_NSLOOKUP
 	help
 	  nslookup is a tool to query Internet name servers.
 
+config KEMBTK_BUSYB_NTPD
+	bool "ntpd"
+	depends on EMBTK_BB_VERSION_1_16_X
+	help
+	  The NTP client/server daemon.
+
+config KEMBTK_BUSYB_FEATURE_NTPD_SERVER
+        bool "Make ntpd usable as a NTP server"
+        default y
+        depends on KEMBTK_BUSYB_NTPD
+        help
+	  Make ntpd usable as a NTP server. If you disable this option
+	  ntpd will be usable only as a NTP client.
+
 config KEMBTK_BUSYB_PING
 	bool "ping"
 	help
@@ -744,6 +770,27 @@ config KEMBTK_BUSYB_FEATURE_TELNETD_STANDALONE
 	help
 	  Selecting this will make telnetd able to run standalone.
 
+config KEMBTK_BUSYB_FEATURE_TELNETD_INETD_WAIT
+	bool "Support -w SEC option (inetd wait mode)"
+	depends on KEMBTK_BUSYB_FEATURE_TELNETD_STANDALONE
+	depends on EMBTK_BB_VERSION_1_16_X
+	help
+	  This option allows you to run telnetd in "inet wait" mode.
+	  Example inetd.conf line (note "wait", not usual "nowait"):
+
+	  telnet stream tcp wait root /bin/telnetd telnetd -w10
+
+	  In this example, inetd passes _listening_ socket_ as fd 0
+	  to telnetd when connection appears.
+	  telnetd will wait for connections until all existing
+	  connections are closed, and no new connections
+	  appear during 10 seconds. Then it exits, and inetd continues
+	  to listen for new connections.
+
+	  This option is rarely used. "tcp nowait" is much more usual
+	  way of running tcp services, including telnetd.
+	  You most probably want to say N here.
+
 config KEMBTK_BUSYB_TFTP
 	bool "tftp"
 	help
@@ -779,11 +826,18 @@ config KEMBTK_BUSYB_FEATURE_TFTP_PUT
 	  Also enable download support in tftpd, if tftpd is selected.
 
 config KEMBTK_BUSYB_FEATURE_TFTP_BLOCKSIZE
-	bool "Enable \"blksize\" protocol option"
+	bool "Enable 'blksize' and 'tsize' protocol options"
 	depends on KEMBTK_BUSYB_TFTP || KEMBTK_BUSYB_TFTPD
 	help
 	  Allow tftp to specify block size, and tftpd to understand
-	  "blksize" option.
+	  "blksize" and "tsize" options.
+
+config KEMBTK_BUSYB_FEATURE_TFTP_PROGRESS_BAR
+	bool "Enable tftp progress meter"
+	depends on KEMBTK_BUSYB_TFTP && KEMBTK_BUSYB_FEATURE_TFTP_BLOCKSIZE
+	depends on EMBTK_BB_VERSION_1_16_X
+	help
+	  Show progress bar.
 
 config KEMBTK_BUSYB_TFTP_DEBUG
 	bool "Enable debug"
@@ -797,6 +851,13 @@ config KEMBTK_BUSYB_TRACEROUTE
 	help
 	  Utility to trace the route of KEMBTK_BUSYB_IP packets.
 
+config KEMBTK_BUSYB_TRACEROUTE6
+	bool "traceroute6"
+	depends on KEMBTK_BUSYB_FEATURE_IPV6 && KEMBTK_BUSYB_TRACEROUTE
+	depends on EMBTK_BB_VERSION_1_16_X
+	help
+	  Utility to trace the route of KEMBTK_BUSYB_IPv6 packets.
+
 config KEMBTK_BUSYB_FEATURE_TRACEROUTE_VERBOSE
 	bool "Enable verbose output"
 	depends on KEMBTK_BUSYB_TRACEROUTE
@@ -822,8 +883,8 @@ source packages/busybox/busybox-kconfigs/busybox-networking-udhcp.kconfig
 config KEMBTK_BUSYB_IFUPDOWN_UDHCPC_CMD_OPTIONS
 	string "ifup udhcpc command line options"
 	default "-R -n"
-	depends on KEMBTK_BUSYB_IFUPDOWN && KEMBTK_BUSYB_APP_UDHCPC
-	depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X
+	depends on KEMBTK_BUSYB_IFUPDOWN && KEMBTK_BUSYB_UDHCPC
+	depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X
 	help
 	  Command line options to pass to udhcpc from ifup.
 	  Intended to alter options not available in /etc/network/interfaces.
@@ -879,14 +940,14 @@ config KEMBTK_BUSYB_TCPSVD
 
 config KEMBTK_BUSYB_TUNCTL
 	bool "tunctl"
-	depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X
+	depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X
 	help
 	  tunctl creates or deletes tun devices.
 
 config KEMBTK_BUSYB_FEATURE_TUNCTL_UG
 	bool "Support owner:group assignment"
 	depends on KEMBTK_BUSYB_TUNCTL
-	depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X
+	depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X
 	help
 	  Allow to specify owner and group of newly created interface.
 	  340 bytes of pure bloat. Say no here.
diff --git a/busybox-procps.kconfig b/busybox-procps.kconfig
index aefe09b..12a3a9a 100644
--- a/busybox-procps.kconfig
+++ b/busybox-procps.kconfig
@@ -97,7 +97,7 @@ config KEMBTK_BUSYB_FEATURE_PS_TIME
 config KEMBTK_BUSYB_FEATURE_PS_ADDITIONAL_COLUMNS
 	bool "Enable additional ps columns"
 	depends on KEMBTK_BUSYB_PS && KEMBTK_BUSYB_DESKTOP
-	depends on EMBTK_BB_VERSION_1_15_X
+	depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X
 	help
 	  Support -o rgroup, -o ruser, -o nice output specifiers.
 
@@ -168,6 +168,13 @@ config KEMBTK_BUSYB_FEATURE_TOPMEM
 	help
 	  Enable 's' in top (gives lots of memory info).
 
+config KEMBTK_BUSYB_FEATURE_SHOW_THREADS
+	bool "Support for showing threads in ps/top"
+	depends on KEMBTK_BUSYB_PS || KEMBTK_BUSYB_TOP
+	depends on EMBTK_BB_VERSION_1_16_X
+	help
+	  Enables ps -T option and 'h' command in top
+
 config KEMBTK_BUSYB_UPTIME
 	bool "uptime"
 	help
@@ -181,4 +188,3 @@ config KEMBTK_BUSYB_WATCH
 	  watch is used to execute a program periodically, showing
 	  output to the screen.
 
-
diff --git a/busybox-shell.kconfig b/busybox-shell.kconfig
index 158a7e4..84b7124 100644
--- a/busybox-shell.kconfig
+++ b/busybox-shell.kconfig
@@ -16,11 +16,12 @@ choice
 config KEMBTK_BUSYB_FEATURE_SH_IS_ASH
 	select KEMBTK_BUSYB_ASH
 	bool "ash"
+	depends on !KEMBTK_BUSYB_NOMMU
 
 config KEMBTK_BUSYB_FEATURE_SH_IS_HUSH
 	select KEMBTK_BUSYB_HUSH
-	bool "hush"
 	depends on EMBTK_BB_VERSION_1_13_X || EMBTK_BB_VERSION_1_14_X
+	bool "hush"
 
 ####config FEATURE_SH_IS_LASH
 ####	select KEMBTK_BUSYB_LASH
@@ -28,6 +29,7 @@ config KEMBTK_BUSYB_FEATURE_SH_IS_HUSH
 
 config KEMBTK_BUSYB_FEATURE_SH_IS_MSH
 	select KEMBTK_BUSYB_MSH
+	depends on EMBTK_BB_VERSION_1_13_X || EMBTK_BB_VERSION_1_14_X
 	bool "msh"
 
 config KEMBTK_BUSYB_FEATURE_SH_IS_NONE
@@ -37,6 +39,7 @@ endchoice
 
 config KEMBTK_BUSYB_ASH
 	bool "ash"
+	depends on !KEMBTK_BUSYB_NOMMU
 	help
 	  Tha 'ash' shell adds about 60k in the default configuration and is
 	  the most complete and most pedantically correct shell included with
@@ -59,19 +62,21 @@ config KEMBTK_BUSYB_ASH_JOB_CONTROL
 	  Enable job control in the ash shell.
 
 config KEMBTK_BUSYB_ASH_READ_NCHARS
-	bool "'read -n N' and 'read -s' support"
-	depends on KEMBTK_BUSYB_ASH
-	help
-	  'read -n N' will return a value after N characters have been read.
-	  'read -s' will read without echoing the user's input.
+       bool "'read -n N' and 'read -s' support"
+       depends on KEMBTK_BUSYB_ASH
+       depends on EMBTK_BB_VERSION_1_13_X || EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X
+       help
+         'read -n N' will return a value after N characters have been read.
+         'read -s' will read without echoing the user's input.
 
 config KEMBTK_BUSYB_ASH_READ_TIMEOUT
-	bool "'read -t S' support"
-	depends on KEMBTK_BUSYB_ASH
-	help
-	  'read -t S' will return a value after S seconds have passed.
-	  This implementation will allow fractional seconds, expressed
-	  as a decimal fraction, e.g. 'read -t 2.5 foo'.
+       bool "'read -t S' support"
+       depends on KEMBTK_BUSYB_ASH
+       depends on EMBTK_BB_VERSION_1_13_X || EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X
+       help
+         'read -t S' will return a value after S seconds have passed.
+         This implementation will allow fractional seconds, expressed
+         as a decimal fraction, e.g. 'read -t 2.5 foo'.
 
 config KEMBTK_BUSYB_ASH_ALIAS
 	bool "alias support"
@@ -81,21 +86,21 @@ config KEMBTK_BUSYB_ASH_ALIAS
 	  Enable alias support in the ash shell.
 
 config KEMBTK_BUSYB_ASH_MATH_SUPPORT
-	bool "Posix math support"
-	default y
-	depends on KEMBTK_BUSYB_ASH
-	depends on EMBTK_BB_VERSION_1_13_X
-	help
-		Enable math support in the ash shell.
+       bool "Posix math support"
+       default y
+       depends on KEMBTK_BUSYB_ASH
+       depends on EMBTK_BB_VERSION_1_13_X
+       help
+               Enable math support in the ash shell.
 
 config KEMBTK_BUSYB_ASH_MATH_SUPPORT_64
-	bool "Extend Posix math support to 64 bit"
-	depends on KEMBTK_BUSYB_ASH_MATH_SUPPORT
-	depends on EMBTK_BB_VERSION_1_13_X
-	help
-		Enable 64-bit math support in the ash shell. This will make
-		the shell slightly larger, but will allow computation with very
-		large numbers.
+       bool "Extend Posix math support to 64 bit"
+       depends on KEMBTK_BUSYB_ASH_MATH_SUPPORT
+       depends on EMBTK_BB_VERSION_1_13_X
+       help
+               Enable 64-bit math support in the ash shell. This will make
+               the shell slightly larger, but will allow computation with very
+               large numbers.
 
 config KEMBTK_BUSYB_ASH_GETOPTS
 	bool "Builtin getopt to parse positional parameters"
@@ -181,7 +186,7 @@ config KEMBTK_BUSYB_HUSH_BASH_COMPAT
 	bool "bash-compatible extensions"
 	default y
 	depends on KEMBTK_BUSYB_HUSH
-	depends on EMBTK_BB_VERSION_1_15_X
+	depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X
 	help
 	  Enable bash-compatible extensions.
 
@@ -198,7 +203,7 @@ config KEMBTK_BUSYB_HUSH_INTERACTIVE
 	help
 	  Enable interactive mode (prompt and command editing).
 	  Without this, hush simply reads and executes commands
-	  from stdin just like a shell script from the file.
+	  from stdin just like a shell script from a file.
 	  No prompt, no KEMBTK_BUSYB_PS1/PS2 magic shell variables.
 
 config KEMBTK_BUSYB_HUSH_JOB
@@ -238,7 +243,7 @@ config KEMBTK_BUSYB_HUSH_CASE
 config KEMBTK_BUSYB_HUSH_FUNCTIONS
 	bool "Support funcname() { commands; } syntax"
 	depends on KEMBTK_BUSYB_HUSH
-	depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X
+	depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X
 	help
 	  Enable support for shell functions in hush. +800 bytes.
 
@@ -251,13 +256,21 @@ config KEMBTK_BUSYB_HUSH_LOCAL
 config KEMBTK_BUSYB_HUSH_EXPORT_N
 	bool "Support export '-n' option"
 	depends on KEMBTK_BUSYB_HUSH
-	depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X
+	depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X
 	help
 	  Enable support for export '-n' option in hush. It is a bash extension.
 
+config KEMBTK_BUSYB_HUSH_RANDOM_SUPPORT
+	bool "Pseudorandom generator and $RANDOM variable"
+	depends on KEMBTK_BUSYB_HUSH
+	depends on EMBTK_BB_VERSION_1_16_X
+	help
+	  Enable pseudorandom generator and dynamic variable "$RANDOM".
+	  Each read of "$RANDOM" will generate a new pseudorandom value.
+
 config KEMBTK_BUSYB_LASH
 	bool "lash (deprecated: aliased to hush)"
-	select KEMBTK_BUSYB_HUSH if EMBTK_BB_VERSION_1_15_X
+	select KEMBTK_BUSYB_HUSH if (EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X)
 	help
 	  lash is deprecated and will be removed, please migrate to hush.
 
@@ -280,14 +293,13 @@ config KEMBTK_BUSYB_SH_MATH_SUPPORT
 	bool "POSIX math support"
 	default y
 	depends on KEMBTK_BUSYB_ASH || KEMBTK_BUSYB_HUSH
-	depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X
+	depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X
 	help
 	  Enable math support in the shell via $((...)) syntax.
 
 config KEMBTK_BUSYB_SH_MATH_SUPPORT_64
 	bool "Extend POSIX math support to 64 bit"
 	depends on KEMBTK_BUSYB_SH_MATH_SUPPORT
-	depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X
 	help
 	  Enable 64-bit math support in the shell. This will make the shell
 	  slightly larger, but will allow computation with very large numbers.
diff --git a/busybox-util-linux.kconfig b/busybox-util-linux.kconfig
index 79f5cbc..e835527 100644
--- a/busybox-util-linux.kconfig
+++ b/busybox-util-linux.kconfig
@@ -9,7 +9,7 @@ comment "-------------------------------------------------"
 
 config KEMBTK_BUSYB_ACPID
 	bool "acpid"
-	depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X
+	depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X
 	help
 	  acpid listens to ACPI events coming either in textual form from
 	  /proc/acpi/event (though it is marked deprecated it is still widely
@@ -198,6 +198,12 @@ config KEMBTK_BUSYB_FSCK_MINIX
 	  check for and attempt to repair any corruption that occurs to a minix
 	  filesystem.
 
+config KEMBTK_BUSYB_MKFS_EXT2
+	bool "mkfs_ext2"
+	depends on EMBTK_BB_VERSION_1_16_X
+	help
+	  Utility to create EXT2 filesystems.
+
 config KEMBTK_BUSYB_MKFS_MINIX
 	bool "mkfs_minix"
 	help
@@ -217,9 +223,15 @@ config KEMBTK_BUSYB_FEATURE_MINIX2
 	  this. If you enabled 'mkfs_minix' then you almost certainly want to
 	  be using the version 2 filesystem support.
 
+config KEMBTK_BUSYB_MKFS_REISER
+	bool "mkfs_reiser"
+	depends on EMBTK_BB_VERSION_1_16_X
+	help
+	  Utility to create ReiserFS filesystems.
+
 config KEMBTK_BUSYB_MKFS_VFAT
 	bool "mkfs_vfat"
-	depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X
+	depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X
 	help
 	  Utility to create FAT32 filesystems.
 
@@ -237,7 +249,7 @@ config KEMBTK_BUSYB_FEATURE_GETOPT_LONG
 	bool "Support option -l"
 	default y if KEMBTK_BUSYB_LONG_OPTS
 	depends on KEMBTK_BUSYB_GETOPT
-	depends on EMBTK_BB_VERSION_1_15_X
+	depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X
 	help
 	  Enable support for long options (option -l).
 
@@ -312,6 +324,24 @@ config KEMBTK_BUSYB_LOSETUP
 	  file or block device, and to query the status of a loop device. This
 	  version does not currently support enabling data encryption.
 
+config KEMBTK_BUSYB_LSPCI
+	bool "lspci"
+	depends on EMBTK_BB_VERSION_1_16_X
+	help
+	  lspci is a utility for displaying information about PCI buses in the
+	  system and devices connected to them.
+
+	  This version uses sysfs (/sys/bus/pci/devices) only.
+
+config KEMBTK_BUSYB_LSUSB
+	bool "lsusb"
+	depends on EMBTK_BB_VERSION_1_16_X
+	help
+	  lsusb is a utility for displaying information about USB buses in the
+	  system and devices connected to them.
+
+	  This version uses sysfs (/sys/bus/usb/devices) only.
+
 config KEMBTK_BUSYB_MDEV
 	bool "mdev"
 	help
@@ -376,17 +406,17 @@ config KEMBTK_BUSYB_MKSWAP
 	  the swap space using the 'swapon' utility.
 
 config KEMBTK_BUSYB_FEATURE_MKSWAP_V0
-	bool "Version 0 support"
-	depends on EMBTK_BB_VERSION_1_13_X || EMBTK_BB_VERSION_1_14_X
-	help
-		Enable support for the old v0 style.
-		If your kernel is older than 2.1.117, then v0 support is the
-		only option.
+       bool "Version 0 support"
+       depends on EMBTK_BB_VERSION_1_13_X || EMBTK_BB_VERSION_1_14_X
+       help
+               Enable support for the old v0 style.
+               If your kernel is older than 2.1.117, then v0 support is the
+               only option.
 
 config KEMBTK_BUSYB_FEATURE_MKSWAP_UUID
 	bool "UUID support"
 	depends on KEMBTK_BUSYB_MKSWAP
-	depends on EMBTK_BB_VERSION_1_15_X
+	depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X
 	help
 	  Generate swap spaces with universally unique identifiers.
 
@@ -419,6 +449,13 @@ config KEMBTK_BUSYB_FEATURE_VOLUMEID_EXT
 	help
 	  TODO
 
+config KEMBTK_BUSYB_FEATURE_VOLUMEID_BTRFS
+	bool "btrfs filesystem"
+	depends on KEMBTK_BUSYB_VOLUMEID
+	depends on EMBTK_BB_VERSION_1_16_X
+	help
+	  TODO
+
 config KEMBTK_BUSYB_FEATURE_VOLUMEID_REISERFS
 	bool "Reiser filesystem"
 	depends on KEMBTK_BUSYB_VOLUMEID
@@ -630,6 +667,7 @@ config KEMBTK_BUSYB_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 KEMBTK_BUSYB_FEATURE_MOUNT_NFS
 	bool "Support mounting NFS file systems"
@@ -703,7 +741,7 @@ config KEMBTK_BUSYB_SCRIPT
 
 config KEMBTK_BUSYB_SCRIPTREPLAY
 	bool "scriptreplay"
-	depends on EMBTK_BB_VERSION_1_15_X
+	depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X
 	help
 	  This program replays a typescript, using timing information
 	  given by script -t.
diff --git a/busybox.kconfig b/busybox.kconfig
index d52ca7c..b24aaef 100644
--- a/busybox.kconfig
+++ b/busybox.kconfig
@@ -31,6 +31,23 @@ config KEMBTK_BUSYB_EXTRA_COMPAT
 	  some GNU extensions in libc. You probably only need this option
 	  if you plan to run busybox on desktop.
 
+config KEMBTK_BUSYB_INCLUDE_SUSv2
+	bool "Enable obsolete features removed before KEMBTK_BUSYB_SUSv3"
+	default y
+	help
+	  This option will enable backwards compatibility with SuSv2,
+	  specifically, old-style numeric options ('command -1 <file>')
+	  will be supported in head, tail, and fold. (Note: should
+	  affect renice too.)
+
+config KEMBTK_BUSYB_USE_PORTABLE_CODE
+	bool "Avoid using GCC-specific code constructs"
+	depends on EMBTK_BB_VERSION_1_16_X
+	help
+	  Use this option if you are trying to compile busybox with
+	  compiler other than gcc.
+	  If you do use gcc, this option may needlessly increase code size.
+
 choice
 	prompt "Buffer allocation policy"
 	help
@@ -114,13 +131,19 @@ config KEMBTK_BUSYB_FEATURE_CHECK_UNICODE_IN_ENV
 	bool "Check $LANG environment variable"
 	default y
 	depends on KEMBTK_BUSYB_FEATURE_ASSUME_UNICODE && !KEMBTK_BUSYB_LOCALE_SUPPORT
-	depends on EMBTK_BB_VERSION_1_15_X
+	depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X
 	help
 	  With this option on, Unicode support is activated
 	  only if LANG variable has the value of the form "xxxx.utf8"
 
 	  Otherwise, Unicode support will be always enabled and active.
 
+config KEMBTK_BUSYB_GETOPT_LONG
+       bool
+       default n
+       help
+               backward compatibility for busybox-1.{13,14}.x
+
 config KEMBTK_BUSYB_LONG_OPTS
 	bool "Support for --long-options"
 	default y
@@ -129,11 +152,6 @@ config KEMBTK_BUSYB_LONG_OPTS
 	  Enable this if you want busybox applets to use the gnu --long-option
 	  style, in addition to single character -a -b -c style options.
 
-config KEMBTK_BUSYB_GETOPT_LONG
-	bool
-	help
-		backward compatibility for busybox-1.{13,14}.x
-
 config KEMBTK_BUSYB_FEATURE_DEVPTS
 	bool "Use the devpts filesystem for Unix98 PTYs"
 	default y
@@ -412,7 +430,7 @@ config KEMBTK_BUSYB_CROSS_COMPILER_PREFIX
 
 config KEMBTK_BUSYB_EXTRA_CFLAGS
 	string "Additional CFLAGS"
-	depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X
+	depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X
 	default ""
 	help
 	  Additional CFLAGS to pass to the compiler verbatim.
@@ -490,17 +508,8 @@ config KEMBTK_BUSYB_EFENCE
 
 endchoice
 
-config KEMBTK_BUSYB_INCLUDE_SUSv2
-	bool "Enable obsolete features removed before KEMBTK_BUSYB_SUSv3?"
-	default y
-	help
-	  This option will enable backwards compatibility with SuSv2,
-	  specifically, old-style numeric options ('command -1 <file>')
-	  will be supported in head, tail, and fold. (Note: should
-	  affect renice too.)
-
 ### config PARSE
-### 	bool "Uniform config file parser debugging applet: parse"
+###	bool "Uniform config file parser debugging applet: parse"
 
 
 comment "-------------------------------------------------"