package/busybox: Update stored config files

When updating busybox, these files must be updated - otherwise the
config written to busybox source tree when building may be incomplete,
causing the build to hang.

Fixes: e4800c73e63e5 ("busybox: update to latest")
Signed-off-by: Phil Sutter <phil@nwl.cc>

2 files changed, 830 insertions, 785 deletions

diff --git a/package/busybox/config/networking/Config.in b/package/busybox/config/networking/Config.in
index 8ef4edf92..85171edcb 100644
--- a/package/busybox/config/networking/Config.in
+++ b/package/busybox/config/networking/Config.in
@@ -1,155 +1,51 @@
 # 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"
 
-config BUSYBOX_NAMEIF
-	bool "nameif"
-	default n
-	select BUSYBOX_PLATFORM_LINUX
-	select BUSYBOX_FEATURE_SYSLOG
-	help
-	  nameif is used to rename network interface by its MAC address.
-	  Renamed interfaces MUST be in the down state.
-	  It is possible to use a file (default: /etc/mactab)
-	  with list of new interface names and MACs.
-	  Maximum interface name length: IFNAMSIZ = 16
-	  File fields are separated by space or tab.
-	  File format:
-	  # Comment
-	  new_interface_name    XX:XX:XX:XX:XX:XX
-
-config BUSYBOX_FEATURE_NAMEIF_EXTENDED
-	bool "Extended nameif"
-	default y
-	depends on BUSYBOX_NAMEIF
-	help
-	  This extends the nameif syntax to support the bus_info, driver,
-	  phyaddr selectors. The syntax is compatible to the normal nameif.
-	  File format:
-	    new_interface_name  driver=asix bus=usb-0000:00:08.2-3
-	    new_interface_name  bus=usb-0000:00:08.2-3 00:80:C8:38:91:B5
-	    new_interface_name  phy_address=2 00:80:C8:38:91:B5
-	    new_interface_name  mac=00:80:C8:38:91:B5
-	    new_interface_name  00:80:C8:38:91:B5
-
-config BUSYBOX_NBDCLIENT
-	bool "nbd-client"
-	default n
-	help
-	  Network block device client
-
-config BUSYBOX_NC
-	bool "nc"
-	default n
-	help
-	  A simple Unix utility which reads and writes data across network
-	  connections.
-
-config BUSYBOX_NETCAT
-	bool "netcat (11 kb)"
-	default y
-	help
-	Alias to nc.
-
-config BUSYBOX_NC_SERVER
-	bool "Netcat server options (-l)"
-	default n
-	depends on BUSYBOX_NC || BUSYBOX_NETCAT
-	help
-	  Allow netcat to act as a server.
-
-config BUSYBOX_NC_EXTRA
-	bool "Netcat extensions (-eiw and filename)"
-	default y
-	depends on BUSYBOX_NC || BUSYBOX_NETCAT
-	help
-	  Add -e (support for executing the rest of the command line after
-	  making or receiving a successful connection), -i (delay interval for
-	  lines sent), -w (timeout for initial connection).
-
-config BUSYBOX_NC_110_COMPAT
-	bool "Netcat 1.10 compatibility (+2.5k)"
-	default n  # off specially for Rob
-	depends on BUSYBOX_NC || BUSYBOX_NETCAT
-	help
-	  This option makes nc closely follow original nc-1.10.
-	  The code is about 2.5k bigger. It enables
-	  -s ADDR, -n, -u, -v, -o FILE, -z options, but loses
-	  busybox-specific extensions: -f FILE and -ll.
-
-config BUSYBOX_PING
-	bool "ping"
-	default y if ADK_TARGET_WITH_NET
-	select BUSYBOX_PLATFORM_LINUX
-	help
-	  ping uses the ICMP protocol's mandatory ECHO_REQUEST datagram to
-	  elicit an ICMP ECHO_RESPONSE from a host or gateway.
-
-config BUSYBOX_PING6
-	bool "ping6"
-	default y if ADK_TARGET_WITH_NET
-	depends on BUSYBOX_FEATURE_IPV6 && BUSYBOX_PING
-	help
-	  This will give you a ping that can talk IPv6.
-
-config BUSYBOX_FEATURE_FANCY_PING
-	bool "Enable fancy ping output"
-	default y
-	depends on BUSYBOX_PING
-	help
-	  Make the output from the ping applet include statistics, and at the
-	  same time provide full support for ICMP packets.
-
-config BUSYBOX_WHOIS
-	bool "whois"
-	default n
-	help
-	  whois is a client for the whois directory service
-
 config BUSYBOX_FEATURE_IPV6
 	bool "Enable IPv6 support"
-	default n
+	default y
 	help
-	  Enable IPv6 support in busybox.
-	  This adds IPv6 support in the networking applets.
+	Enable IPv6 support in busybox.
+	This adds IPv6 support in the networking applets.
 
 config BUSYBOX_FEATURE_UNIX_LOCAL
 	bool "Enable Unix domain socket support (usually not needed)"
 	default n
 	help
-	  Enable Unix domain socket support in all busybox networking
-	  applets.  Address of the form local:/path/to/unix/socket
-	  will be recognized.
+	Enable Unix domain socket support in all busybox networking
+	applets.  Address of the form local:/path/to/unix/socket
+	will be recognized.
 
-	  This extension is almost never used in real world usage.
-	  You most likely want to say N.
+	This extension is almost never used in real world usage.
+	You most likely want to say N.
 
 config BUSYBOX_FEATURE_PREFER_IPV4_ADDRESS
 	bool "Prefer IPv4 addresses from DNS queries"
 	default y
 	depends on BUSYBOX_FEATURE_IPV6
 	help
-	  Use IPv4 address of network host if it has one.
+	Use IPv4 address of network host if it has one.
 
-	  If this option is off, the first returned address will be used.
-	  This may cause problems when your DNS server is IPv6-capable and
-	  is returning IPv6 host addresses too. If IPv6 address
-	  precedes IPv4 one in DNS reply, busybox network applets
-	  (e.g. wget) will use IPv6 address. On an IPv6-incapable host
-	  or network applets will fail to connect to the host
-	  using IPv6 address.
+	If this option is off, the first returned address will be used.
+	This may cause problems when your DNS server is IPv6-capable and
+	is returning IPv6 host addresses too. If IPv6 address
+	precedes IPv4 one in DNS reply, busybox network applets
+	(e.g. wget) will use IPv6 address. On an IPv6-incapable host
+	or network applets will fail to connect to the host
+	using IPv6 address.
 
 config BUSYBOX_VERBOSE_RESOLUTION_ERRORS
 	bool "Verbose resolution errors"
 	default n
 	help
-	  Enable if you are not satisfied with simplistic
-	  "can't resolve 'hostname.com'" and want to know more.
-	  This may increase size of your executable a bit.
+	Enable if you are not satisfied with simplistic
+	"can't resolve 'hostname.com'" and want to know more.
+	This may increase size of your executable a bit.
 
 config BUSYBOX_FEATURE_TLS_SHA1
 	bool "In TLS code, support ciphers which use deprecated SHA1"
@@ -163,1028 +59,1140 @@ config BUSYBOX_FEATURE_TLS_SHA1
 	considered possibly insecure (although not yet definitely broken).
 
 config BUSYBOX_ARP
-	bool "arp"
-	default n
+	bool "arp (10 kb)"
+	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  Manipulate the system ARP cache.
-
+	Manipulate the system ARP cache.
 config BUSYBOX_ARPING
-	bool "arping"
-	default n
+	bool "arping (9 kb)"
+	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  Ping hosts by ARP packets.
-
+	Ping hosts by ARP packets.
 config BUSYBOX_BRCTL
-	bool "brctl"
-	depends on !BUSYBOX_DISABLE_BRCTL
-	default n
+	bool "brctl (4.7 kb)"
+	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  Manage ethernet bridges.
-	  Supports addbr/delbr and addif/delif.
+	Manage ethernet bridges.
+	Supports addbr/delbr and addif/delif.
 
 config BUSYBOX_FEATURE_BRCTL_FANCY
 	bool "Fancy options"
 	default y
 	depends on BUSYBOX_BRCTL
 	help
-	  Add support for extended option like:
-	    setageing, setfd, sethello, setmaxage,
-	    setpathcost, setportprio, setbridgeprio,
-	    stp
-	  This adds about 600 bytes.
+	Add support for extended option like:
+		setageing, setfd, sethello, setmaxage,
+		setpathcost, setportprio, setbridgeprio,
+		stp
+	This adds about 600 bytes.
 
 config BUSYBOX_FEATURE_BRCTL_SHOW
-	bool "Support show, showmac and showstp"
+	bool "Support show"
 	default y
 	depends on BUSYBOX_BRCTL && BUSYBOX_FEATURE_BRCTL_FANCY
 	help
-	  Add support for option which prints the current config:
-	    showmacs, showstp, show
-
+	Add support for option which prints the current config:
+		show
 config BUSYBOX_DNSD
-	bool "dnsd"
-	default n
+	bool "dnsd (9.8 kb)"
+	default y
 	help
-	  Small and static DNS server daemon.
-
+	Small and static DNS server daemon.
 config BUSYBOX_ETHER_WAKE
-	bool "ether-wake"
-	depends on !BUSYBOX_DISABLE_ETHER_WAKE
-	default n
+	bool "ether-wake (4.9 kb)"
+	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  Send a magic packet to wake up sleeping machines.
-
-config BUSYBOX_FAKEIDENTD
-	bool "fakeidentd"
-	default n
-	select BUSYBOX_FEATURE_SYSLOG
-	help
-	  fakeidentd listens on the ident port and returns a predefined
-	  fake value on any query.
-
+	Send a magic packet to wake up sleeping machines.
 config BUSYBOX_FTPD
-	bool "ftpd"
-	default n
+	bool "ftpd (30 kb)"
+	default y
 	help
-	  simple FTP daemon. You have to run it via inetd.
+	Simple FTP daemon. You have to run it via inetd.
 
-config BUSYBOX_FEATURE_FTP_WRITE
-	bool "Enable upload commands"
+config BUSYBOX_FEATURE_FTPD_WRITE
+	bool "Enable -w (upload commands)"
 	default y
 	depends on BUSYBOX_FTPD
 	help
-	  Enable all kinds of FTP upload commands (-w option)
+	Enable -w option. "ftpd -w" will accept upload commands
+	such as STOR, STOU, APPE, DELE, MKD, RMD, rename commands.
 
 config BUSYBOX_FEATURE_FTPD_ACCEPT_BROKEN_LIST
 	bool "Enable workaround for RFC-violating clients"
 	default y
 	depends on BUSYBOX_FTPD
 	help
-	  Some ftp clients (among them KDE's Konqueror) issue illegal
-	  "LIST -l" requests. This option works around such problems.
-	  It might prevent you from listing files starting with "-" and
-	  it increases the code size by ~40 bytes.
-	  Most other ftp servers seem to behave similar to this.
+	Some ftp clients (among them KDE's Konqueror) issue illegal
+	"LIST -l" requests. This option works around such problems.
+	It might prevent you from listing files starting with "-" and
+	it increases the code size by ~40 bytes.
+	Most other ftp servers seem to behave similar to this.
 
+config BUSYBOX_FEATURE_FTPD_AUTHENTICATION
+	bool "Enable authentication"
+	default y
+	depends on BUSYBOX_FTPD
+	help
+	Require login, and change to logged in user's UID:GID before
+	accessing any files. Option "-a USER" allows "anonymous"
+	logins (treats them as if USER logged in).
+
+	If this option is not selected, ftpd runs with the rights
+	of the user it was started under, and does not require login.
+	Take care to not launch it under root.
 config BUSYBOX_FTPGET
-	bool "ftpget"
-	default n
+	bool "ftpget (7.8 kb)"
+	default y
 	help
-	  Retrieve a remote file via FTP.
+	Retrieve a remote file via FTP.
 
 config BUSYBOX_FTPPUT
-	bool "ftpput"
-	default n
+	bool "ftpput (7.5 kb)"
+	default y
 	help
-	  Store a remote file via FTP.
+	Store a remote file via FTP.
 
 config BUSYBOX_FEATURE_FTPGETPUT_LONG_OPTIONS
 	bool "Enable long options in ftpget/ftpput"
 	default y
 	depends on BUSYBOX_LONG_OPTS && (BUSYBOX_FTPGET || BUSYBOX_FTPPUT)
-	help
-	  Support long options for the ftpget/ftpput applet.
-
 config BUSYBOX_HOSTNAME
-	bool "hostname"
+	bool "hostname (5.5 kb)"
 	default y
 	help
-	  Show or set the system's host name.
+	Show or set the system's host name.
 
 config BUSYBOX_DNSDOMAINNAME
-	bool "dnsdomainname"
-	default n
+	bool "dnsdomainname (3.6 kb)"
+	default y
 	help
-	  Alias to "hostname -d".
-
+	Alias to "hostname -d".
 config BUSYBOX_HTTPD
-	bool "httpd"
-	default n
+	bool "httpd (32 kb)"
+	default y
 	help
-	  Serve web pages via an HTTP server.
+	HTTP server.
 
 config BUSYBOX_FEATURE_HTTPD_RANGES
 	bool "Support 'Ranges:' header"
 	default y
 	depends on BUSYBOX_HTTPD
 	help
-	  Makes httpd emit "Accept-Ranges: bytes" header and understand
-	  "Range: bytes=NNN-[MMM]" header. Allows for resuming interrupted
-	  downloads, seeking in multimedia players etc.
-
-config BUSYBOX_FEATURE_HTTPD_USE_SENDFILE
-	bool "Use sendfile system call"
-	default y
-	depends on BUSYBOX_HTTPD
-	help
-	  When enabled, httpd will use the kernel sendfile() function
-	  instead of read/write loop.
+	Makes httpd emit "Accept-Ranges: bytes" header and understand
+	"Range: bytes=NNN-[MMM]" header. Allows for resuming interrupted
+	downloads, seeking in multimedia players etc.
 
 config BUSYBOX_FEATURE_HTTPD_SETUID
 	bool "Enable -u <user> option"
 	default y
 	depends on BUSYBOX_HTTPD
 	help
-	  This option allows the server to run as a specific user
-	  rather than defaulting to the user that starts the server.
-	  Use of this option requires special privileges to change to a
-	  different user.
+	This option allows the server to run as a specific user
+	rather than defaulting to the user that starts the server.
+	Use of this option requires special privileges to change to a
+	different user.
 
 config BUSYBOX_FEATURE_HTTPD_BASIC_AUTH
-	bool "Enable Basic http Authentication"
+	bool "Enable HTTP authentication"
 	default y
 	depends on BUSYBOX_HTTPD
 	help
-	  Utilizes password settings from /etc/httpd.conf for basic
-	  authentication on a per url basis.
-	  Example for httpd.conf file:
-	  /adm:toor:PaSsWd
+	Utilizes password settings from /etc/httpd.conf for basic
+	authentication on a per url basis.
+	Example for httpd.conf file:
+	/adm:toor:PaSsWd
 
 config BUSYBOX_FEATURE_HTTPD_AUTH_MD5
-	bool "Support MD5 crypted passwords for http Authentication"
+	bool "Support MD5-encrypted passwords in HTTP authentication"
 	default y
 	depends on BUSYBOX_FEATURE_HTTPD_BASIC_AUTH
 	help
-	  Enables encrypted passwords, and wildcard user/passwords
-	  in httpd.conf file.
-	  User '*' means 'any system user name is ok',
-	  password of '*' means 'use system password for this user'
-	  Examples:
-	  /adm:toor:$1$P/eKnWXS$aI1aPGxT.dJD5SzqAKWrF0
-	  /adm:root:*
-	  /wiki:*:*
+	Enables encrypted passwords, and wildcard user/passwords
+	in httpd.conf file.
+	User '*' means 'any system user name is ok',
+	password of '*' means 'use system password for this user'
+	Examples:
+	/adm:toor:$1$P/eKnWXS$aI1aPGxT.dJD5SzqAKWrF0
+	/adm:root:*
+	/wiki:*:*
 
 config BUSYBOX_FEATURE_HTTPD_CGI
 	bool "Support Common Gateway Interface (CGI)"
 	default y
 	depends on BUSYBOX_HTTPD
 	help
-	  This option allows scripts and executables to be invoked
-	  when specific URLs are requested.
+	This option allows scripts and executables to be invoked
+	when specific URLs are requested.
 
 config BUSYBOX_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR
-	bool "Support for running scripts through an interpreter"
+	bool "Support running scripts through an interpreter"
 	default y
 	depends on BUSYBOX_FEATURE_HTTPD_CGI
 	help
-	  This option enables support for running scripts through an
-	  interpreter. Turn this on if you want PHP scripts to work
-	  properly. You need to supply an additional line in your
-	  httpd.conf file:
-	  *.php:/path/to/your/php
+	This option enables support for running scripts through an
+	interpreter. Turn this on if you want PHP scripts to work
+	properly. You need to supply an additional line in your
+	httpd.conf file:
+	*.php:/path/to/your/php
 
 config BUSYBOX_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV
 	bool "Set REMOTE_PORT environment variable for CGI"
 	default y
 	depends on BUSYBOX_FEATURE_HTTPD_CGI
 	help
-	  Use of this option can assist scripts in generating
-	  references that contain a unique port number.
+	Use of this option can assist scripts in generating
+	references that contain a unique port number.
 
 config BUSYBOX_FEATURE_HTTPD_ENCODE_URL_STR
 	bool "Enable -e option (useful for CGIs written as shell scripts)"
 	default y
 	depends on BUSYBOX_HTTPD
 	help
-	  This option allows html encoding of arbitrary strings for display
-	  by the browser. Output goes to stdout.
-	  For example, httpd -e "<Hello World>" produces
-	  "&#60Hello&#32World&#62".
+	This option allows html encoding of arbitrary strings for display
+	by the browser. Output goes to stdout.
+	For example, httpd -e "<Hello World>" produces
+	"&#60Hello&#32World&#62".
 
 config BUSYBOX_FEATURE_HTTPD_ERROR_PAGES
-	bool "Support for custom error pages"
+	bool "Support custom error pages"
 	default y
 	depends on BUSYBOX_HTTPD
 	help
-	  This option allows you to define custom error pages in
-	  the configuration file instead of the default HTTP status
-	  error pages. For instance, if you add the line:
-	        E404:/path/e404.html
-	  in the config file, the server will respond the specified
-	  '/path/e404.html' file instead of the terse '404 NOT FOUND'
-	  message.
+	This option allows you to define custom error pages in
+	the configuration file instead of the default HTTP status
+	error pages. For instance, if you add the line:
+		E404:/path/e404.html
+	in the config file, the server will respond the specified
+	'/path/e404.html' file instead of the terse '404 NOT FOUND'
+	message.
 
 config BUSYBOX_FEATURE_HTTPD_PROXY
-	bool "Support for reverse proxy"
+	bool "Support reverse proxy"
 	default y
 	depends on BUSYBOX_HTTPD
 	help
-	  This option allows you to define URLs that will be forwarded
-	  to another HTTP server. To setup add the following line to the
-	  configuration file
-	        P:/url/:http://hostname[:port]/new/path/
-	  Then a request to /url/myfile will be forwarded to
-	  http://hostname[:port]/new/path/myfile.
+	This option allows you to define URLs that will be forwarded
+	to another HTTP server. To setup add the following line to the
+	configuration file
+		P:/url/:http://hostname[:port]/new/path/
+	Then a request to /url/myfile will be forwarded to
+	http://hostname[:port]/new/path/myfile.
 
 config BUSYBOX_FEATURE_HTTPD_GZIP
-	bool "Support for GZIP content encoding"
+	bool "Support GZIP content encoding"
 	default y
 	depends on BUSYBOX_HTTPD
 	help
-	  Makes httpd send files using GZIP content encoding if the
-	  client supports it and a pre-compressed <file>.gz exists.
-
+	Makes httpd send files using GZIP content encoding if the
+	client supports it and a pre-compressed <file>.gz exists.
 config BUSYBOX_IFCONFIG
-	bool "ifconfig"
-	default y if ADK_TARGET_WITH_NET
+	bool "ifconfig (12 kb)"
+	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  Ifconfig is used to configure the kernel-resident network interfaces.
+	Ifconfig is used to configure the kernel-resident network interfaces.
 
 config BUSYBOX_FEATURE_IFCONFIG_STATUS
 	bool "Enable status reporting output (+7k)"
 	default y
 	depends on BUSYBOX_IFCONFIG
 	help
-	  If ifconfig is called with no arguments it will display the status
-	  of the currently active interfaces.
+	If ifconfig is called with no arguments it will display the status
+	of the currently active interfaces.
 
 config BUSYBOX_FEATURE_IFCONFIG_SLIP
 	bool "Enable slip-specific options \"keepalive\" and \"outfill\""
-	default n
+	default y
 	depends on BUSYBOX_IFCONFIG
 	help
-	  Allow "keepalive" and "outfill" support for SLIP. If you're not
-	  planning on using serial lines, leave this unchecked.
+	Allow "keepalive" and "outfill" support for SLIP. If you're not
+	planning on using serial lines, leave this unchecked.
 
 config BUSYBOX_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ
 	bool "Enable options \"mem_start\", \"io_addr\", and \"irq\""
-	default n
+	default y
 	depends on BUSYBOX_IFCONFIG
 	help
-	  Allow the start address for shared memory, start address for I/O,
-	  and/or the interrupt line used by the specified device.
+	Allow the start address for shared memory, start address for I/O,
+	and/or the interrupt line used by the specified device.
 
 config BUSYBOX_FEATURE_IFCONFIG_HW
 	bool "Enable option \"hw\" (ether only)"
 	default y
 	depends on BUSYBOX_IFCONFIG
 	help
-	  Set the hardware address of this interface, if the device driver
-	  supports  this  operation. Currently, we only support the 'ether'
-	  class.
+	Set the hardware address of this interface, if the device driver
+	supports  this  operation. Currently, we only support the 'ether'
+	class.
 
 config BUSYBOX_FEATURE_IFCONFIG_BROADCAST_PLUS
 	bool "Set the broadcast automatically"
 	default y
 	depends on BUSYBOX_IFCONFIG
 	help
-	  Setting this will make ifconfig attempt to find the broadcast
-	  automatically if the value '+' is used.
-
+	Setting this will make ifconfig attempt to find the broadcast
+	automatically if the value '+' is used.
 config BUSYBOX_IFENSLAVE
-	bool "ifenslave"
-	select ADK_LINUX_KERNEL_BONDING m if ADK_TARGET_OS_LINUX
-	default n
+	bool "ifenslave (13 kb)"
+	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  Userspace application to bind several interfaces
-	  to a logical interface (use with kernel bonding driver).
-
+	Userspace application to bind several interfaces
+	to a logical interface (use with kernel bonding driver).
 config BUSYBOX_IFPLUGD
-	bool "ifplugd"
-	default n
+	bool "ifplugd (10 kb)"
+	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  Network interface plug detection daemon.
-
+	Network interface plug detection daemon.
 config BUSYBOX_IFUP
-	bool "ifup"
-	default y if ADK_TARGET_WITH_NET
-	help
-	  Activate the specified interfaces. This applet makes use
-	  of either "ifconfig" and "route" or the "ip" command to actually
-	  configure network interfaces. Therefore, you will probably also want
-	  to enable either IFCONFIG and ROUTE, or enable
-	  FEATURE_IFUPDOWN_IP and the various IP options. Of
-	  course you could use non-busybox versions of these programs, so
-	  against my better judgement (since this will surely result in plenty
-	  of support questions on the mailing list), I do not force you to
-	  enable these additional options. It is up to you to supply either
-	  "ifconfig", "route" and "run-parts" or the "ip" command, either
-	  via busybox or via standalone utilities.
+	bool "ifup (14 kb)"
+	default y
+	help
+	Activate the specified interfaces. This applet makes use
+	of either "ifconfig" and "route" or the "ip" command to actually
+	configure network interfaces. Therefore, you will probably also want
+	to enable either IFCONFIG and ROUTE, or enable
+	FEATURE_IFUPDOWN_IP and the various IP options. Of
+	course you could use non-busybox versions of these programs, so
+	against my better judgement (since this will surely result in plenty
+	of support questions on the mailing list), I do not force you to
+	enable these additional options. It is up to you to supply either
+	"ifconfig", "route" and "run-parts" or the "ip" command, either
+	via busybox or via standalone utilities.
 
 config BUSYBOX_IFDOWN
-	bool "ifdown"
-	default y if ADK_TARGET_WITH_NET
+	bool "ifdown (13 kb)"
+	default y
 	help
-	  Deactivate the specified interfaces.
+	Deactivate the specified interfaces.
 
 config BUSYBOX_IFUPDOWN_IFSTATE_PATH
 	string "Absolute path to ifstate file"
 	default "/var/run/ifstate"
-	depends on BUSYBOX_IFUP
+	depends on BUSYBOX_IFUP || BUSYBOX_IFDOWN
 	help
-	  ifupdown keeps state information in a file called ifstate.
-	  Typically it is located in /var/run/ifstate, however
-	  some distributions tend to put it in other places
-	  (debian, for example, uses /etc/network/run/ifstate).
-	  This config option defines location of ifstate.
+	ifupdown keeps state information in a file called ifstate.
+	Typically it is located in /var/run/ifstate, however
+	some distributions tend to put it in other places
+	(debian, for example, uses /etc/network/run/ifstate).
+	This config option defines location of ifstate.
 
 config BUSYBOX_FEATURE_IFUPDOWN_IP
-	bool "Use ip applet"
+	bool "Use ip tool (else ifconfig/route is used)"
 	default y
-	depends on BUSYBOX_IFUP
+	depends on BUSYBOX_IFUP || BUSYBOX_IFDOWN
 	help
-	  Use the iproute "ip" command to implement "ifup" and "ifdown", rather
-	  than the default of using the older 'ifconfig' and 'route' utilities.
+	Use the iproute "ip" command to implement "ifup" and "ifdown", rather
+	than the default of using the older "ifconfig" and "route" utilities.
 
-config BUSYBOX_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN
-	bool "Use busybox ifconfig and route applets"
-	default n
-	depends on BUSYBOX_IFUP && !BUSYBOX_FEATURE_IFUPDOWN_IP
-	select BUSYBOX_IFCONFIG
-	select BUSYBOX_ROUTE
-	help
-	  Use the busybox iproute "ifconfig" and "route" applets to
-	  implement the "ifup" and "ifdown" utilities.
+	If Y: you must install either the full-blown iproute2 package
+	or enable "ip" applet in busybox, or the "ifup" and "ifdown" applets
+	will not work.
 
-	  If left disabled, you must install the full-blown ifconfig
-	  and route utilities, 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.
 
 config BUSYBOX_FEATURE_IFUPDOWN_IPV4
-	bool "Support for IPv4"
+	bool "Support IPv4"
 	default y
-	depends on BUSYBOX_IFUP
+	depends on BUSYBOX_IFUP || BUSYBOX_IFDOWN
 	help
-	  If you want ifup/ifdown to talk IPv4, leave this on.
+	If you want ifup/ifdown to talk IPv4, leave this on.
 
 config BUSYBOX_FEATURE_IFUPDOWN_IPV6
-	bool "Support for IPv6"
+	bool "Support IPv6"
 	default y
-	depends on BUSYBOX_IFUP && BUSYBOX_FEATURE_IPV6
+	depends on (BUSYBOX_IFUP || BUSYBOX_IFDOWN) && BUSYBOX_FEATURE_IPV6
 	help
-	  If you need support for IPv6, turn this option on.
+	If you need support for IPv6, turn this option on.
 
-### UNUSED
-###config FEATURE_IFUPDOWN_IPX
-###	bool "Support for IPX"
-###	default y
-###	depends on BUSYBOX_IFUPDOWN
-###	help
-###	  If this option is selected you can use busybox to work with IPX
-###	  networks.
 
 config BUSYBOX_FEATURE_IFUPDOWN_MAPPING
 	bool "Enable mapping support"
-	default n
-	depends on BUSYBOX_IFUP
+	default y
+	depends on BUSYBOX_IFUP || BUSYBOX_IFDOWN
 	help
-	  This enables support for the "mapping" stanza, unless you have
-	  a weird network setup you don't need it.
+	This enables support for the "mapping" stanza, unless you have
+	a weird network setup you don't need it.
 
 config BUSYBOX_FEATURE_IFUPDOWN_EXTERNAL_DHCP
-	bool "Support for external dhcp clients"
+	bool "Support external DHCP clients"
 	default n
-	depends on BUSYBOX_IFUP
+	depends on BUSYBOX_IFUP || BUSYBOX_IFDOWN
 	help
-	  This enables support for the external dhcp clients. Clients are
-	  tried in the following order: dhcpcd, dhclient, pump and udhcpc.
-	  Otherwise, if udhcpc applet is enabled, it is used.
-	  Otherwise, ifup/ifdown will have no support for DHCP.
-
+	This enables support for the external dhcp clients. Clients are
+	tried in the following order: dhcpcd, dhclient, pump and udhcpc.
+	Otherwise, if udhcpc applet is enabled, it is used.
+	Otherwise, ifup/ifdown will have no support for DHCP.
 config BUSYBOX_INETD
-	bool "inetd"
-	default n
+	bool "inetd (18 kb)"
+	default y
 	select BUSYBOX_FEATURE_SYSLOG
 	help
-	  Internet superserver daemon
+	Internet superserver daemon
 
 config BUSYBOX_FEATURE_INETD_SUPPORT_BUILTIN_ECHO
-	bool "Support echo service"
+	bool "Support echo service on port 7"
 	default y
 	depends on BUSYBOX_INETD
 	help
-	  Echo received data internal inetd service
+	Internal service which echoes data back.
+	Activated by configuration lines like these:
+		echo stream tcp nowait root internal
+		echo dgram  udp wait   root internal
 
 config BUSYBOX_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD
-	bool "Support discard service"
+	bool "Support discard service on port 8"
 	default y
 	depends on BUSYBOX_INETD
 	help
-	  Internet /dev/null internal inetd service
+	Internal service which discards all input.
+	Activated by configuration lines like these:
+		discard stream tcp nowait root internal
+		discard dgram  udp wait   root internal
 
 config BUSYBOX_FEATURE_INETD_SUPPORT_BUILTIN_TIME
-	bool "Support time service"
+	bool "Support time service on port 37"
 	default y
 	depends on BUSYBOX_INETD
 	help
-	  Return 32 bit time since 1900 internal inetd service
+	Internal service which returns big-endian 32-bit number
+	of seconds passed since 1900-01-01. The number wraps around
+	on overflow.
+	Activated by configuration lines like these:
+		time stream tcp nowait root internal
+		time dgram  udp wait   root internal
 
 config BUSYBOX_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME
-	bool "Support daytime service"
+	bool "Support daytime service on port 13"
 	default y
 	depends on BUSYBOX_INETD
 	help
-	  Return human-readable time internal inetd service
+	Internal service which returns human-readable time.
+	Activated by configuration lines like these:
+		daytime stream tcp nowait root internal
+		daytime dgram  udp wait   root internal
 
 config BUSYBOX_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN
-	bool "Support chargen service"
+	bool "Support chargen service on port 19"
 	default y
 	depends on BUSYBOX_INETD
 	help
-	  Familiar character generator internal inetd service
+	Internal service which generates endless stream
+	of all ASCII chars beetween space and char 126.
+	Activated by configuration lines like these:
+		chargen stream tcp nowait root internal
+		chargen dgram  udp wait   root internal
 
 config BUSYBOX_FEATURE_INETD_RPC
 	bool "Support RPC services"
-	default n
+	default n  # very rarely used, and needs Sun RPC support in libc
 	depends on BUSYBOX_INETD
-	select BUSYBOX_FEATURE_HAVE_RPC
 	help
-	  Support Sun-RPC based services
-
+	Support Sun-RPC based services
 config BUSYBOX_IP
-	bool "ip"
-	depends on !BUSYBOX_DISABLE_IP
-	default y if ADK_TARGET_WITH_NET
+	bool "ip (35 kb)"
+	default y
+	select BUSYBOX_PLATFORM_LINUX
+	help
+	The "ip" applet is a TCP/BUSYBOX_IP interface configuration and routing
+	utility.
+	Short forms (enabled below) are busybox-specific extensions.
+	The standard "ip" utility does not provide them. If you are
+	trying to be portable, it's better to use "ip CMD" forms.
+
+config BUSYBOX_IPADDR
+	bool "ipaddr (14 kb)"
+	default y
+	select BUSYBOX_FEATURE_IP_ADDRESS
+	select BUSYBOX_PLATFORM_LINUX
+	help
+	Short form of "ip addr"
+
+config BUSYBOX_IPLINK
+	bool "iplink (17 kb)"
+	default y
+	select BUSYBOX_FEATURE_IP_LINK
+	select BUSYBOX_PLATFORM_LINUX
+	help
+	Short form of "ip link"
+
+config BUSYBOX_IPROUTE
+	bool "iproute (15 kb)"
+	default y
+	select BUSYBOX_FEATURE_IP_ROUTE
+	select BUSYBOX_PLATFORM_LINUX
+	help
+	Short form of "ip route"
+
+config BUSYBOX_IPTUNNEL
+	bool "iptunnel (9.6 kb)"
+	default y
+	select BUSYBOX_FEATURE_IP_TUNNEL
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  The "ip" applet is a TCP/IP interface configuration and routing
-	  utility. You generally don't need "ip" to use busybox with
-	  TCP/IP.
+	Short form of "ip tunnel"
+
+config BUSYBOX_IPRULE
+	bool "iprule (10 kb)"
+	default y
+	select BUSYBOX_FEATURE_IP_RULE
+	select BUSYBOX_PLATFORM_LINUX
+	help
+	Short form of "ip rule"
+
+config BUSYBOX_IPNEIGH
+	bool "ipneigh (8.3 kb)"
+	default y
+	select BUSYBOX_FEATURE_IP_NEIGH
+	select BUSYBOX_PLATFORM_LINUX
+	help
+	Short form of "ip neigh"
 
 config BUSYBOX_FEATURE_IP_ADDRESS
 	bool "ip address"
 	default y
-	depends on BUSYBOX_IP
+	depends on BUSYBOX_IP || BUSYBOX_IPADDR
 	help
-	  Address manipulation support for the "ip" applet.
+	Address manipulation support for the "ip" applet.
 
 config BUSYBOX_FEATURE_IP_LINK
 	bool "ip link"
 	default y
-	depends on BUSYBOX_IP
+	depends on BUSYBOX_IP || BUSYBOX_IPLINK
 	help
-	  Configure network devices with "ip".
+	Configure network devices with "ip".
 
 config BUSYBOX_FEATURE_IP_ROUTE
 	bool "ip route"
 	default y
-	depends on BUSYBOX_IP
+	depends on BUSYBOX_IP || BUSYBOX_IPROUTE
 	help
-	  Add support for routing table management to "ip".
+	Add support for routing table management to "ip".
 
 config BUSYBOX_FEATURE_IP_ROUTE_DIR
 	string "ip route configuration directory"
 	default "/etc/iproute2"
 	depends on BUSYBOX_FEATURE_IP_ROUTE
 	help
-	  Location of the "ip" applet routing configuration.
+	Location of the "ip" applet routing configuration.
 
 config BUSYBOX_FEATURE_IP_TUNNEL
 	bool "ip tunnel"
-	default n
-	depends on BUSYBOX_IP
+	default y
+	depends on BUSYBOX_IP || BUSYBOX_IPTUNNEL
 	help
-	  Add support for tunneling commands to "ip".
+	Add support for tunneling commands to "ip".
 
 config BUSYBOX_FEATURE_IP_RULE
 	bool "ip rule"
-	default n
-	depends on BUSYBOX_IP
+	default y
+	depends on BUSYBOX_IP || BUSYBOX_IPRULE
 	help
-	  Add support for rule commands to "ip".
+	Add support for rule commands to "ip".
 
 config BUSYBOX_FEATURE_IP_NEIGH
 	bool "ip neighbor"
-	default n
-	depends on BUSYBOX_IP
+	default y
+	depends on BUSYBOX_IP || BUSYBOX_IPNEIGH
 	help
-	  Add support for neighbor commands to "ip".
+	Add support for neighbor commands to "ip".
 
 config BUSYBOX_FEATURE_IP_RARE_PROTOCOLS
 	bool "Support displaying rarely used link types"
 	default n
-	depends on BUSYBOX_IP
+	depends on BUSYBOX_IP || BUSYBOX_IPADDR || BUSYBOX_IPLINK || BUSYBOX_IPROUTE || BUSYBOX_IPTUNNEL || BUSYBOX_IPRULE || BUSYBOX_IPNEIGH
 	help
-	  If you are not going to use links of type "frad", "econet",
-	  "bif" etc, you probably don't need to enable this.
-	  Ethernet, wireless, infrared, ppp/slip, ip tunnelling
-	  link types are supported without this option selected.
-
-config BUSYBOX_IPADDR
-	bool
-	default n
-
-config BUSYBOX_IPLINK
-	bool
-	default n
-
-config BUSYBOX_IPROUTE
-	bool
-	default n
+	If you are not going to use links of type "frad", "econet",
+	"bif" etc, you probably don't need to enable this.
+	Ethernet, wireless, infrared, ppp/slip, ip tunnelling
+	link types are supported without this option selected.
+config BUSYBOX_IPCALC
+	bool "ipcalc (4.4 kb)"
+	default y
+	help
+	ipcalc takes an IP address and netmask and calculates the
+	resulting broadcast, network, and host range.
 
-config BUSYBOX_IPTUNNEL
-	bool
-	default n
+config BUSYBOX_FEATURE_IPCALC_LONG_OPTIONS
+	bool "Enable long options"
+	default y
+	depends on BUSYBOX_IPCALC && BUSYBOX_LONG_OPTS
 
-config BUSYBOX_IPRULE
-	bool
-	default n
+config BUSYBOX_FEATURE_IPCALC_FANCY
+	bool "Fancy IPCALC, more options, adds 1 kbyte"
+	default y
+	depends on BUSYBOX_IPCALC
+	help
+	Adds the options hostname, prefix and silent to the output of
+	"ipcalc".
+config BUSYBOX_FAKEIDENTD
+	bool "fakeidentd (8.7 kb)"
+	default y
+	select BUSYBOX_FEATURE_SYSLOG
+	help
+	fakeidentd listens on the ident port and returns a predefined
+	fake value on any query.
+config BUSYBOX_NAMEIF
+	bool "nameif (6.6 kb)"
+	default y
+	select BUSYBOX_PLATFORM_LINUX
+	select BUSYBOX_FEATURE_SYSLOG
+	help
+	nameif is used to rename network interface by its MAC address.
+	Renamed interfaces MUST be in the down state.
+	It is possible to use a file (default: /etc/mactab)
+	with list of new interface names and MACs.
+	Maximum interface name length: IFNAMSIZ = 16
+	File fields are separated by space or tab.
+	File format:
+		# Comment
+		new_interface_name  XX:XX:XX:XX:XX:XX
 
-config BUSYBOX_IPNEIGH
-	bool
-	default n
+config BUSYBOX_FEATURE_NAMEIF_EXTENDED
+	bool "Extended nameif"
+	default y
+	depends on BUSYBOX_NAMEIF
+	help
+	This extends the nameif syntax to support the bus_info, driver,
+	phyaddr selectors. The syntax is compatible to the normal nameif.
+	File format:
+		new_interface_name  driver=asix bus=usb-0000:00:08.2-3
+		new_interface_name  bus=usb-0000:00:08.2-3 00:80:C8:38:91:B5
+		new_interface_name  phy_address=2 00:80:C8:38:91:B5
+		new_interface_name  mac=00:80:C8:38:91:B5
+		new_interface_name  00:80:C8:38:91:B5
+config BUSYBOX_NBDCLIENT
+	bool "nbd-client (6 kb)"
+	default y
+	help
+	Network block device client
+config BUSYBOX_NC
+	bool "nc (11 kb)"
+	default y
+	help
+	A simple Unix utility which reads and writes data across network
+	connections.
 
-config BUSYBOX_IPCALC
-	bool "ipcalc"
+config BUSYBOX_NETCAT
+	bool "netcat (11 kb)"
 	default n
 	help
-	  ipcalc takes an IP address and netmask and calculates the
-	  resulting broadcast, network, and host range.
+	Alias to nc.
 
-config BUSYBOX_FEATURE_IPCALC_FANCY
-	bool "Fancy IPCALC, more options, adds 1 kbyte"
+config BUSYBOX_NC_SERVER
+	bool "Netcat server options (-l)"
 	default y
-	depends on BUSYBOX_IPCALC
+	depends on BUSYBOX_NC || BUSYBOX_NETCAT
 	help
-	  Adds the options hostname, prefix and silent to the output of
-	  "ipcalc".
+	Allow netcat to act as a server.
 
-config BUSYBOX_FEATURE_IPCALC_LONG_OPTIONS
-	bool "Enable long options"
+config BUSYBOX_NC_EXTRA
+	bool "Netcat extensions (-eiw and -f FILE)"
 	default y
-	depends on BUSYBOX_IPCALC && BUSYBOX_LONG_OPTS
+	depends on BUSYBOX_NC || BUSYBOX_NETCAT
 	help
-	  Support long options for the ipcalc applet.
+	Add -e (support for executing the rest of the command line after
+	making or receiving a successful connection), -i (delay interval for
+	lines sent), -w (timeout for initial connection).
 
+config BUSYBOX_NC_110_COMPAT
+	bool "Netcat 1.10 compatibility (+2.5k)"
+	default y
+	depends on BUSYBOX_NC || BUSYBOX_NETCAT
+	help
+	This option makes nc closely follow original nc-1.10.
+	The code is about 2.5k bigger. It enables
+	-s ADDR, -n, -u, -v, -o FILE, -z options, but loses
+	busybox-specific extensions: -f FILE.
 config BUSYBOX_NETSTAT
-	bool "netstat"
-	default y if ADK_TARGET_WITH_NET
+	bool "netstat (10 kb)"
+	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  netstat prints information about the Linux networking subsystem.
+	netstat prints information about the Linux networking subsystem.
 
 config BUSYBOX_FEATURE_NETSTAT_WIDE
-	bool "Enable wide netstat output"
-	default n
+	bool "Enable wide output"
+	default y
 	depends on BUSYBOX_NETSTAT
 	help
-	  Add support for wide columns. Useful when displaying IPv6 addresses
-	  (-W option).
+	Add support for wide columns. Useful when displaying IPv6 addresses
+	(-W option).
 
 config BUSYBOX_FEATURE_NETSTAT_PRG
 	bool "Enable PID/Program name output"
 	default y
 	depends on BUSYBOX_NETSTAT
 	help
-	  Add support for -p flag to print out PID and program name.
-	  +700 bytes of code.
-
+	Add support for -p flag to print out PID and program name.
+	+700 bytes of code.
 config BUSYBOX_NSLOOKUP
-	bool "nslookup"
-	default y if ADK_TARGET_WITH_NET
+	bool "nslookup (9.7 kb)"
+	default y
 	help
-	  nslookup is a tool to query Internet name servers.
+	nslookup is a tool to query Internet name servers.
 
 config BUSYBOX_FEATURE_NSLOOKUP_BIG
 	bool "Use internal resolver code instead of libc"
 	depends on BUSYBOX_NSLOOKUP
-	default n
+	default y
 
 config BUSYBOX_FEATURE_NSLOOKUP_LONG_OPTIONS
 	bool "Enable long options"
-	default n
+	default y
 	depends on BUSYBOX_FEATURE_NSLOOKUP_BIG && BUSYBOX_LONG_OPTS
-
 config BUSYBOX_NTPD
-	bool "ntpd"
-	depends on !BUSYBOX_DISABLE_NTPD
-	default n
+	bool "ntpd (22 kb)"
+	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  The NTP client/server daemon.
+	The NTP client/server daemon.
 
 config BUSYBOX_FEATURE_NTPD_SERVER
 	bool "Make ntpd usable as a NTP server"
-	default n
-	depends on !BUSYBOX_DISABLE_NTPD
+	default y
 	depends on BUSYBOX_NTPD
 	help
-	  Make ntpd usable as a NTP server. If you disable this option
-	  ntpd will be usable only as a NTP client.
+	Make ntpd usable as a NTP server. If you disable this option
+	ntpd will be usable only as a NTP client.
 
 config BUSYBOX_FEATURE_NTPD_CONF
 	bool "Make ntpd understand /etc/ntp.conf"
-	default n
+	default y
 	depends on BUSYBOX_NTPD
 	help
-	  Make ntpd look in /etc/ntp.conf for peers. Only "server address"
-	  is supported.
+	Make ntpd look in /etc/ntp.conf for peers. Only "server address"
+	is supported.
 
-config BUSYBOX_PSCAN
-	bool "pscan"
-	default n
+config BUSYBOX_FEATURE_NTP_AUTH
+	bool "Support md5/sha1 message authentication codes"
+	default y
+	depends on BUSYBOX_NTPD
+config BUSYBOX_PING
+	bool "ping (10 kb)"
+	default y
+	select BUSYBOX_PLATFORM_LINUX
+	help
+	ping uses the ICMP protocol's mandatory ECHO_REQUEST datagram to
+	elicit an ICMP ECHO_RESPONSE from a host or gateway.
+
+config BUSYBOX_PING6
+	bool "ping6 (11 kb)"
+	default y
+	depends on BUSYBOX_FEATURE_IPV6
 	help
-	  Simple network port scanner.
+	Alias to "ping -6".
 
+config BUSYBOX_FEATURE_FANCY_PING
+	bool "Enable fancy ping output"
+	default y
+	depends on BUSYBOX_PING || BUSYBOX_PING6
+	help
+	With this option off, ping will say "HOST is alive!"
+	or terminate with SIGALRM in 5 seconds otherwise.
+	No command-line options will be recognized.
+config BUSYBOX_PSCAN
+	bool "pscan (6 kb)"
+	default y
+	help
+	Simple network port scanner.
 config BUSYBOX_ROUTE
-	bool "route"
-	default y if ADK_TARGET_WITH_NET
+	bool "route (8.7 kb)"
+	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  Route displays or manipulates the kernel's IP routing tables.
-
+	Route displays or manipulates the kernel's IP routing tables.
 config BUSYBOX_SLATTACH
-	bool "slattach"
-	default n
+	bool "slattach (6.2 kb)"
+	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  slattach is a small utility to attach network interfaces to serial
-	  lines.
-
+	slattach configures serial line as SLIP network interface.
 config BUSYBOX_SSL_CLIENT
 	bool "ssl_client (25 kb)"
-	default n
+	default y
 	select BUSYBOX_TLS
 	help
 	This tool pipes data to/from a socket, TLS-encrypting it.
-
 config BUSYBOX_TC
-	bool "tc"
-	default n
+	bool "tc (8.3 kb)"
+	default y
 	help
-	  show / manipulate traffic control settings
-#
-#config FEATURE_TC_INGRESS
-#	def_bool n
-#	depends on BUSYBOX_TC
+	Show / manipulate traffic control settings
 
+config BUSYBOX_FEATURE_TC_INGRESS
+	bool "Enable ingress"
+	default y
+	depends on BUSYBOX_TC
 config BUSYBOX_TCPSVD
-	bool "tcpsvd"
-	default n
+	bool "tcpsvd (14 kb)"
+	default y
 	help
-	  tcpsvd listens on a TCP port and runs a program for each new
-	  connection.
+	tcpsvd listens on a TCP port and runs a program for each new
+	connection.
 
+config BUSYBOX_UDPSVD
+	bool "udpsvd (13 kb)"
+	default y
+	help
+	udpsvd listens on an UDP port and runs a program for each new
+	connection.
 config BUSYBOX_TELNET
-	bool "telnet"
-	default y if ADK_TARGET_WITH_NET
+	bool "telnet (8.8 kb)"
+	default y
 	help
-	  Telnet is an interface to the TELNET protocol, but is also commonly
-	  used to test other simple protocols.
+	Telnet is an interface to the TELNET protocol, but is also commonly
+	used to test other simple protocols.
 
 config BUSYBOX_FEATURE_TELNET_TTYPE
 	bool "Pass TERM type to remote host"
 	default y
 	depends on BUSYBOX_TELNET
 	help
-	  Setting this option will forward the TERM environment variable to the
-	  remote host you are connecting to. This is useful to make sure that
-	  things like ANSI colors and other control sequences behave.
+	Setting this option will forward the TERM environment variable to the
+	remote host you are connecting to. This is useful to make sure that
+	things like ANSI colors and other control sequences behave.
 
 config BUSYBOX_FEATURE_TELNET_AUTOLOGIN
 	bool "Pass USER type to remote host"
 	default y
 	depends on BUSYBOX_TELNET
 	help
-	  Setting this option will forward the USER environment variable to the
-	  remote host you are connecting to. This is useful when you need to
-	  log into a machine without telling the username (autologin). This
-	  option enables `-a' and `-l USER' arguments.
+	Setting this option will forward the USER environment variable to the
+	remote host you are connecting to. This is useful when you need to
+	log into a machine without telling the username (autologin). This
+	option enables '-a' and '-l USER' options.
 
 config BUSYBOX_FEATURE_TELNET_WIDTH
 	bool "Enable window size autodetection"
 	default y
 	depends on BUSYBOX_TELNET
-
 config BUSYBOX_TELNETD
-	bool "telnetd"
-	default n
+	bool "telnetd (12 kb)"
+	default y
 	select BUSYBOX_FEATURE_SYSLOG
 	help
-	  A daemon for the TELNET protocol, allowing you to log onto the host
-	  running the daemon. Please keep in mind that the TELNET protocol
-	  sends passwords in plain text. If you can't afford the space for an
-	  SSH daemon and you trust your network, you may say 'y' here. As a
-	  more secure alternative, you should seriously consider installing the
-	  very small Dropbear SSH daemon instead:
+	A daemon for the TELNET protocol, allowing you to log onto the host
+	running the daemon. Please keep in mind that the TELNET protocol
+	sends passwords in plain text. If you can't afford the space for an
+	SSH daemon and you trust your network, you may say 'y' here. As a
+	more secure alternative, you should seriously consider installing the
+	very small Dropbear SSH daemon instead:
 		http://matt.ucc.asn.au/dropbear/dropbear.html
 
-	  Note that for busybox telnetd to work you need several things:
-	  First of all, your kernel needs:
-		  UNIX98_PTYS=y
-		  DEVPTS_FS=y
+	Note that for busybox telnetd to work you need several things:
+	First of all, your kernel needs:
+		  CONFIG_UNIX98_PTYS=y
 
-	  Next, you need a /dev/pts directory on your root filesystem:
+	Next, you need a /dev/pts directory on your root filesystem:
 
 		  $ ls -ld /dev/pts
 		  drwxr-xr-x  2 root root 0 Sep 23 13:21 /dev/pts/
 
-	  Next you need the pseudo terminal master multiplexer /dev/ptmx:
+	Next you need the pseudo terminal master multiplexer /dev/ptmx:
 
 		  $ ls -la /dev/ptmx
 		  crw-rw-rw-  1 root tty 5, 2 Sep 23 13:55 /dev/ptmx
 
-	  Any /dev/ttyp[0-9]* files you may have can be removed.
-	  Next, you need to mount the devpts filesystem on /dev/pts using:
+	Any /dev/ttyp[0-9]* files you may have can be removed.
+	Next, you need to mount the devpts filesystem on /dev/pts using:
 
 		  mount -t devpts devpts /dev/pts
 
-	  You need to be sure that busybox has LOGIN and
-	  FEATURE_SUID enabled. And finally, you should make
-	  certain that Busybox has been installed setuid root:
+	You need to be sure that busybox has LOGIN and
+	FEATURE_SUID enabled. And finally, you should make
+	certain that busybox has been installed setuid root:
 
 		chown root.root /bin/busybox
 		chmod 4755 /bin/busybox
 
-	  with all that done, telnetd _should_ work....
-
+	with all that done, telnetd _should_ work....
 
 config BUSYBOX_FEATURE_TELNETD_STANDALONE
 	bool "Support standalone telnetd (not inetd only)"
 	default y
 	depends on BUSYBOX_TELNETD
 	help
-	  Selecting this will make telnetd able to run standalone.
+	Selecting this will make telnetd able to run standalone.
 
 config BUSYBOX_FEATURE_TELNETD_INETD_WAIT
 	bool "Support -w SEC option (inetd wait mode)"
 	default y
 	depends on BUSYBOX_FEATURE_TELNETD_STANDALONE
 	help
-	  This option allows you to run telnetd in "inet wait" mode.
-	  Example inetd.conf line (note "wait", not usual "nowait"):
-
-	  telnet stream tcp wait root /bin/telnetd telnetd -w10
+	This option allows you to run telnetd in "inet wait" mode.
+	Example inetd.conf line (note "wait", not usual "nowait"):
 
-	  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.
+	telnet stream tcp wait root /bin/telnetd telnetd -w10
 
-	  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.
+	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 BUSYBOX_TFTP
-	bool "tftp"
-	default n
+	bool "tftp (11 kb)"
+	default y
 	help
-	  This enables the Trivial File Transfer Protocol client program. TFTP
-	  is usually used for simple, small transfers such as a root image
-	  for a network-enabled bootloader.
+	Trivial File Transfer Protocol client. TFTP is usually used
+	for simple, small transfers such as a root image
+	for a network-enabled bootloader.
+
+config BUSYBOX_FEATURE_TFTP_PROGRESS_BAR
+	bool "Enable progress bar"
+	default y
+	depends on BUSYBOX_TFTP
+
+config BUSYBOX_FEATURE_TFTP_HPA_COMPAT
+	bool "tftp-hpa compat (support -c get/put FILE)"
+	default y
+	depends on BUSYBOX_TFTP
 
 config BUSYBOX_TFTPD
-	bool "tftpd"
-	default n
+	bool "tftpd (10 kb)"
+	default y
 	help
-	  This enables the Trivial File Transfer Protocol server program.
-	  It expects that stdin is a datagram socket and a packet
-	  is already pending on it. It will exit after one transfer.
-	  In other words: it should be run from inetd in nowait mode,
-	  or from udpsvd. Example: "udpsvd -E 0 69 tftpd DIR"
-
-comment "Common options for tftp/tftpd"
-	depends on BUSYBOX_TFTP || BUSYBOX_TFTPD
+	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"
 
 config BUSYBOX_FEATURE_TFTP_GET
 	bool "Enable 'tftp get' and/or tftpd upload code"
 	default y
 	depends on BUSYBOX_TFTP || BUSYBOX_TFTPD
 	help
-	  Add support for the GET command within the TFTP client. This allows
-	  a client to retrieve a file from a TFTP server.
-	  Also enable upload support in tftpd, if tftpd is selected.
+	Add support for the GET command within the TFTP client. This allows
+	a client to retrieve a file from a TFTP server.
+	Also enable upload support in tftpd, if tftpd is selected.
 
-	  Note: this option does _not_ make tftpd capable of download
-	  (the usual operation people need from it)!
+	Note: this option does _not_ make tftpd capable of download
+	(the usual operation people need from it)!
 
 config BUSYBOX_FEATURE_TFTP_PUT
 	bool "Enable 'tftp put' and/or tftpd download code"
 	default y
 	depends on BUSYBOX_TFTP || BUSYBOX_TFTPD
 	help
-	  Add support for the PUT command within the TFTP client. This allows
-	  a client to transfer a file to a TFTP server.
-	  Also enable download support in tftpd, if tftpd is selected.
+	Add support for the PUT command within the TFTP client. This allows
+	a client to transfer a file to a TFTP server.
+	Also enable download support in tftpd, if tftpd is selected.
 
 config BUSYBOX_FEATURE_TFTP_BLOCKSIZE
 	bool "Enable 'blksize' and 'tsize' protocol options"
 	default y
 	depends on BUSYBOX_TFTP || BUSYBOX_TFTPD
 	help
-	  Allow tftp to specify block size, and tftpd to understand
-	  "blksize" and "tsize" options.
-
-config BUSYBOX_FEATURE_TFTP_PROGRESS_BAR
-	bool "Enable tftp progress meter"
-	default y
-	depends on BUSYBOX_TFTP && BUSYBOX_FEATURE_TFTP_BLOCKSIZE
-	help
-	  Show progress bar.
+	Allow tftp to specify block size, and tftpd to understand
+	"blksize" and "tsize" options.
 
 config BUSYBOX_TFTP_DEBUG
 	bool "Enable debug"
 	default n
 	depends on BUSYBOX_TFTP || BUSYBOX_TFTPD
 	help
-	  Make tftp[d] print debugging messages on stderr.
-	  This is useful if you are diagnosing a bug in tftp[d].
-
+	Make tftp[d] print debugging messages on stderr.
+	This is useful if you are diagnosing a bug in tftp[d].
 config BUSYBOX_TLS
 	bool #No description makes it a hidden option
 	default n
-
 config BUSYBOX_TRACEROUTE
-	bool "traceroute"
-	default n
+	bool "traceroute (11 kb)"
+	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  Utility to trace the route of IP packets.
+	Utility to trace the route of IP packets.
 
 config BUSYBOX_TRACEROUTE6
-	bool "traceroute6"
-	default n
-	depends on BUSYBOX_FEATURE_IPV6 && BUSYBOX_TRACEROUTE
+	bool "traceroute6 (13 kb)"
+	default y
+	depends on BUSYBOX_FEATURE_IPV6
 	help
-	  Utility to trace the route of IPv6 packets.
+	Utility to trace the route of IPv6 packets.
 
 config BUSYBOX_FEATURE_TRACEROUTE_VERBOSE
 	bool "Enable verbose output"
 	default y
-	depends on BUSYBOX_TRACEROUTE
+	depends on BUSYBOX_TRACEROUTE || BUSYBOX_TRACEROUTE6
 	help
-	  Add some verbosity to traceroute. This includes among other things
-	  hostnames and ICMP response types.
-
-config BUSYBOX_FEATURE_TRACEROUTE_SOURCE_ROUTE
-	bool "Enable loose source route"
-	default n
-	depends on BUSYBOX_TRACEROUTE
-	help
-	  Add option to specify a loose source route gateway
-	  (8 maximum).
+	Add some verbosity to traceroute. This includes among other things
+	hostnames and ICMP response types.
 
 config BUSYBOX_FEATURE_TRACEROUTE_USE_ICMP
-	bool "Use ICMP instead of UDP"
-	default n
-	depends on BUSYBOX_TRACEROUTE
-	help
-	  Add option -I to use ICMP ECHO instead of UDP datagrams.
-
+	bool "Enable -I option (use ICMP instead of UDP)"
+	default y
+	depends on BUSYBOX_TRACEROUTE || BUSYBOX_TRACEROUTE6
 config BUSYBOX_TUNCTL
-	bool "tunctl"
-	default n
+	bool "tunctl (6.2 kb)"
+	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  tunctl creates or deletes tun devices.
+	tunctl creates or deletes tun devices.
 
 config BUSYBOX_FEATURE_TUNCTL_UG
 	bool "Support owner:group assignment"
 	default y
 	depends on BUSYBOX_TUNCTL
 	help
-	  Allow to specify owner and group of newly created interface.
-	  340 bytes of pure bloat. Say no here.
-
-source package/busybox/config/networking/udhcp/Config.in
-
-config BUSYBOX_IFUPDOWN_UDHCPC_CMD_OPTIONS
-	string "ifup udhcpc command line options"
-	default "-R" if BUSYBOX_NOMMU
-	default "-R -b"
-	depends on BUSYBOX_IFUP && BUSYBOX_UDHCPC
-	help
-	  Command line options to pass to udhcpc from ifup.
-	  Intended to alter options not available in /etc/network/interfaces.
-	  (IE: --syslog --background etc...)
-
-config BUSYBOX_UDPSVD
-	bool "udpsvd"
-	default n
-	help
-	  udpsvd listens on an UDP port and runs a program for each new
-	  connection.
-
+	Allow to specify owner and group of newly created interface.
+	340 bytes of pure bloat. Say no here.
 config BUSYBOX_VCONFIG
-	bool "vconfig"
-	default n
+	bool "vconfig (2.3 kb)"
+	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  Creates, removes, and configures VLAN interfaces
-
+	Creates, removes, and configures VLAN interfaces
 config BUSYBOX_WGET
-	bool "wget"
-	depends on !BUSYBOX_DISABLE_WGET
-	default n
+	bool "wget (38 kb)"
+	default y
 	help
-	  wget is a utility for non-interactive download of files from HTTP,
-	  HTTPS, and FTP servers.
+	wget is a utility for non-interactive download of files from HTTP
+	and FTP servers.
+
+config BUSYBOX_FEATURE_WGET_LONG_OPTIONS
+	bool "Enable long options"
+	default y
+	depends on BUSYBOX_WGET && BUSYBOX_LONG_OPTS
 
 config BUSYBOX_FEATURE_WGET_STATUSBAR
-	bool "Enable a nifty process meter (+2k)"
-	default n
+	bool "Enable progress bar (+2k)"
+	default y
 	depends on BUSYBOX_WGET
-	help
-	  Enable the transfer progress bar for wget transfers.
 
 config BUSYBOX_FEATURE_WGET_AUTHENTICATION
 	bool "Enable HTTP authentication"
 	default y
 	depends on BUSYBOX_WGET
 	help
-	  Support authenticated HTTP transfers.
+	Support authenticated HTTP transfers.
 
-config BUSYBOX_FEATURE_WGET_LONG_OPTIONS
-	bool "Enable long options"
+config BUSYBOX_FEATURE_WGET_TIMEOUT
+	bool "Enable timeout option -T SEC"
 	default y
-	depends on BUSYBOX_WGET && BUSYBOX_LONG_OPTS
+	depends on BUSYBOX_WGET
 	help
-	  Support long options for the wget applet.
+	Supports network read and connect timeouts for wget,
+	so that wget will give up and timeout, through the -T
+	command line option.
 
-config BUSYBOX_FEATURE_WGET_TIMEOUT
-	bool "Enable read timeout option -T SEC"
+	Currently only connect and network data read timeout are
+	supported (i.e., timeout is not applied to the DNS query). When
+	FEATURE_WGET_LONG_OPTIONS is also enabled, the --timeout option
+	will work in addition to -T.
+
+config BUSYBOX_FEATURE_WGET_HTTPS
+	bool "Support HTTPS using internal TLS code"
 	default y
 	depends on BUSYBOX_WGET
+	select BUSYBOX_TLS
 	help
-	  Supports network read timeout for wget, so that wget will give
-	  up and timeout when reading network data, through the -T command
-	  line option.  Currently only network data read timeout is
-	  supported (i.e., timeout is not applied to the DNS nor TCP
-	  connection initialization).  When FEATURE_WGET_LONG_OPTIONS is
-	  also enabled, the --timeout option will work in addition to -T.
+	wget will use internal TLS code to connect to https:// URLs.
+	Note:
+	On NOMMU machines, ssl_helper applet should be available
+	in the $PATH for this to work. Make sure to select that applet.
+
+	Note: currently, TLS code only makes TLS I/O work, it
+	does *not* check that the peer is who it claims to be, etc.
+	IOW: it uses peer-supplied public keys to establish encryption
+	and signing keys, then encrypts and signs outgoing data and
+	decrypts incoming data.
+	It does not check signature hashes on the incoming data:
+	this means that attackers manipulating TCP packets can
+	send altered data and we unknowingly receive garbage.
+	(This check might be relatively easy to add).
+	It does not check public key's certificate:
+	this means that the peer may be an attacker impersonating
+	the server we think we are talking to.
+
+	If you think this is unacceptable, consider this. As more and more
+	servers switch to HTTPS-only operation, without such "crippled"
+	TLS code it is *impossible* to simply download a kernel source
+	from kernel.org. Which can in real world translate into
+	"my small automatic tooling to build cross-compilers from sources
+	no longer works, I need to additionally keep a local copy
+	of ~4 megabyte source tarball of a SSL library and ~2 megabyte
+	source of wget, need to compile and built both before I can
+	download anything. All this despite the fact that the build
+	is done in a QEMU sandbox on a machine with absolutely nothing
+	worth stealing, so I don't care if someone would go to a lot
+	of trouble to intercept my HTTPS download to send me an altered
+	kernel tarball".
+
+	If you still think this is unacceptable, send patches.
+
+	If you still think this is unacceptable, do not want to send
+	patches, but do want to waste bandwidth expaining how wrong
+	it is, you will be ignored.
+
+	FEATURE_WGET_OPENSSL does implement TLS verification
+	using the certificates available to OpenSSL.
 
 config BUSYBOX_FEATURE_WGET_OPENSSL
 	bool "Try to connect to HTTPS using openssl"
-	default n
+	default y
 	depends on BUSYBOX_WGET
 	help
-	  Choose how wget establishes SSL connection for https:// URLs.
-
-	  Busybox itself contains no SSL code. wget will spawn
-	  a helper program to talk over HTTPS.
-
-	  OpenSSL has a simple SSL client for debug purposes.
-	  If you select "openssl" helper, wget will effectively call
-	  "openssl s_client -quiet -connect IP:443 2>/dev/null"
-	  and pipe its data through it.
-	  Note inconvenient API: host resolution is done twice,
-	  and there is no guarantee openssl's idea of IPv6 address
-	  format is the same as ours.
-	  Another problem is that s_client prints debug information
-	  to stderr, and it needs to be suppressed. This means
-	  all error messages get suppressed too.
-	  openssl is also a big binary, often dynamically linked
-	  against ~15 libraries.
-
-config BUSYBOX_FEATURE_WGET_SSL_HELPER
-	bool "Try to connect to HTTPS using ssl_helper"
-	default n
-	depends on BUSYBOX_WGET
+	Try to use openssl to handle HTTPS.
+
+	OpenSSL has a simple SSL client for debug purposes.
+	If you select this option, wget will effectively run:
+	"openssl s_client -quiet -connect hostname:443
+	-servername hostname 2>/dev/null" and pipe its data
+	through it. -servername is not used if hostname is numeric.
+	Note inconvenient API: host resolution is done twice,
+	and there is no guarantee openssl's idea of IPv6 address
+	format is the same as ours.
+	Another problem is that s_client prints debug information
+	to stderr, and it needs to be suppressed. This means
+	all error messages get suppressed too.
+	openssl is also a big binary, often dynamically linked
+	against ~15 libraries.
+
+	If openssl can't be executed, internal TLS code will be used
+	(if you enabled it); if openssl can be executed but fails later,
+	wget can't detect this, and download will fail.
+
+	By default BUSYBOX_TLS verification is performed, unless
+	--no-check-certificate option is passed.
+config BUSYBOX_WHOIS
+	bool "whois (6.3 kb)"
+	default y
 	help
-	  Choose how wget establishes SSL connection for https:// URLs.
-
-	  Busybox itself contains no SSL code. wget will spawn
-	  a helper program to talk over HTTPS.
-
-	  ssl_helper is a tool which can be built statically
-	  from busybox sources against a small embedded SSL library.
-	  Please see networking/ssl_helper/README.
-	  It does not require double host resolution and emits
-	  error messages to stderr.
-
-	  Precompiled static binary may be available at
-	  http://busybox.net/downloads/binaries/
-
+	whois is a client for the whois directory service
 config BUSYBOX_ZCIP
-	bool "zcip"
-	default n
+	bool "zcip (8.4 kb)"
+	default y
 	select BUSYBOX_PLATFORM_LINUX
 	select BUSYBOX_FEATURE_SYSLOG
 	help
-	  ZCIP provides ZeroConf IPv4 address selection, according to RFC 3927.
-	  It's a daemon that allocates and defends a dynamically assigned
-	  address on the 169.254/16 network, requiring no system administrator.
+	BUSYBOX_ZCIP provides ZeroConf IPv4 address selection, according to RFC 3927.
+	It's a daemon that allocates and defends a dynamically assigned
+	address on the 169.254/16 network, requiring no system administrator.
+
+	See http://www.zeroconf.org for further details, and "zcip.script"
+	in the busybox examples.
 
-	  See http://www.zeroconf.org for further details, and "zcip.script"
-	  in the busybox examples.
+source package/busybox/config/networking/udhcp/Config.in
+
+config BUSYBOX_IFUPDOWN_UDHCPC_CMD_OPTIONS
+	string "ifup udhcpc command line options"
+	default "-R -n"
+	depends on BUSYBOX_IFUP || BUSYBOX_IFDOWN
+	help
+	Command line options to pass to udhcpc from ifup.
+	Intended to alter options not available in /etc/network/interfaces.
+	(IE: --syslog --background etc...)
 
 endmenu
diff --git a/package/busybox/config/networking/udhcp/Config.in b/package/busybox/config/networking/udhcp/Config.in
index 02e56c3ef..9edb9a214 100644
--- a/package/busybox/config/networking/udhcp/Config.in
+++ b/package/busybox/config/networking/udhcp/Config.in
@@ -1,148 +1,168 @@
 # 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_UDHCPC6
-       bool "udhcp client for DHCPv6 (udhcpc6)"
-       default n  # not yet ready
-       help
-         udhcpc6 is a DHCPv6 client
-
 config BUSYBOX_UDHCPD
-	bool "udhcp server (udhcpd)"
-	default n
+	bool "udhcpd (21 kb)"
+	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  udhcpd is a DHCP server geared primarily toward embedded systems,
-	  while striving to be fully functional and RFC compliant.
+	udhcpd is a DHCP server geared primarily toward embedded systems,
+	while striving to be fully functional and RFC compliant.
 
-config BUSYBOX_DHCPRELAY
-	bool "dhcprelay"
+config BUSYBOX_FEATURE_UDHCPD_BASE_IP_ON_MAC
+	bool "Select IP address based on client MAC"
 	default n
+	depends on BUSYBOX_UDHCPD
 	help
-	  dhcprelay listens for dhcp requests on one or more interfaces
-	  and forwards these requests to a different interface or dhcp
-	  server.
+	If selected, udhcpd will base its selection of BUSYBOX_IP address to offer
+	on the client's hardware address. Otherwise udhcpd uses the next
+	consecutive free address.
 
-config BUSYBOX_DUMPLEASES
-	bool "Lease display utility (dumpleases)"
-	default n
-	help
-	  dumpleases displays the leases written out by the udhcpd server.
-	  Lease times are stored in the file by time remaining in lease, or
-	  by the absolute time that it expires in seconds from epoch.
+	This reduces the frequency of IP address changes for clients
+	which let their lease expire, and makes consecutive DHCPOFFERS
+	for the same client to (almost always) contain the same
+	IP address.
 
 config BUSYBOX_FEATURE_UDHCPD_WRITE_LEASES_EARLY
-	bool "Rewrite the lease file at every new acknowledge"
+	bool "Rewrite lease file at every new acknowledge"
 	default y
 	depends on BUSYBOX_UDHCPD
 	help
-	  If selected, udhcpd will write a new file with leases every
-	  time a new lease has been accepted, thus eliminating the need
-	  to send SIGUSR1 for the initial writing or updating. Any timed
-	  rewriting remains undisturbed.
-
-config BUSYBOX_FEATURE_UDHCPD_BASE_IP_ON_MAC
-	bool "Select IP address based on client MAC"
-	default n
-	depends on BUSYBOX_UDHCPD
-	help
-	  If selected, udhcpd will base its selection of IP address to offer
-	  on the client's hardware address. Otherwise udhcpd uses the next
-	  consecutive free address.
-
-	  This reduces the frequency of IP address changes for clients
-	  which let their lease expire, and makes consecutive DHCPOFFERS
-	  for the same client to (almost always) contain the same
-	  IP address.
+	If selected, udhcpd will write a new file with leases every
+	time a new lease has been accepted, thus eliminating the need
+	to send SIGUSR1 for the initial writing or updating. Any timed
+	rewriting remains undisturbed.
 
 config BUSYBOX_DHCPD_LEASES_FILE
 	string "Absolute path to lease file"
 	default "/var/lib/misc/udhcpd.leases"
 	depends on BUSYBOX_UDHCPD
 	help
-	  udhcpd stores addresses in a lease file. This is the absolute path
-	  of the file. Normally it is safe to leave it untouched.
+	udhcpd stores addresses in a lease file. This is the absolute path
+	of the file. Normally it is safe to leave it untouched.
+
+config BUSYBOX_DUMPLEASES
+	bool "dumpleases (5.1 kb)"
+	default y
+	help
+	dumpleases displays the leases written out by the udhcpd.
+	Lease times are stored in the file by time remaining in lease, or
+	by the absolute time that it expires in seconds from epoch.
+
+config BUSYBOX_DHCPRELAY
+	bool "dhcprelay (5.2 kb)"
+	default y
+	help
+	dhcprelay listens for DHCP requests on one or more interfaces
+	and forwards these requests to a different interface or DHCP
+	server.
 
 config BUSYBOX_UDHCPC
-	bool "udhcp client (udhcpc)"
+	bool "udhcpc (24 kb)"
 	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  udhcpc is a DHCP client geared primarily toward embedded systems,
-	  while striving to be fully functional and RFC compliant.
+	udhcpc is a DHCP client geared primarily toward embedded systems,
+	while striving to be fully functional and RFC compliant.
 
-	  The udhcp client negotiates a lease with the DHCP server and
-	  runs a script when a lease is obtained or lost.
+	The udhcp client negotiates a lease with the DHCP server and
+	runs a script when a lease is obtained or lost.
 
 config BUSYBOX_FEATURE_UDHCPC_ARPING
 	bool "Verify that the offered address is free, using ARP ping"
 	default y
 	depends on BUSYBOX_UDHCPC
 	help
-	  If selected, udhcpc will send ARP probes and make sure
-	  the offered address is really not in use by anyone. The client
-	  will DHCPDECLINE the offer if the address is in use,
-	  and restart the discover process.
+	If selected, udhcpc will send BUSYBOX_ARP probes and make sure
+	the offered address is really not in use by anyone. The client
+	will DHCPDECLINE the offer if the address is in use,
+	and restart the discover process.
 
 config BUSYBOX_FEATURE_UDHCPC_SANITIZEOPT
 	bool "Do not pass malformed host and domain names"
 	default y
 	depends on BUSYBOX_UDHCPC
 	help
-	  If selected, udhcpc will check some options (such as option 12 -
-	  hostname) and if they don't look like valid hostnames
-	  (for example, if they start with dash or contain spaces),
-	  they will be replaced with string "bad" when exporting
-	  to the environment.
+	If selected, udhcpc will check some options (such as option 12 -
+	hostname) and if they don't look like valid hostnames
+	(for example, if they start with dash or contain spaces),
+	they will be replaced with string "bad" when exporting
+	to the environment.
 
-config BUSYBOX_FEATURE_UDHCP_PORT
-	bool "Enable '-P port' option for udhcpd and udhcpc"
-	default n
-	depends on BUSYBOX_UDHCPD || BUSYBOX_UDHCPC
+config BUSYBOX_UDHCPC_DEFAULT_SCRIPT
+	string "Absolute path to config script"
+	default "/usr/share/udhcpc/default.script"
+	depends on BUSYBOX_UDHCPC || BUSYBOX_UDHCPC6
 	help
-	  At the cost of ~300 bytes, enables -P port option.
-	  This feature is typically not needed.
+	This script is called after udhcpc receives an answer. See
+	examples/udhcp for a working example. Normally it is safe
+	to leave this untouched.
 
-config BUSYBOX_UDHCP_DEBUG
-	int "Maximum verbosity level for udhcp applets (0..9)"
-	default 0
-	range 0 9
-	depends on BUSYBOX_UDHCPD || BUSYBOX_UDHCPC || BUSYBOX_DHCPRELAY
+# udhcpc6 config is inserted here:
+config BUSYBOX_UDHCPC6
+	bool "udhcpc6 (21 kb)"
+	default y
+	depends on BUSYBOX_FEATURE_IPV6
 	help
-	  Verbosity can be increased with multiple -v options.
-	  This option controls how high it can be cranked up.
+	udhcpc6 is a DHCPv6 client
 
-	  Bigger values result in bigger code. Levels above 1
-	  are very verbose and useful for debugging only.
+config BUSYBOX_FEATURE_UDHCPC6_RFC3646
+	bool "Support RFC 3646 (DNS server and search list)"
+	default y
+	depends on BUSYBOX_UDHCPC6
+	help
+	List of DNS servers and domain search list can be requested with
+	"-O dns" and "-O search". If server gives these values,
+	they will be set in environment variables "dns" and "search".
 
-config BUSYBOX_FEATURE_UDHCP_RFC3397
-	bool "Support for RFC3397 domain search (experimental)"
+config BUSYBOX_FEATURE_UDHCPC6_RFC4704
+	bool "Support RFC 4704 (Client FQDN)"
 	default y
-	depends on BUSYBOX_UDHCPD || BUSYBOX_UDHCPC
+	depends on BUSYBOX_UDHCPC6
 	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.
+	You can request FQDN to be given by server using "-O fqdn".
 
-config BUSYBOX_FEATURE_UDHCP_8021Q
-	bool "Support for 802.1Q VLAN parameters"
+config BUSYBOX_FEATURE_UDHCPC6_RFC4833
+	bool "Support RFC 4833 (Timezones)"
 	default y
-	depends on BUSYBOX_UDHCPD || BUSYBOX_UDHCPC
+	depends on BUSYBOX_UDHCPC6
 	help
-	  If selected, both client and server will support passing of VLAN
-	  ID and priority via options 132 and 133 as per 802.1Q.
+	You can request POSIX timezone with "-O tz" and timezone name
+	with "-O timezone".
 
-config BUSYBOX_UDHCPC_DEFAULT_SCRIPT
-	string "Absolute path to config script"
-	default "/usr/share/udhcpc/default.script"
-	depends on BUSYBOX_UDHCPC
+config BUSYBOX_FEATURE_UDHCPC6_RFC5970
+	bool "Support RFC 5970 (Network Boot)"
+	default y
+	depends on BUSYBOX_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_UDHCPD || BUSYBOX_UDHCPC || BUSYBOX_UDHCPC6 || BUSYBOX_DHCPRELAY
+
+config BUSYBOX_FEATURE_UDHCP_PORT
+	bool "Enable '-P port' option for udhcpd and udhcpc"
+	default n
+	depends on BUSYBOX_UDHCPD || BUSYBOX_UDHCPC || BUSYBOX_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.
+	At the cost of ~300 bytes, enables -P port option.
+	This feature is typically not needed.
+
+config BUSYBOX_UDHCP_DEBUG
+	int "Maximum verbosity level (0..9)"
+	default 2
+	range 0 9
+	depends on BUSYBOX_UDHCPD || BUSYBOX_UDHCPC || BUSYBOX_UDHCPC6 || BUSYBOX_DHCPRELAY
+	help
+	Verbosity can be increased with multiple -v options.
+	This option controls how high it can be cranked up.
+
+	Bigger values result in bigger code. Levels above 1
+	are very verbose and useful for debugging only.
 
 config BUSYBOX_UDHCPC_SLACK_FOR_BUGGY_SERVERS
 	int "DHCP options slack buffer size"
@@ -150,19 +170,36 @@ config BUSYBOX_UDHCPC_SLACK_FOR_BUGGY_SERVERS
 	range 0 924
 	depends on BUSYBOX_UDHCPD || BUSYBOX_UDHCPC
 	help
-	  Some buggy DHCP servers send DHCP offer packets with option
-	  field larger than we expect (which might also be considered a
-	  buffer overflow attempt). These packets are normally discarded.
-	  If circumstances beyond your control force you to support such
-	  servers, this may help. The upper limit (924) makes dhcpc accept
-	  even 1500 byte packets (maximum-sized ethernet packets).
-
-	  This option does not make dhcp[cd] emit non-standard
-	  sized packets.
-
-	  Known buggy DHCP servers:
-	  3Com OfficeConnect Remote 812 ADSL Router:
-	    seems to confuse maximum allowed UDP packet size with
-	    maximum size of entire IP packet, and sends packets which are
-	    28 bytes too large.
-	  Seednet (ISP) VDSL: sends packets 2 bytes too large.
+	Some buggy DHCP servers send DHCP offer packets with option
+	field larger than we expect (which might also be considered a
+	buffer overflow attempt). These packets are normally discarded.
+	If circumstances beyond your control force you to support such
+	servers, this may help. The upper limit (924) makes udhcpc accept
+	even 1500 byte packets (maximum-sized ethernet packets).
+
+	This option does not make udhcp[cd] emit non-standard
+	sized packets.
+
+	Known buggy DHCP servers:
+	3Com OfficeConnect Remote 812 ADSL Router:
+		seems to confuse maximum allowed UDP packet size with
+		maximum size of entire IP packet, and sends packets
+		which are 28 bytes too large.
+	Seednet (ISP) VDSL: sends packets 2 bytes too large.
+
+config BUSYBOX_FEATURE_UDHCP_RFC3397
+	bool "Support RFC 3397 domain search options"
+	default y
+	depends on BUSYBOX_UDHCPD || BUSYBOX_UDHCPC
+	help
+	If selected, both client and server will support passing of domain
+	search lists via option 119, specified in RFC 3397,
+	and SIP servers option 120, specified in RFC 3361.
+
+config BUSYBOX_FEATURE_UDHCP_8021Q
+	bool "Support 802.1Q VLAN parameters options"
+	default y
+	depends on BUSYBOX_UDHCPD || BUSYBOX_UDHCPC
+	help
+	If selected, both client and server will support passing of VLAN
+	ID and priority via options 132 and 133 as per 802.1Q.