Merge branch 'busybox' into merge

426 files changed, 4005 insertions, 3245 deletions

diff --git a/Config.in b/Config.in
index 0353a0525..2342d8467 100644
--- a/Config.in
+++ b/Config.in
@@ -29,88 +29,88 @@ config DESKTOP
         bool "Enable compatibility for full-blown desktop systems"
         default y
         help
-          Enable applet options and features which are not essential.
-          Many applet options have dedicated config options to (de)select them
-          under that applet; this options enables those options which have no
-          individual config item for them.
+        Enable applet options and features which are not essential.
+        Many applet options have dedicated config options to (de)select them
+        under that applet; this options enables those options which have no
+        individual config item for them.
 
-          Select this if you plan to use busybox on full-blown desktop machine
-          with common Linux distro, which needs higher level of command-line
-          compatibility.
+        Select this if you plan to use busybox on full-blown desktop machine
+        with common Linux distro, which needs higher level of command-line
+        compatibility.
 
-          If you are preparing your build to be used on an embedded box
-          where you have tighter control over the entire set of userspace
-          tools, you can unselect this option for smaller code size.
+        If you are preparing your build to be used on an embedded box
+        where you have tighter control over the entire set of userspace
+        tools, you can unselect this option for smaller code size.
 
 config EXTRA_COMPAT
         bool "Provide compatible behavior for rare corner cases (bigger code)"
         default n
         help
-          This option makes grep, sed etc handle rare corner cases
-          (embedded NUL bytes and such). This makes code bigger and uses
-          some GNU extensions in libc. You probably only need this option
-          if you plan to run busybox on desktop.
+        This option makes grep, sed etc handle rare corner cases
+        (embedded NUL bytes and such). This makes code bigger and uses
+        some GNU extensions in libc. You probably only need this option
+        if you plan to run busybox on desktop.
 
 config INCLUDE_SUSv2
         bool "Enable obsolete features removed before SUSv3"
         default y
         help
-          This option will enable backwards compatibility with SuSv2,
-          specifically, old-style numeric options ('command -1 <file>')
-          will be supported in head, tail, and fold. (Note: should
-          affect renice too.)
+        This option will enable backwards compatibility with SuSv2,
+        specifically, old-style numeric options ('command -1 <file>')
+        will be supported in head, tail, and fold. (Note: should
+        affect renice too.)
 
 config LONG_OPTS
         bool "Support --long-options"
         default y
         help
-          Enable this if you want busybox applets to use the gnu --long-option
-          style, in addition to single character -a -b -c style options.
+        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 SHOW_USAGE
         bool "Show applet usage messages"
         default y
         help
-          Enabling this option, BusyBox applets will show terse help messages
-          when invoked with wrong arguments.
-          If you do not want to show any (helpful) usage message when
-          issuing wrong command syntax, you can say 'N' here,
-          saving approximately 7k.
+        Enabling this option, BusyBox applets will show terse help messages
+        when invoked with wrong arguments.
+        If you do not want to show any (helpful) usage message when
+        issuing wrong command syntax, you can say 'N' here,
+        saving approximately 7k.
 
 config FEATURE_VERBOSE_USAGE
         bool "Show verbose applet usage messages"
         default y
         depends on SHOW_USAGE
         help
-          All BusyBox applets will show verbose help messages when
-          busybox is invoked with --help. This will add a lot of text to the
-          busybox binary. In the default configuration, this will add about
-          13k, but it can add much more depending on your configuration.
+        All BusyBox applets will show verbose help messages when
+        busybox is invoked with --help. This will add a lot of text to the
+        busybox binary. In the default configuration, this will add about
+        13k, but it can add much more depending on your configuration.
 
 config FEATURE_COMPRESS_USAGE
         bool "Store applet usage messages in compressed form"
         default y
         depends on SHOW_USAGE
         help
-          Store usage messages in .bz compressed form, uncompress them
-          on-the-fly when <applet> --help is called.
+        Store usage messages in .bz compressed form, uncompress them
+        on-the-fly when <applet> --help is called.
 
-          If you have a really tiny busybox with few applets enabled (and
-          bunzip2 isn't one of them), the overhead of the decompressor might
-          be noticeable. Also, if you run executables directly from ROM
-          and have very little memory, this might not be a win. Otherwise,
-          you probably want this.
+        If you have a really tiny busybox with few applets enabled (and
+        bunzip2 isn't one of them), the overhead of the decompressor might
+        be noticeable. Also, if you run executables directly from ROM
+        and have very little memory, this might not be a win. Otherwise,
+        you probably want this.
 
 config LFS
         bool "Support files > 2 GB"
         default y
         help
-          If you want to build BusyBox with large file support, then enable
-          this option. This will have no effect if your kernel or your C
-          library lacks large file support for large files. Some of the
-          programs that can benefit from large file support include dd, gzip,
-          cp, mount, tar, and many others. If you want to access files larger
-          than 2 Gigabytes, enable this option.
+        If you want to build BusyBox with large file support, then enable
+        this option. This will have no effect if your kernel or your C
+        library lacks large file support for large files. Some of the
+        programs that can benefit from large file support include dd, gzip,
+        cp, mount, tar, and many others. If you want to access files larger
+        than 2 Gigabytes, enable this option.
 
 config GLOBBING
         bool "Allow busybox.exe to expand wildcards"
@@ -138,227 +138,227 @@ config PAM
         bool "Support PAM (Pluggable Authentication Modules)"
         default n
         help
-          Use PAM in some busybox applets (currently login and httpd) instead
-          of direct access to password database.
+        Use PAM in some busybox applets (currently login and httpd) instead
+        of direct access to password database.
 
 config FEATURE_DEVPTS
         bool "Use the devpts filesystem for Unix98 PTYs"
         default y
         help
-          Enable if you want BusyBox to use Unix98 PTY support. If enabled,
-          busybox will use /dev/ptmx for the master side of the pseudoterminal
-          and /dev/pts/<number> for the slave side. Otherwise, BSD style
-          /dev/ttyp<number> will be used. To use this option, you should have
-          devpts mounted.
+        Enable if you want BusyBox to use Unix98 PTY support. If enabled,
+        busybox will use /dev/ptmx for the master side of the pseudoterminal
+        and /dev/pts/<number> for the slave side. Otherwise, BSD style
+        /dev/ttyp<number> will be used. To use this option, you should have
+        devpts mounted.
 
 config FEATURE_UTMP
         bool "Support utmp file"
         default y
         help
-          The file /var/run/utmp is used to track who is currently logged in.
-          With this option on, certain applets (getty, login, telnetd etc)
-          will create and delete entries there.
-          "who" applet requires this option.
+        The file /var/run/utmp is used to track who is currently logged in.
+        With this option on, certain applets (getty, login, telnetd etc)
+        will create and delete entries there.
+        "who" applet requires this option.
 
 config FEATURE_WTMP
         bool "Support wtmp file"
         default y
         depends on FEATURE_UTMP
         help
-          The file /var/run/wtmp is used to track when users have logged into
-          and logged out of the system.
-          With this option on, certain applets (getty, login, telnetd etc)
-          will append new entries there.
-          "last" applet requires this option.
+        The file /var/run/wtmp is used to track when users have logged into
+        and logged out of the system.
+        With this option on, certain applets (getty, login, telnetd etc)
+        will append new entries there.
+        "last" applet requires this option.
 
 config FEATURE_PIDFILE
         bool "Support writing pidfiles"
         default y
         help
-          This option makes some applets (e.g. crond, syslogd, inetd) write
-          a pidfile at the configured PID_FILE_PATH.  It has no effect
-          on applets which require pidfiles to run.
+        This option makes some applets (e.g. crond, syslogd, inetd) write
+        a pidfile at the configured PID_FILE_PATH.  It has no effect
+        on applets which require pidfiles to run.
 
 config PID_FILE_PATH
         string "Directory for pidfiles"
         default "/var/run"
         depends on FEATURE_PIDFILE
         help
-          This is the default path where pidfiles are created.  Applets which
-          allow you to set the pidfile path on the command line will override
-          this value.  The option has no effect on applets that require you to
-          specify a pidfile path.
+        This is the default path where pidfiles are created.  Applets which
+        allow you to set the pidfile path on the command line will override
+        this value.  The option has no effect on applets that require you to
+        specify a pidfile path.
 
 config BUSYBOX
         bool "Include busybox applet"
         default y
         help
-          The busybox applet provides general help regarding busybox and
-          allows the included applets to be listed.  It's also required
-          if applet links are to be installed at runtime. If you unselect
-          this option, running busybox without any arguments will give
-          just a cryptic error message:
+        The busybox applet provides general help regarding busybox and
+        allows the included applets to be listed.  It's also required
+        if applet links are to be installed at runtime. If you unselect
+        this option, running busybox without any arguments will give
+        just a cryptic error message:
 
-          $ busybox
-          busybox: applet not found
+        $ busybox
+        busybox: applet not found
 
-          Running "busybox APPLET [ARGS...]" will still work, of course.
+        Running "busybox APPLET [ARGS...]" will still work, of course.
 
 config FEATURE_INSTALLER
         bool "Support --install [-s] to install applet links at runtime"
         default y
         depends on BUSYBOX
         help
-          Enable 'busybox --install [-s]' support. This will allow you to use
-          busybox at runtime to create hard links or symlinks for all the
-          applets that are compiled into busybox.
+        Enable 'busybox --install [-s]' support. This will allow you to use
+        busybox at runtime to create hard links or symlinks for all the
+        applets that are compiled into busybox.
 
 config INSTALL_NO_USR
         bool "Don't use /usr"
         default n
         help
-          Disable use of /usr. busybox --install and "make install"
-          will install applets only to /bin and /sbin,
-          never to /usr/bin or /usr/sbin.
+        Disable use of /usr. busybox --install and "make install"
+        will install applets only to /bin and /sbin,
+        never to /usr/bin or /usr/sbin.
 
 config FEATURE_SUID
         bool "Drop SUID state for most applets"
         default y
         help
-          With this option you can install the busybox binary belonging
-          to root with the suid bit set, enabling some applets to perform
-          root-level operations even when run by ordinary users
-          (for example, mounting of user mounts in fstab needs this).
+        With this option you can install the busybox binary belonging
+        to root with the suid bit set, enabling some applets to perform
+        root-level operations even when run by ordinary users
+        (for example, mounting of user mounts in fstab needs this).
 
-          With this option enabled, Busybox drops privileges for applets
-          that don't need root access, before entering their main() function.
+        With this option enabled, Busybox drops privileges for applets
+        that don't need root access, before entering their main() function.
 
-          If you are really paranoid and don't want even initial busybox code
-          to run under root for evey applet, build two busybox binaries with
-          different applets in them (and the appropriate symlinks pointing
-          to each binary), and only set the suid bit on the one that needs it.
+        If you are really paranoid and don't want even initial busybox code
+        to run under root for evey applet, build two busybox binaries with
+        different applets in them (and the appropriate symlinks pointing
+        to each binary), and only set the suid bit on the one that needs it.
 
-          Some applets which require root rights (need suid bit on the binary
-          or to be run by root) and will refuse to execute otherwise:
-          crontab, login, passwd, su, vlock, wall.
+        Some applets which require root rights (need suid bit on the binary
+        or to be run by root) and will refuse to execute otherwise:
+        crontab, login, passwd, su, vlock, wall.
 
-          The applets which will use root rights if they have them
-          (via suid bit, or because run by root), but would try to work
-          without root right nevertheless:
-          findfs, ping[6], traceroute[6], mount.
+        The applets which will use root rights if they have them
+        (via suid bit, or because run by root), but would try to work
+        without root right nevertheless:
+        findfs, ping[6], traceroute[6], mount.
 
-          Note that if you DO NOT select this option, but DO make busybox
-          suid root, ALL applets will run under root, which is a huge
-          security hole (think "cp /some/file /etc/passwd").
+        Note that if you DO NOT select this option, but DO make busybox
+        suid root, ALL applets will run under root, which is a huge
+        security hole (think "cp /some/file /etc/passwd").
 
 config FEATURE_SUID_CONFIG
         bool "Enable SUID configuration via /etc/busybox.conf"
         default y
         depends on FEATURE_SUID
         help
-          Allow the SUID/SGID state of an applet to be determined at runtime
-          by checking /etc/busybox.conf. (This is sort of a poor man's sudo.)
-          The format of this file is as follows:
-
-          APPLET = [Ssx-][Ssx-][x-] [USER.GROUP]
-
-          s: USER or GROUP is allowed to execute APPLET.
-             APPLET will run under USER or GROUP
-             (reagardless of who's running it).
-          S: USER or GROUP is NOT allowed to execute APPLET.
-             APPLET will run under USER or GROUP.
-             This option is not very sensical.
-          x: USER/GROUP/others are allowed to execute APPLET.
-             No UID/GID change will be done when it is run.
-          -: USER/GROUP/others are not allowed to execute APPLET.
-
-          An example might help:
-
-          [SUID]
-          su = ssx root.0 # applet su can be run by anyone and runs with
-                          # euid=0,egid=0
-          su = ssx        # exactly the same
-
-          mount = sx- root.disk # applet mount can be run by root and members
-                                # of group disk (but not anyone else)
-                                # and runs with euid=0 (egid is not changed)
-
-          cp = --- # disable applet cp for everyone
-
-          The file has to be owned by user root, group root and has to be
-          writeable only by root:
-                (chown 0.0 /etc/busybox.conf; chmod 600 /etc/busybox.conf)
-          The busybox executable has to be owned by user root, group
-          root and has to be setuid root for this to work:
-                (chown 0.0 /bin/busybox; chmod 4755 /bin/busybox)
-
-          Robert 'sandman' Griebl has more information here:
-          <url: http://www.softforge.de/bb/suid.html >.
+        Allow the SUID/SGID state of an applet to be determined at runtime
+        by checking /etc/busybox.conf. (This is sort of a poor man's sudo.)
+        The format of this file is as follows:
+
+        APPLET = [Ssx-][Ssx-][x-] [USER.GROUP]
+
+        s: USER or GROUP is allowed to execute APPLET.
+           APPLET will run under USER or GROUP
+           (regardless of who's running it).
+        S: USER or GROUP is NOT allowed to execute APPLET.
+           APPLET will run under USER or GROUP.
+           This option is not very sensical.
+        x: USER/GROUP/others are allowed to execute APPLET.
+           No UID/GID change will be done when it is run.
+        -: USER/GROUP/others are not allowed to execute APPLET.
+
+        An example might help:
+
+        |[SUID]
+        |su = ssx root.0 # applet su can be run by anyone and runs with
+        |                # euid=0,egid=0
+        |su = ssx        # exactly the same
+        |
+        |mount = sx- root.disk # applet mount can be run by root and members
+        |                      # of group disk (but not anyone else)
+        |                      # and runs with euid=0 (egid is not changed)
+        |
+        |cp = --- # disable applet cp for everyone
+
+        The file has to be owned by user root, group root and has to be
+        writeable only by root:
+                (chown 0.0 /etc/busybox.conf; chmod 600 /etc/busybox.conf)
+        The busybox executable has to be owned by user root, group
+        root and has to be setuid root for this to work:
+                (chown 0.0 /bin/busybox; chmod 4755 /bin/busybox)
+
+        Robert 'sandman' Griebl has more information here:
+        <url: http://www.softforge.de/bb/suid.html >.
 
 config FEATURE_SUID_CONFIG_QUIET
         bool "Suppress warning message if /etc/busybox.conf is not readable"
         default y
         depends on FEATURE_SUID_CONFIG
         help
-          /etc/busybox.conf should be readable by the user needing the SUID,
-          check this option to avoid users to be notified about missing
-          permissions.
+        /etc/busybox.conf should be readable by the user needing the SUID,
+        check this option to avoid users to be notified about missing
+        permissions.
 
 config FEATURE_PREFER_APPLETS
         bool "exec prefers applets"
         default n
         help
-          This is an experimental option which directs applets about to
-          call 'exec' to try and find an applicable busybox applet before
-          searching the PATH. This is typically done by exec'ing
-          /proc/self/exe.
+        This is an experimental option which directs applets about to
+        call 'exec' to try and find an applicable busybox applet before
+        searching the PATH. This is typically done by exec'ing
+        /proc/self/exe.
 
-          This may affect shell, find -exec, xargs and similar applets.
-          They will use applets even if /bin/APPLET -> busybox link
-          is missing (or is not a link to busybox). However, this causes
-          problems in chroot jails without mounted /proc and with ps/top
-          (command name can be shown as 'exe' for applets started this way).
+        This may affect shell, find -exec, xargs and similar applets.
+        They will use applets even if /bin/APPLET -> busybox link
+        is missing (or is not a link to busybox). However, this causes
+        problems in chroot jails without mounted /proc and with ps/top
+        (command name can be shown as 'exe' for applets started this way).
 
 config BUSYBOX_EXEC_PATH
         string "Path to BusyBox executable"
         default "/proc/self/exe"
         help
-          When Busybox applets need to run other busybox applets, BusyBox
-          sometimes needs to exec() itself. When the /proc filesystem is
-          mounted, /proc/self/exe always points to the currently running
-          executable. If you haven't got /proc, set this to wherever you
-          want to run BusyBox from.
+        When Busybox applets need to run other busybox applets, BusyBox
+        sometimes needs to exec() itself. When the /proc filesystem is
+        mounted, /proc/self/exe always points to the currently running
+        executable. If you haven't got /proc, set this to wherever you
+        want to run BusyBox from.
 
 config SELINUX
         bool "Support NSA Security Enhanced Linux"
         default n
         select PLATFORM_LINUX
         help
-          Enable support for SELinux in applets ls, ps, and id. Also provide
-          the option of compiling in SELinux applets.
+        Enable support for SELinux in applets ls, ps, and id. Also provide
+        the option of compiling in SELinux applets.
 
-          If you do not have a complete SELinux userland installed, this stuff
-          will not compile.  Specifially, libselinux 1.28 or better is
-          directly required by busybox. If the installation is located in a
-          non-standard directory, provide it by invoking make as follows:
+        If you do not have a complete SELinux userland installed, this stuff
+        will not compile.  Specifially, libselinux 1.28 or better is
+        directly required by busybox. If the installation is located in a
+        non-standard directory, provide it by invoking make as follows:
 
                 CFLAGS=-I<libselinux-include-path> \
                 LDFLAGS=-L<libselinux-lib-path> \
                 make
 
-          Most people will leave this set to 'N'.
+        Most people will leave this set to 'N'.
 
 config FEATURE_CLEAN_UP
         bool "Clean up all memory before exiting (usually not needed)"
         default n
         help
-          As a size optimization, busybox normally exits without explicitly
-          freeing dynamically allocated memory or closing files. This saves
-          space since the OS will clean up for us, but it can confuse debuggers
-          like valgrind, which report tons of memory and resource leaks.
+        As a size optimization, busybox normally exits without explicitly
+        freeing dynamically allocated memory or closing files. This saves
+        space since the OS will clean up for us, but it can confuse debuggers
+        like valgrind, which report tons of memory and resource leaks.
 
-          Don't enable this unless you have a really good reason to clean
-          things up manually.
+        Don't enable this unless you have a really good reason to clean
+        things up manually.
 
 # These are auto-selected by other options
 
@@ -366,26 +366,26 @@ config FEATURE_SYSLOG
         bool #No description makes it a hidden option
         default n
         #help
-        #  This option is auto-selected when you select any applet which may
-        #  send its output to syslog. You do not need to select it manually.
+        #This option is auto-selected when you select any applet which may
+        #send its output to syslog. You do not need to select it manually.
 
 config FEATURE_HAVE_RPC
         bool #No description makes it a hidden option
         default n
         #help
-        #  This is automatically selected if any of enabled applets need it.
-        #  You do not need to select it manually.
+        #This is automatically selected if any of enabled applets need it.
+        #You do not need to select it manually.
 
 config PLATFORM_LINUX
         bool #No description makes it a hidden option
         default n
         #help
-        #  For the most part, busybox requires only POSIX compatibility
-        #  from the target system, but some applets and features use
-        #  Linux-specific interfaces.
+        #For the most part, busybox requires only POSIX compatibility
+        #from the target system, but some applets and features use
+        #Linux-specific interfaces.
         #
-        #  This is automatically selected if any applet or feature requires
-        #  Linux-specific interfaces. You do not need to select it manually.
+        #This is automatically selected if any applet or feature requires
+        #Linux-specific interfaces. You do not need to select it manually.
 
 comment 'Build Options'
 
@@ -393,37 +393,37 @@ config STATIC
         bool "Build BusyBox as a static binary (no shared libs)"
         default n
         help
-          If you want to build a static BusyBox binary, which does not
-          use or require any shared libraries, then enable this option.
-          This can cause BusyBox to be considerably larger, so you should
-          leave this option false unless you have a good reason (i.e.
-          your target platform does not support shared libraries, or
-          you are building an initrd which doesn't need anything but
-          BusyBox, etc).
+        If you want to build a static BusyBox binary, which does not
+        use or require any shared libraries, then enable this option.
+        This can cause BusyBox to be considerably larger, so you should
+        leave this option false unless you have a good reason (i.e.
+        your target platform does not support shared libraries, or
+        you are building an initrd which doesn't need anything but
+        BusyBox, etc).
 
-          Most people will leave this set to 'N'.
+        Most people will leave this set to 'N'.
 
 config PIE
         bool "Build BusyBox as a position independent executable"
         default n
         depends on !STATIC
         help
-          Hardened code option. PIE binaries are loaded at a different
-          address at each invocation. This has some overhead,
-          particularly on x86-32 which is short on registers.
+        Hardened code option. PIE binaries are loaded at a different
+        address at each invocation. This has some overhead,
+        particularly on x86-32 which is short on registers.
 
-          Most people will leave this set to 'N'.
+        Most people will leave this set to 'N'.
 
 config NOMMU
         bool "Force NOMMU build"
         default n
         help
-          Busybox tries to detect whether architecture it is being
-          built against supports MMU or not. If this detection fails,
-          or if you want to build NOMMU version of busybox for testing,
-          you may force NOMMU build here.
+        Busybox tries to detect whether architecture it is being
+        built against supports MMU or not. If this detection fails,
+        or if you want to build NOMMU version of busybox for testing,
+        you may force NOMMU build here.
 
-          Most people will leave this set to 'N'.
+        Most people will leave this set to 'N'.
 
 # PIE can be made to work with BUILD_LIBBUSYBOX, but currently
 # build system does not support that
@@ -432,128 +432,128 @@ config BUILD_LIBBUSYBOX
         default n
         depends on !FEATURE_PREFER_APPLETS && !PIE && !STATIC
         help
-          Build a shared library libbusybox.so.N.N.N which contains all
-          busybox code.
+        Build a shared library libbusybox.so.N.N.N which contains all
+        busybox code.
 
-          This feature allows every applet to be built as a really tiny
-          separate executable linked against the library:
-          $ size 0_lib/l*
-            text  data   bss     dec    hex filename
-             939   212    28    1179    49b 0_lib/last
-             939   212    28    1179    49b 0_lib/less
-          919138  8328  1556  929022  e2cfe 0_lib/libbusybox.so.1.N.M
+        This feature allows every applet to be built as a really tiny
+        separate executable linked against the library:
+        |$ size 0_lib/l*
+        |    text  data   bss     dec    hex filename
+        |     939   212    28    1179    49b 0_lib/last
+        |     939   212    28    1179    49b 0_lib/less
+        |  919138  8328  1556  929022  e2cfe 0_lib/libbusybox.so.1.N.M
 
-          This is useful on NOMMU systems which are not capable
-          of sharing executables, but are capable of sharing code
-          in dynamic libraries.
+        This is useful on NOMMU systems which are not capable
+        of sharing executables, but are capable of sharing code
+        in dynamic libraries.
 
 config FEATURE_LIBBUSYBOX_STATIC
         bool "Pull in all external references into libbusybox"
         default n
         depends on BUILD_LIBBUSYBOX
         help
-          Make libbusybox library independent, not using or requiring
-          any other shared libraries.
+        Make libbusybox library independent, not using or requiring
+        any other shared libraries.
 
 config FEATURE_INDIVIDUAL
         bool "Produce a binary for each applet, linked against libbusybox"
         default y
         depends on BUILD_LIBBUSYBOX
         help
-          If your CPU architecture doesn't allow for sharing text/rodata
-          sections of running binaries, but allows for runtime dynamic
-          libraries, this option will allow you to reduce memory footprint
-          when you have many different applets running at once.
+        If your CPU architecture doesn't allow for sharing text/rodata
+        sections of running binaries, but allows for runtime dynamic
+        libraries, this option will allow you to reduce memory footprint
+        when you have many different applets running at once.
 
-          If your CPU architecture allows for sharing text/rodata,
-          having single binary is more optimal.
+        If your CPU architecture allows for sharing text/rodata,
+        having single binary is more optimal.
 
-          Each applet will be a tiny program, dynamically linked
-          against libbusybox.so.N.N.N.
+        Each applet will be a tiny program, dynamically linked
+        against libbusybox.so.N.N.N.
 
-          You need to have a working dynamic linker.
+        You need to have a working dynamic linker.
 
 config FEATURE_SHARED_BUSYBOX
         bool "Produce additional busybox binary linked against libbusybox"
         default y
         depends on BUILD_LIBBUSYBOX
         help
-          Build busybox, dynamically linked against libbusybox.so.N.N.N.
+        Build busybox, dynamically linked against libbusybox.so.N.N.N.
 
-          You need to have a working dynamic linker.
+        You need to have a working dynamic linker.
 
 ### config BUILD_AT_ONCE
 ###     bool "Compile all sources at once"
 ###     default n
 ###     help
-###       Normally each source-file is compiled with one invocation of
-###       the compiler.
-###       If you set this option, all sources are compiled at once.
-###       This gives the compiler more opportunities to optimize which can
-###       result in smaller and/or faster binaries.
+###     Normally each source-file is compiled with one invocation of
+###     the compiler.
+###     If you set this option, all sources are compiled at once.
+###     This gives the compiler more opportunities to optimize which can
+###     result in smaller and/or faster binaries.
 ###
-###       Setting this option will consume alot of memory, e.g. if you
-###       enable all applets with all features, gcc uses more than 300MB
-###       RAM during compilation of busybox.
+###     Setting this option will consume alot of memory, e.g. if you
+###     enable all applets with all features, gcc uses more than 300MB
+###     RAM during compilation of busybox.
 ###
-###       This option is most likely only beneficial for newer compilers
-###       such as gcc-4.1 and above.
+###     This option is most likely only beneficial for newer compilers
+###     such as gcc-4.1 and above.
 ###
-###       Say 'N' unless you know what you are doing.
+###     Say 'N' unless you know what you are doing.
 
 config CROSS_COMPILER_PREFIX
         string "Cross Compiler prefix"
         default ""
         help
-          If you want to build BusyBox with a cross compiler, then you
-          will need to set this to the cross-compiler prefix, for example,
-          "i386-uclibc-".
+        If you want to build BusyBox with a cross compiler, then you
+        will need to set this to the cross-compiler prefix, for example,
+        "i386-uclibc-".
 
-          Note that CROSS_COMPILE environment variable or
-          "make CROSS_COMPILE=xxx ..." will override this selection.
+        Note that CROSS_COMPILE environment variable or
+        "make CROSS_COMPILE=xxx ..." will override this selection.
 
-          Native builds leave this empty.
+        Native builds leave this empty.
 
 config SYSROOT
         string "Path to sysroot"
         default ""
         help
-          If you want to build BusyBox with a cross compiler, then you
-          might also need to specify where /usr/include and /usr/lib
-          will be found.
+        If you want to build BusyBox with a cross compiler, then you
+        might also need to specify where /usr/include and /usr/lib
+        will be found.
 
-          For example, BusyBox can be built against an installed
-          Android NDK, platform version 9, for ARM ABI with
+        For example, BusyBox can be built against an installed
+        Android NDK, platform version 9, for ARM ABI with
 
-          CONFIG_SYSROOT=/opt/android-ndk/platforms/android-9/arch-arm
+        CONFIG_SYSROOT=/opt/android-ndk/platforms/android-9/arch-arm
 
-          Native builds leave this empty.
+        Native builds leave this empty.
 
 config EXTRA_CFLAGS
         string "Additional CFLAGS"
         default ""
         help
-          Additional CFLAGS to pass to the compiler verbatim.
+        Additional CFLAGS to pass to the compiler verbatim.
 
 config EXTRA_LDFLAGS
         string "Additional LDFLAGS"
         default ""
         help
-          Additional LDFLAGS to pass to the linker verbatim.
+        Additional LDFLAGS to pass to the linker verbatim.
 
 config EXTRA_LDLIBS
         string "Additional LDLIBS"
         default ""
         help
-          Additional LDLIBS to pass to the linker with -l.
+        Additional LDLIBS to pass to the linker with -l.
 
 config USE_PORTABLE_CODE
         bool "Avoid using GCC-specific code constructs"
         default n
         help
-          Use this option if you are trying to compile busybox with
-          compiler other than gcc.
-          If you do use gcc, this option may needlessly increase code size.
+        Use this option if you are trying to compile busybox with
+        compiler other than gcc.
+        If you do use gcc, this option may needlessly increase code size.
 
 comment 'Installation Options ("make install" behavior)'
 
@@ -561,32 +561,32 @@ choice
         prompt "What kind of applet links to install"
         default INSTALL_APPLET_SYMLINKS
         help
-          Choose what kind of links to applets are created by "make install".
+        Choose what kind of links to applets are created by "make install".
 
 config INSTALL_APPLET_SYMLINKS
         bool "as soft-links"
         help
-          Install applets as soft-links to the busybox binary. This needs some
-          free inodes on the filesystem, but might help with filesystem
-          generators that can't cope with hard-links.
+        Install applets as soft-links to the busybox binary. This needs some
+        free inodes on the filesystem, but might help with filesystem
+        generators that can't cope with hard-links.
 
 config INSTALL_APPLET_HARDLINKS
         bool "as hard-links"
         help
-          Install applets as hard-links to the busybox binary. This might
-          count on a filesystem with few inodes.
+        Install applets as hard-links to the busybox binary. This might
+        count on a filesystem with few inodes.
 
 config INSTALL_APPLET_SCRIPT_WRAPPERS
         bool "as script wrappers"
         help
-          Install applets as script wrappers that call the busybox binary.
+        Install applets as script wrappers that call the busybox binary.
 
 config INSTALL_APPLET_DONT
         bool "not installed"
         help
-          Do not install applet links. Useful when you plan to use
-          busybox --install for installing links, or plan to use
-          a standalone shell and thus don't need applet links.
+        Do not install applet links. Useful when you plan to use
+        busybox --install for installing links, or plan to use
+        a standalone shell and thus don't need applet links.
 
 endchoice
 
@@ -595,23 +595,23 @@ choice
         default INSTALL_SH_APPLET_SYMLINK
         depends on INSTALL_APPLET_SCRIPT_WRAPPERS
         help
-          Choose how you install /bin/sh applet link.
+        Choose how you install /bin/sh applet link.
 
 config INSTALL_SH_APPLET_SYMLINK
         bool "as soft-link"
         help
-          Install /bin/sh applet as soft-link to the busybox binary.
+        Install /bin/sh applet as soft-link to the busybox binary.
 
 config INSTALL_SH_APPLET_HARDLINK
         bool "as hard-link"
         help
-          Install /bin/sh applet as hard-link to the busybox binary.
+        Install /bin/sh applet as hard-link to the busybox binary.
 
 config INSTALL_SH_APPLET_SCRIPT_WRAPPER
         bool "as script wrapper"
         help
-          Install /bin/sh applet as script wrapper that calls
-          the busybox binary.
+        Install /bin/sh applet as script wrapper that calls
+        the busybox binary.
 
 endchoice
 
@@ -619,7 +619,7 @@ config PREFIX
         string "BusyBox installation prefix"
         default "./_install"
         help
-          Define your directory to install BusyBox files/subdirs in.
+        Define your directory to install BusyBox files/subdirs in.
 
 comment 'Debugging Options'
 
@@ -627,81 +627,81 @@ config DEBUG
         bool "Build BusyBox with extra Debugging symbols"
         default n
         help
-          Say Y here if you wish to examine BusyBox internals while applets are
-          running. This increases the size of the binary considerably, and
-          should only be used when doing development. If you are doing
-          development and want to debug BusyBox, answer Y.
+        Say Y here if you wish to examine BusyBox internals while applets are
+        running. This increases the size of the binary considerably, and
+        should only be used when doing development. If you are doing
+        development and want to debug BusyBox, answer Y.
 
-          Most people should answer N.
+        Most people should answer N.
 
 config DEBUG_PESSIMIZE
         bool "Disable compiler optimizations"
         default n
         depends on DEBUG
         help
-          The compiler's optimization of source code can eliminate and reorder
-          code, resulting in an executable that's hard to understand when
-          stepping through it with a debugger. This switches it off, resulting
-          in a much bigger executable that more closely matches the source
-          code.
+        The compiler's optimization of source code can eliminate and reorder
+        code, resulting in an executable that's hard to understand when
+        stepping through it with a debugger. This switches it off, resulting
+        in a much bigger executable that more closely matches the source
+        code.
 
 config DEBUG_SANITIZE
         bool "Enable runtime sanitizers (ASAN/LSAN/USAN/etc...)"
         default n
         help
-          Say Y here if you want to enable runtime sanitizers. These help
-          catch bad memory accesses (e.g. buffer overflows), but will make
-          the executable larger and slow down runtime a bit.
+        Say Y here if you want to enable runtime sanitizers. These help
+        catch bad memory accesses (e.g. buffer overflows), but will make
+        the executable larger and slow down runtime a bit.
 
-          This adds -fsanitize=foo options to gcc command line.
+        This adds -fsanitize=foo options to gcc command line.
 
-          If you aren't developing/testing busybox, say N here.
+        If you aren't developing/testing busybox, say N here.
 
 config UNIT_TEST
         bool "Build unit tests"
         default n
         help
-          Say Y here if you want to build unit tests (both the framework and
-          test cases) as a Busybox applet. This results in bigger code, so you
-          probably don't want this option in production builds.
+        Say Y here if you want to build unit tests (both the framework and
+        test cases) as a Busybox applet. This results in bigger code, so you
+        probably don't want this option in production builds.
 
 config WERROR
         bool "Abort compilation on any warning"
         default n
         help
-          This adds -Werror to gcc command line.
+        This adds -Werror to gcc command line.
 
-          Most people should answer N.
+        Most people should answer N.
 
 choice
         prompt "Additional debugging library"
         default NO_DEBUG_LIB
         help
-          Using an additional debugging library will make BusyBox become
-          considerable larger and will cause it to run more slowly. You
-          should always leave this option disabled for production use.
-
-          dmalloc support:
-          ----------------
-          This enables compiling with dmalloc ( http://dmalloc.com/ )
-          which is an excellent public domain mem leak and malloc problem
-          detector. To enable dmalloc, before running busybox you will
-          want to properly set your environment, for example:
-            export DMALLOC_OPTIONS=debug=0x34f47d83,inter=100,log=logfile
-          The 'debug=' value is generated using the following command
-            dmalloc -p log-stats -p log-non-free -p log-bad-space \
-               -p log-elapsed-time -p check-fence -p check-heap \
-               -p check-lists -p check-blank -p check-funcs -p realloc-copy \
-               -p allow-free-null
-
-          Electric-fence support:
-          -----------------------
-          This enables compiling with Electric-fence support. Electric
-          fence is another very useful malloc debugging library which uses
-          your computer's virtual memory hardware to detect illegal memory
-          accesses. This support will make BusyBox be considerable larger
-          and run slower, so you should leave this option disabled unless
-          you are hunting a hard to find memory problem.
+        Using an additional debugging library will make BusyBox become
+        considerable larger and will cause it to run more slowly. You
+        should always leave this option disabled for production use.
+
+        dmalloc support:
+        ----------------
+        This enables compiling with dmalloc ( http://dmalloc.com/ )
+        which is an excellent public domain mem leak and malloc problem
+        detector. To enable dmalloc, before running busybox you will
+        want to properly set your environment, for example:
+                export DMALLOC_OPTIONS=debug=0x34f47d83,inter=100,log=logfile
+        The 'debug=' value is generated using the following command
+        dmalloc -p log-stats -p log-non-free -p log-bad-space \
+                -p log-elapsed-time -p check-fence -p check-heap \
+                -p check-lists -p check-blank -p check-funcs -p realloc-copy \
+                -p allow-free-null
+
+        Electric-fence support:
+        -----------------------
+        This enables compiling with Electric-fence support. Electric
+        fence is another very useful malloc debugging library which uses
+        your computer's virtual memory hardware to detect illegal memory
+        accesses. This support will make BusyBox be considerable larger
+        and run slower, so you should leave this option disabled unless
+        you are hunting a hard to find memory problem.
 
 
 config NO_DEBUG_LIB
diff --git a/Makefile b/Makefile
index 8f3bc7ec0..47bdaf7ad 100644
--- a/Makefile
+++ b/Makefile
@@ -178,7 +178,7 @@ endif
 # SUBARCH is subsequently ignored.
 
 ifneq ($(CROSS_COMPILE),)
-SUBARCH := $(shell echo $(CROSS_COMPILE) | cut -d- -f1)
+SUBARCH := $(shell echo $(CROSS_COMPILE) | cut -d- -f1 | sed 's:^.*/::g')
 else
 SUBARCH := $(shell uname -m)
 endif
diff --git a/arch/sparc/Makefile b/arch/sparc/Makefile
new file mode 100644
index 000000000..0b1c56cb5
--- /dev/null
+++ b/arch/sparc/Makefile
@@ -0,0 +1,11 @@
+# When building a library, even intra-library references,
+# such as from find_applet_by_name() to applet_names[],
+# don't work with -fpic on sparc, needs -fPIC.
+# Don't know why it fails in this case but works when
+# a binary is being built.
+#
+# (if is superfluous, ARCH_FPIC is only used by library build, but it
+# demonstrates the point: non-pic binary does not need it)
+ifeq ($(CONFIG_BUILD_LIBBUSYBOX),y)
+ARCH_FPIC = -fPIC
+endif
diff --git a/arch/sparc64/Makefile b/arch/sparc64/Makefile
new file mode 100644
index 000000000..0b1c56cb5
--- /dev/null
+++ b/arch/sparc64/Makefile
@@ -0,0 +1,11 @@
+# When building a library, even intra-library references,
+# such as from find_applet_by_name() to applet_names[],
+# don't work with -fpic on sparc, needs -fPIC.
+# Don't know why it fails in this case but works when
+# a binary is being built.
+#
+# (if is superfluous, ARCH_FPIC is only used by library build, but it
+# demonstrates the point: non-pic binary does not need it)
+ifeq ($(CONFIG_BUILD_LIBBUSYBOX),y)
+ARCH_FPIC = -fPIC
+endif
diff --git a/archival/Config.src b/archival/Config.src
index 0c97f3d7c..449914565 100644
--- a/archival/Config.src
+++ b/archival/Config.src
@@ -27,4 +27,12 @@ config FEATURE_SEAMLESS_Z
 
 INSERT
 
+config FEATURE_LZMA_FAST
+        bool "Optimize lzma for speed"
+        default n
+        depends on UNLZMA || LZCAT || LZMA || FEATURE_SEAMLESS_LZMA
+        help
+        This option reduces decompression time by about 25% at the cost of
+        a 1K bigger binary.
+
 endmenu
diff --git a/archival/ar.c b/archival/ar.c
index f9f712fde..ea36bda88 100644
--- a/archival/ar.c
+++ b/archival/ar.c
@@ -18,34 +18,32 @@
  */
 
 //config:config AR
-//config:       bool "ar"
+//config:       bool "ar (9.5 kb)"
 //config:       default n  # needs to be improved to be able to replace binutils ar
 //config:       help
-//config:         ar is an archival utility program used to create, modify, and
-//config:         extract contents from archives. In practice, it is used exclusively
-//config:         for object module archives used by compilers.
+//config:       ar is an archival utility program used to create, modify, and
+//config:       extract contents from archives. In practice, it is used exclusively
+//config:       for object module archives used by compilers.
 //config:
-//config:         On an x86 system, the ar applet adds about 1K.
-//config:
-//config:         Unless you have a specific application which requires ar, you should
-//config:         probably say N here: most compilers come with their own ar utility.
+//config:       Unless you have a specific application which requires ar, you should
+//config:       probably say N here: most compilers come with their own ar utility.
 //config:
 //config:config FEATURE_AR_LONG_FILENAMES
 //config:       bool "Support long filenames (not needed for debs)"
 //config:       default y
 //config:       depends on AR
 //config:       help
-//config:         By default the ar format can only store the first 15 characters
-//config:         of the filename, this option removes that limitation.
-//config:         It supports the GNU ar long filename method which moves multiple long
-//config:         filenames into a the data section of a new ar entry.
+//config:       By default the ar format can only store the first 15 characters
+//config:       of the filename, this option removes that limitation.
+//config:       It supports the GNU ar long filename method which moves multiple long
+//config:       filenames into a the data section of a new ar entry.
 //config:
 //config:config FEATURE_AR_CREATE
 //config:       bool "Support archive creation"
 //config:       default y
 //config:       depends on AR
 //config:       help
-//config:         This enables archive creation (-c and -r) with busybox ar.
+//config:       This enables archive creation (-c and -r) with busybox ar.
 
 //applet:IF_AR(APPLET(ar, BB_DIR_USR_BIN, BB_SUID_DROP))
 //kbuild:lib-$(CONFIG_AR) += ar.o
diff --git a/archival/bbunzip.c b/archival/bbunzip.c
index 1e3d6e586..f91dd25eb 100644
--- a/archival/bbunzip.c
+++ b/archival/bbunzip.c
@@ -239,11 +239,11 @@ char* FAST_FUNC make_new_name_generic(char *filename, const char *expected_ext)
 //usage:     "\n        -f      Overwrite"
 
 //config:config UNCOMPRESS
-//config:       bool "uncompress"
+//config:       bool "uncompress (7.1 kb)"
 //config:       default n  # ancient
 //config:       help
-//config:         uncompress is used to decompress archives created by compress.
-//config:         Not much used anymore, replaced by gzip/gunzip.
+//config:       uncompress is used to decompress archives created by compress.
+//config:       Not much used anymore, replaced by gzip/gunzip.
 
 //applet:IF_UNCOMPRESS(APPLET(uncompress, BB_DIR_BIN, BB_SUID_DROP))
 //kbuild:lib-$(CONFIG_UNCOMPRESS) += bbunzip.o
@@ -314,20 +314,20 @@ int uncompress_main(int argc UNUSED_PARAM, char **argv)
 //usage:       "Decompress to stdout"
 
 //config:config GUNZIP
-//config:       bool "gunzip"
+//config:       bool "gunzip (12 kb)"
 //config:       default y
 //config:       select FEATURE_GZIP_DECOMPRESS
 //config:       help
-//config:         gunzip is used to decompress archives created by gzip.
-//config:         You can use the `-t' option to test the integrity of
-//config:         an archive, without decompressing it.
+//config:       gunzip is used to decompress archives created by gzip.
+//config:       You can use the `-t' option to test the integrity of
+//config:       an archive, without decompressing it.
 //config:
 //config:config ZCAT
-//config:       bool "zcat"
+//config:       bool "zcat (25 kb)"
 //config:       default y
 //config:       select FEATURE_GZIP_DECOMPRESS
 //config:       help
-//config:         Alias to "gunzip -c".
+//config:       Alias to "gunzip -c".
 //config:
 //config:config FEATURE_GUNZIP_LONG_OPTIONS
 //config:       bool "Enable long options"
@@ -400,7 +400,7 @@ int gunzip_main(int argc UNUSED_PARAM, char **argv)
          * Normally, "zcat" is just "gunzip -c".
          * But if seamless magic is enabled, then we are much more clever.
          */
-        if (ENABLE_ZCAT && applet_name[1] == 'c')
+        if (ENABLE_ZCAT && (!ENABLE_GUNZIP || applet_name[1] == 'c'))
                 option_mask32 |= OPT_STDOUT | SEAMLESS_MAGIC;
 
         return bbunpack(argv, unpack_gz_stream, make_new_name_gunzip, /*unused:*/ NULL);
@@ -427,25 +427,25 @@ int gunzip_main(int argc UNUSED_PARAM, char **argv)
 //usage:       "Decompress to stdout"
 
 //config:config BUNZIP2
-//config:       bool "bunzip2"
+//config:       bool "bunzip2 (8.8 kb)"
 //config:       default y
 //config:       select FEATURE_BZIP2_DECOMPRESS
 //config:       help
-//config:         bunzip2 is a compression utility using the Burrows-Wheeler block
-//config:         sorting text compression algorithm, and Huffman coding. Compression
-//config:         is generally considerably better than that achieved by more
-//config:         conventional LZ77/LZ78-based compressors, and approaches the
-//config:         performance of the PPM family of statistical compressors.
+//config:       bunzip2 is a compression utility using the Burrows-Wheeler block
+//config:       sorting text compression algorithm, and Huffman coding. Compression
+//config:       is generally considerably better than that achieved by more
+//config:       conventional LZ77/LZ78-based compressors, and approaches the
+//config:       performance of the PPM family of statistical compressors.
 //config:
-//config:         Unless you have a specific application which requires bunzip2, you
-//config:         should probably say N here.
+//config:       Unless you have a specific application which requires bunzip2, you
+//config:       should probably say N here.
 //config:
 //config:config BZCAT
-//config:       bool "bzcat"
+//config:       bool "bzcat (8.8 kb)"
 //config:       default y
 //config:       select FEATURE_BZIP2_DECOMPRESS
 //config:       help
-//config:         Alias to "bunzip2 -c".
+//config:       Alias to "bunzip2 -c".
 
 //applet:IF_BUNZIP2(APPLET(bunzip2, BB_DIR_USR_BIN, BB_SUID_DROP))
 //                APPLET_ODDNAME:name   main     location        suid_type     help
@@ -456,7 +456,7 @@ int bunzip2_main(int argc UNUSED_PARAM, char **argv)
 {
         getopt32(argv, "cfkvqdt");
         argv += optind;
-        if (ENABLE_BZCAT && applet_name[2] == 'c') /* bzcat */
+        if (ENABLE_BZCAT && (!ENABLE_BUNZIP2 || applet_name[2] == 'c')) /* bzcat */
                 option_mask32 |= OPT_STDOUT;
 
         return bbunpack(argv, unpack_bz2_stream, make_new_name_generic, "bz2");
@@ -495,43 +495,26 @@ int bunzip2_main(int argc UNUSED_PARAM, char **argv)
 //usage:       "Decompress to stdout"
 
 //config:config UNLZMA
-//config:       bool "unlzma"
+//config:       bool "unlzma (8.6 kb)"
 //config:       default y
 //config:       help
-//config:         unlzma is a compression utility using the Lempel-Ziv-Markov chain
-//config:         compression algorithm, and range coding. Compression
-//config:         is generally considerably better than that achieved by the bzip2
-//config:         compressors.
-//config:
-//config:         The BusyBox unlzma applet is limited to decompression only.
-//config:         On an x86 system, this applet adds about 4K.
+//config:       unlzma is a compression utility using the Lempel-Ziv-Markov chain
+//config:       compression algorithm, and range coding. Compression
+//config:       is generally considerably better than that achieved by the bzip2
+//config:       compressors.
 //config:
 //config:config LZCAT
-//config:       bool "lzcat"
+//config:       bool "lzcat (8.5 kb)"
 //config:       default y
 //config:       help
-//config:         unlzma is a compression utility using the Lempel-Ziv-Markov chain
-//config:         compression algorithm, and range coding. Compression
-//config:         is generally considerably better than that achieved by the bzip2
-//config:         compressors.
-//config:
-//config:         The BusyBox unlzma applet is limited to decompression only.
-//config:         On an x86 system, this applet adds about 4K.
+//config:       Alias to "unlzma -c".
 //config:
 //config:config LZMA
 //config:       bool "lzma -d"
 //config:       default y
 //config:       help
-//config:         Enable this option if you want commands like "lzma -d" to work.
-//config:         IOW: you'll get lzma applet, but it will always require -d option.
-//config:
-//config:config FEATURE_LZMA_FAST
-//config:       bool "Optimize for speed"
-//config:       default n
-//config:       depends on UNLZMA || LZCAT || LZMA
-//config:       help
-//config:         This option reduces decompression time by about 25% at the cost of
-//config:         a 1K bigger binary.
+//config:       Enable this option if you want commands like "lzma -d" to work.
+//config:       IOW: you'll get lzma applet, but it will always require -d option.
 
 //applet:IF_UNLZMA(APPLET(unlzma, BB_DIR_USR_BIN, BB_SUID_DROP))
 //                APPLET_ODDNAME:name   main    location        suid_type     help
@@ -583,23 +566,23 @@ int unlzma_main(int argc UNUSED_PARAM, char **argv)
 //usage:       "Decompress to stdout"
 
 //config:config UNXZ
-//config:       bool "unxz"
+//config:       bool "unxz (13 kb)"
 //config:       default y
 //config:       help
-//config:         unxz is a unlzma successor.
+//config:       unxz is a unlzma successor.
 //config:
 //config:config XZCAT
-//config:       bool "xzcat"
+//config:       bool "xzcat (13 kb)"
 //config:       default y
 //config:       help
-//config:         Alias to "unxz -c".
+//config:       Alias to "unxz -c".
 //config:
 //config:config XZ
 //config:       bool "xz -d"
 //config:       default y
 //config:       help
-//config:         Enable this option if you want commands like "xz -d" to work.
-//config:         IOW: you'll get xz applet, but it will always require -d option.
+//config:       Enable this option if you want commands like "xz -d" to work.
+//config:       IOW: you'll get xz applet, but it will always require -d option.
 
 //applet:IF_UNXZ(APPLET(unxz, BB_DIR_USR_BIN, BB_SUID_DROP))
 //                APPLET_ODDNAME:name   main  location        suid_type     help
diff --git a/archival/bzip2.c b/archival/bzip2.c
index 8afa43802..0b9c508df 100644
--- a/archival/bzip2.c
+++ b/archival/bzip2.c
@@ -8,26 +8,26 @@
  */
 
 //config:config BZIP2
-//config:       bool "bzip2"
+//config:       bool "bzip2 (18 kb)"
 //config:       default y
 //config:       help
-//config:         bzip2 is a compression utility using the Burrows-Wheeler block
-//config:         sorting text compression algorithm, and Huffman coding. Compression
-//config:         is generally considerably better than that achieved by more
-//config:         conventional LZ77/LZ78-based compressors, and approaches the
-//config:         performance of the PPM family of statistical compressors.
+//config:       bzip2 is a compression utility using the Burrows-Wheeler block
+//config:       sorting text compression algorithm, and Huffman coding. Compression
+//config:       is generally considerably better than that achieved by more
+//config:       conventional LZ77/LZ78-based compressors, and approaches the
+//config:       performance of the PPM family of statistical compressors.
 //config:
-//config:         Unless you have a specific application which requires bzip2, you
-//config:         should probably say N here.
+//config:       Unless you have a specific application which requires bzip2, you
+//config:       should probably say N here.
 //config:
 //config:config FEATURE_BZIP2_DECOMPRESS
 //config:       bool "Enable decompression"
 //config:       default y
 //config:       depends on BZIP2 || BUNZIP2 || BZCAT
 //config:       help
-//config:         Enable -d (--decompress) and -t (--test) options for bzip2.
-//config:         This will be automatically selected if bunzip2 or bzcat is
-//config:         enabled.
+//config:       Enable -d (--decompress) and -t (--test) options for bzip2.
+//config:       This will be automatically selected if bunzip2 or bzcat is
+//config:       enabled.
 
 //applet:IF_BZIP2(APPLET(bzip2, BB_DIR_USR_BIN, BB_SUID_DROP))
 //kbuild:lib-$(CONFIG_BZIP2) += bzip2.o
diff --git a/archival/cpio.c b/archival/cpio.c
index 683f0bb1f..38bab8257 100644
--- a/archival/cpio.c
+++ b/archival/cpio.c
@@ -15,33 +15,33 @@
 #include "bb_archive.h"
 
 //config:config CPIO
-//config:       bool "cpio"
+//config:       bool "cpio (14 kb)"
 //config:       default y
 //config:       help
-//config:         cpio is an archival utility program used to create, modify, and
-//config:         extract contents from archives.
-//config:         cpio has 110 bytes of overheads for every stored file.
+//config:       cpio is an archival utility program used to create, modify, and
+//config:       extract contents from archives.
+//config:       cpio has 110 bytes of overheads for every stored file.
 //config:
-//config:         This implementation of cpio can extract cpio archives created in the
-//config:         "newc" or "crc" format.
+//config:       This implementation of cpio can extract cpio archives created in the
+//config:       "newc" or "crc" format.
 //config:
-//config:         Unless you have a specific application which requires cpio, you
-//config:         should probably say N here.
+//config:       Unless you have a specific application which requires cpio, you
+//config:       should probably say N here.
 //config:
 //config:config FEATURE_CPIO_O
 //config:       bool "Support archive creation"
 //config:       default y
 //config:       depends on CPIO
 //config:       help
-//config:         This implementation of cpio can create cpio archives in the "newc"
-//config:         format only.
+//config:       This implementation of cpio can create cpio archives in the "newc"
+//config:       format only.
 //config:
 //config:config FEATURE_CPIO_P
 //config:       bool "Support passthrough mode"
 //config:       default y
 //config:       depends on FEATURE_CPIO_O
 //config:       help
-//config:         Passthrough mode. Rarely used.
+//config:       Passthrough mode. Rarely used.
 
 //applet:IF_CPIO(APPLET(cpio, BB_DIR_BIN, BB_SUID_DROP))
 //kbuild:lib-$(CONFIG_CPIO) += cpio.o
diff --git a/archival/dpkg.c b/archival/dpkg.c
index da3b0864e..90ad8766c 100644
--- a/archival/dpkg.c
+++ b/archival/dpkg.c
@@ -27,15 +27,15 @@
  */
 
 //config:config DPKG
-//config:       bool "dpkg"
+//config:       bool "dpkg (44 kb)"
 //config:       default y
 //config:       select FEATURE_SEAMLESS_GZ
 //config:       help
-//config:         dpkg is a medium-level tool to install, build, remove and manage
-//config:         Debian packages.
+//config:       dpkg is a medium-level tool to install, build, remove and manage
+//config:       Debian packages.
 //config:
-//config:         This implementation of dpkg has a number of limitations,
-//config:         you should use the official dpkg if possible.
+//config:       This implementation of dpkg has a number of limitations,
+//config:       you should use the official dpkg if possible.
 
 //applet:IF_DPKG(APPLET(dpkg, BB_DIR_USR_BIN, BB_SUID_DROP))
 //kbuild:lib-$(CONFIG_DPKG) += dpkg.o
diff --git a/archival/dpkg_deb.c b/archival/dpkg_deb.c
index ebbc7f035..029bc4af1 100644
--- a/archival/dpkg_deb.c
+++ b/archival/dpkg_deb.c
@@ -10,12 +10,12 @@
 //config:       default y
 //config:       select FEATURE_SEAMLESS_GZ
 //config:       help
-//config:         dpkg-deb unpacks and provides information about Debian archives.
+//config:       dpkg-deb unpacks and provides information about Debian archives.
 //config:
-//config:         This implementation of dpkg-deb cannot pack archives.
+//config:       This implementation of dpkg-deb cannot pack archives.
 //config:
-//config:         Unless you have a specific application which requires dpkg-deb,
-//config:         say N here.
+//config:       Unless you have a specific application which requires dpkg-deb,
+//config:       say N here.
 
 //applet:IF_DPKG_DEB(APPLET_ODDNAME(dpkg-deb, dpkg_deb, BB_DIR_USR_BIN, BB_SUID_DROP, dpkg_deb))
 
diff --git a/archival/gzip.c b/archival/gzip.c
index c895de426..4cf34ac28 100644
--- a/archival/gzip.c
+++ b/archival/gzip.c
@@ -38,11 +38,11 @@ aa:      85.1% -- replaced with aa.gz
 */
 
 //config:config GZIP
-//config:       bool "gzip"
+//config:       bool "gzip (19 kb)"
 //config:       default y
 //config:       help
-//config:         gzip is used to compress files.
-//config:         It's probably the most widely used UNIX compression program.
+//config:       gzip is used to compress files.
+//config:       It's probably the most widely used UNIX compression program.
 //config:
 //config:config FEATURE_GZIP_LONG_OPTIONS
 //config:       bool "Enable long options"
@@ -55,30 +55,30 @@ aa:      85.1% -- replaced with aa.gz
 //config:       range 0 2
 //config:       depends on GZIP
 //config:       help
-//config:         Enable big memory options for gzip.
-//config:         0: small buffers, small hash-tables
-//config:         1: larger buffers, larger hash-tables
-//config:         2: larger buffers, largest hash-tables
-//config:         Larger models may give slightly better compression
+//config:       Enable big memory options for gzip.
+//config:       0: small buffers, small hash-tables
+//config:       1: larger buffers, larger hash-tables
+//config:       2: larger buffers, largest hash-tables
+//config:       Larger models may give slightly better compression
 //config:
 //config:config FEATURE_GZIP_LEVELS
 //config:       bool "Enable compression levels"
 //config:       default n
 //config:       depends on GZIP
 //config:       help
-//config:         Enable support for compression levels 4-9. The default level
-//config:         is 6. If levels 1-3 are specified, 4 is used.
-//config:         If this option is not selected, -N options are ignored and -9
-//config:         is used.
+//config:       Enable support for compression levels 4-9. The default level
+//config:       is 6. If levels 1-3 are specified, 4 is used.
+//config:       If this option is not selected, -N options are ignored and -9
+//config:       is used.
 //config:
 //config:config FEATURE_GZIP_DECOMPRESS
 //config:       bool "Enable decompression"
 //config:       default y
 //config:       depends on GZIP || GUNZIP || ZCAT
 //config:       help
-//config:         Enable -d (--decompress) and -t (--test) options for gzip.
-//config:         This will be automatically selected if gunzip or zcat is
-//config:         enabled.
+//config:       Enable -d (--decompress) and -t (--test) options for gzip.
+//config:       This will be automatically selected if gunzip or zcat is
+//config:       enabled.
 
 //applet:IF_GZIP(APPLET(gzip, BB_DIR_BIN, BB_SUID_DROP))
 //kbuild:lib-$(CONFIG_GZIP) += gzip.o
diff --git a/archival/lzop.c b/archival/lzop.c
index 6ef82b749..df18ff170 100644
--- a/archival/lzop.c
+++ b/archival/lzop.c
@@ -26,31 +26,31 @@
 */
 
 //config:config LZOP
-//config:       bool "lzop"
+//config:       bool "lzop (13 kb)"
 //config:       default y
 //config:       help
-//config:         Lzop compression/decompresion.
+//config:       Lzop compression/decompresion.
 //config:
 //config:config UNLZOP
-//config:       bool "unlzop"
+//config:       bool "unlzop (13 kb)"
 //config:       default n  # INCOMPAT: upstream lzop does not provide such tool
 //config:       help
-//config:         Lzop decompresion.
+//config:       Lzop decompresion.
 //config:
 //config:config LZOPCAT
-//config:       bool "lzopcat"
+//config:       bool "lzopcat (13 kb)"
 //config:       default n  # INCOMPAT: upstream lzop does not provide such tool
 //config:       help
-//config:         Alias to "unlzop -c".
+//config:       Alias to "lzop -dc".
 //config:
 //config:config LZOP_COMPR_HIGH
 //config:       bool "lzop compression levels 7,8,9 (not very useful)"
 //config:       default n
 //config:       depends on LZOP || UNLZOP || LZOPCAT
 //config:       help
-//config:         High levels (7,8,9) of lzop compression. These levels
-//config:         are actually slower than gzip at equivalent compression ratios
-//config:         and take up 3.2K of code.
+//config:       High levels (7,8,9) of lzop compression. These levels
+//config:       are actually slower than gzip at equivalent compression ratios
+//config:       and take up 3.2K of code.
 
 //applet:IF_LZOP(APPLET(lzop, BB_DIR_BIN, BB_SUID_DROP))
 //                  APPLET_ODDNAME:name     main  location        suid_type     help
diff --git a/archival/rpm.c b/archival/rpm.c
index 83160f975..98039d499 100644
--- a/archival/rpm.c
+++ b/archival/rpm.c
@@ -8,10 +8,10 @@
  */
 
 //config:config RPM
-//config:       bool "rpm"
+//config:       bool "rpm (33 kb)"
 //config:       default y
 //config:       help
-//config:         Mini RPM applet - queries and extracts RPM packages.
+//config:       Mini RPM applet - queries and extracts RPM packages.
 
 //applet:IF_RPM(APPLET(rpm, BB_DIR_BIN, BB_SUID_DROP))
 //kbuild:lib-$(CONFIG_RPM) += rpm.o
diff --git a/archival/rpm2cpio.c b/archival/rpm2cpio.c
index 7057570f5..3e4a6a249 100644
--- a/archival/rpm2cpio.c
+++ b/archival/rpm2cpio.c
@@ -8,10 +8,10 @@
  */
 
 //config:config RPM2CPIO
-//config:       bool "rpm2cpio"
+//config:       bool "rpm2cpio (20 kb)"
 //config:       default y
 //config:       help
-//config:         Converts a RPM file into a CPIO archive.
+//config:       Converts a RPM file into a CPIO archive.
 
 //applet:IF_RPM2CPIO(APPLET(rpm2cpio, BB_DIR_USR_BIN, BB_SUID_DROP))
 //kbuild:lib-$(CONFIG_RPM2CPIO) += rpm2cpio.o
diff --git a/archival/tar.c b/archival/tar.c
index c11b735d5..4d1db4934 100644
--- a/archival/tar.c
+++ b/archival/tar.c
@@ -42,12 +42,12 @@
  */
 
 //config:config TAR
-//config:       bool "tar"
+//config:       bool "tar (40 kb)"
 //config:       default y
 //config:       help
-//config:         tar is an archiving program. It's commonly used with gzip to
-//config:         create compressed archives. It's probably the most widely used
-//config:         UNIX archive program.
+//config:       tar is an archiving program. It's commonly used with gzip to
+//config:       create compressed archives. It's probably the most widely used
+//config:       UNIX archive program.
 //config:
 //config:config FEATURE_TAR_LONG_OPTIONS
 //config:       bool "Enable long options"
@@ -64,35 +64,35 @@
 //config:       default y
 //config:       depends on TAR && (FEATURE_SEAMLESS_Z || FEATURE_SEAMLESS_GZ || FEATURE_SEAMLESS_BZ2 || FEATURE_SEAMLESS_LZMA || FEATURE_SEAMLESS_XZ)
 //config:       help
-//config:         With this option tar can automatically detect compressed
-//config:         tarballs. Currently it works only on files (not pipes etc).
+//config:       With this option tar can automatically detect compressed
+//config:       tarballs. Currently it works only on files (not pipes etc).
 //config:
 //config:config FEATURE_TAR_FROM
 //config:       bool "Enable -X (exclude from) and -T (include from) options)"
 //config:       default y
 //config:       depends on TAR
 //config:       help
-//config:         If you enable this option you'll be able to specify
-//config:         a list of files to include or exclude from an archive.
+//config:       If you enable this option you'll be able to specify
+//config:       a list of files to include or exclude from an archive.
 //config:
 //config:config FEATURE_TAR_OLDGNU_COMPATIBILITY
 //config:       bool "Support old tar header format"
 //config:       default y
 //config:       depends on TAR || DPKG
 //config:       help
-//config:         This option is required to unpack archives created in
-//config:         the old GNU format; help to kill this old format by
-//config:         repacking your ancient archives with the new format.
+//config:       This option is required to unpack archives created in
+//config:       the old GNU format; help to kill this old format by
+//config:       repacking your ancient archives with the new format.
 //config:
 //config:config FEATURE_TAR_OLDSUN_COMPATIBILITY
 //config:       bool "Enable untarring of tarballs with checksums produced by buggy Sun tar"
 //config:       default y
 //config:       depends on TAR || DPKG
 //config:       help
-//config:         This option is required to unpack archives created by some old
-//config:         version of Sun's tar (it was calculating checksum using signed
-//config:         arithmetic). It is said to be fixed in newer Sun tar, but "old"
-//config:         tarballs still exist.
+//config:       This option is required to unpack archives created by some old
+//config:       version of Sun's tar (it was calculating checksum using signed
+//config:       arithmetic). It is said to be fixed in newer Sun tar, but "old"
+//config:       tarballs still exist.
 //config:
 //config:config FEATURE_TAR_GNU_EXTENSIONS
 //config:       bool "Support GNU tar extensions (long filenames)"
@@ -104,18 +104,18 @@
 //config:       default y
 //config:       depends on TAR && FEATURE_TAR_LONG_OPTIONS
 //config:       help
-//config:         If you enable this option you'll be able to instruct tar to send
-//config:         the contents of each extracted file to the standard input of an
-//config:         external program.
+//config:       If you enable this option you'll be able to instruct tar to send
+//config:       the contents of each extracted file to the standard input of an
+//config:       external program.
 //config:
 //config:config FEATURE_TAR_UNAME_GNAME
 //config:       bool "Enable use of user and group names"
 //config:       default y
 //config:       depends on TAR
 //config:       help
-//config:         Enable use of user and group names in tar. This affects contents
-//config:         listings (-t) and preserving permissions when unpacking (-p).
-//config:         +200 bytes.
+//config:       Enable use of user and group names in tar. This affects contents
+//config:       listings (-t) and preserving permissions when unpacking (-p).
+//config:       +200 bytes.
 //config:
 //config:config FEATURE_TAR_NOPRESERVE_TIME
 //config:       bool "Enable -m (do not preserve time) GNU option"
@@ -127,8 +127,8 @@
 //config:       default n
 //config:       depends on TAR && SELINUX
 //config:       help
-//config:         With this option busybox supports restoring SELinux labels
-//config:         when extracting files from tar archives.
+//config:       With this option busybox supports restoring SELinux labels
+//config:       when extracting files from tar archives.
 
 //applet:IF_TAR(APPLET(tar, BB_DIR_BIN, BB_SUID_DROP))
 //kbuild:lib-$(CONFIG_TAR) += tar.o
diff --git a/archival/unzip.c b/archival/unzip.c
index 8dfc4e678..4c4feda82 100644
--- a/archival/unzip.c
+++ b/archival/unzip.c
@@ -17,23 +17,23 @@
  * Zip64 + other methods
  */
 //config:config UNZIP
-//config:       bool "unzip"
+//config:       bool "unzip (24 kb)"
 //config:       default y
 //config:       help
-//config:         unzip will list or extract files from a ZIP archive,
-//config:         commonly found on DOS/WIN systems. The default behavior
-//config:         (with no options) is to extract the archive into the
-//config:         current directory.
+//config:       unzip will list or extract files from a ZIP archive,
+//config:       commonly found on DOS/WIN systems. The default behavior
+//config:       (with no options) is to extract the archive into the
+//config:       current directory.
 //config:
 //config:config FEATURE_UNZIP_CDF
 //config:       bool "Read and use Central Directory data"
 //config:       default y
 //config:       depends on UNZIP
 //config:       help
-//config:         If you know that you only need to deal with simple
-//config:         ZIP files without deleted/updated files, SFX archives etc,
-//config:         you can reduce code size by unselecting this option.
-//config:         To support less trivial ZIPs, say Y.
+//config:       If you know that you only need to deal with simple
+//config:       ZIP files without deleted/updated files, SFX archives etc,
+//config:       you can reduce code size by unselecting this option.
+//config:       To support less trivial ZIPs, say Y.
 //config:
 //config:config FEATURE_UNZIP_BZIP2
 //config:       bool "Support compression method 12 (bzip2)"
@@ -62,6 +62,7 @@
 //usage:     "\n        -l      List contents (with -q for short form)"
 //usage:     "\n        -n      Never overwrite files (default: ask)"
 //usage:     "\n        -o      Overwrite"
+//usage:     "\n        -j      Do not restore paths"
 //usage:     "\n        -p      Print to stdout"
 //usage:     "\n        -q      Quiet"
 //usage:     "\n        -x FILE Exclude FILEs"
@@ -320,6 +321,12 @@ static uint32_t read_next_cdf(uint32_t cdf_offset, cdf_header_t *cdf)
 };
 #endif
 
+static void die_if_bad_fnamesize(unsigned sz)
+{
+        if (sz > 0xfff) /* more than 4k?! no funny business please */
+                bb_error_msg_and_die("bad archive");
+}
+
 static void unzip_skip(off_t skip)
 {
         if (skip != 0)
@@ -337,6 +344,39 @@ static void unzip_create_leading_dirs(const char *fn)
         free(name);
 }
 
+#if ENABLE_FEATURE_UNZIP_CDF
+static void unzip_extract_symlink(zip_header_t *zip, const char *dst_fn)
+{
+        char *target;
+
+        die_if_bad_fnamesize(zip->fmt.ucmpsize);
+
+        if (zip->fmt.method == 0) {
+                /* Method 0 - stored (not compressed) */
+                target = xzalloc(zip->fmt.ucmpsize + 1);
+                xread(zip_fd, target, zip->fmt.ucmpsize);
+        } else {
+#if 1
+                bb_error_msg_and_die("compressed symlink is not supported");
+#else
+                transformer_state_t xstate;
+                init_transformer_state(&xstate);
+                xstate.mem_output_size_max = zip->fmt.ucmpsize;
+                /* ...unpack... */
+                if (!xstate.mem_output_buf)
+                        WTF();
+                target = xstate.mem_output_buf;
+                target = xrealloc(target, xstate.mem_output_size + 1);
+                target[xstate.mem_output_size] = '\0';
+#endif
+        }
+//TODO: libbb candidate
+        if (symlink(target, dst_fn))
+                bb_perror_msg_and_die("can't create symlink '%s'", dst_fn);
+        free(target);
+}
+#endif
+
 static void unzip_extract(zip_header_t *zip, int dst_fd)
 {
         transformer_state_t xstate;
@@ -349,12 +389,6 @@ static void unzip_extract(zip_header_t *zip, int dst_fd)
                 return;
         }
 
-// NB: to support symlinks, need to extract symlink target. A-la:
-// xstate.mem_output_size_max = zip->fmt.ucmpsize;
-// ...unpack...
-// if (xstate.mem_output_buf) { success, xstate.mem_output_size is the size }
-// Although archives I've seen have fmt.method == 0 for symlinks.
-
         init_transformer_state(&xstate);
         xstate.bytes_in = zip->fmt.cmpsize;
         xstate.src_fd = zip_fd;
@@ -414,16 +448,32 @@ static void my_fgets80(char *buf80)
         }
 }
 
+static int get_lstat_mode(const char *dst_fn)
+{
+        struct stat stat_buf;
+        if (lstat(dst_fn, &stat_buf) == -1) {
+                if (errno != ENOENT) {
+                        bb_perror_msg_and_die("can't stat '%s'", dst_fn);
+                }
+                /* File does not exist */
+                return -1;
+        }
+        return stat_buf.st_mode;
+}
+
 int unzip_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int unzip_main(int argc, char **argv)
 {
-        enum { O_PROMPT, O_NEVER, O_ALWAYS };
-
+        enum {
+                OPT_l = (1 << 0),
+                OPT_x = (1 << 1),
+                OPT_j = (1 << 2),
+        };
+        unsigned opts;
         smallint quiet = 0;
         IF_NOT_FEATURE_UNZIP_CDF(const) smallint verbose = 0;
-        smallint listing = 0;
+        enum { O_PROMPT, O_NEVER, O_ALWAYS };
         smallint overwrite = O_PROMPT;
-        smallint x_opt_seen;
         uint32_t cdf_offset;
         unsigned long total_usize;
         unsigned long total_size;
@@ -434,9 +484,8 @@ int unzip_main(int argc, char **argv)
         llist_t *zaccept = NULL;
         llist_t *zreject = NULL;
         char *base_dir = NULL;
-        int i, opt;
+        int i;
         char key_buf[80]; /* must match size used by my_fgets80 */
-        struct stat stat_buf;
 
 /* -q, -l and -v: UnZip 5.52 of 28 February 2005, by Info-ZIP:
  *
@@ -479,16 +528,16 @@ int unzip_main(int argc, char **argv)
  *    204372                   1 file
  */
 
-        x_opt_seen = 0;
+        opts = 0;
         /* '-' makes getopt return 1 for non-options */
-        while ((opt = getopt(argc, argv, "-d:lnopqxv")) != -1) {
-                switch (opt) {
+        while ((i = getopt(argc, argv, "-d:lnopqxjv")) != -1) {
+                switch (i) {
                 case 'd':  /* Extract to base directory */
                         base_dir = optarg;
                         break;
 
                 case 'l': /* List */
-                        listing = 1;
+                        opts |= OPT_l;
                         break;
 
                 case 'n': /* Never overwrite existing files */
@@ -508,11 +557,15 @@ int unzip_main(int argc, char **argv)
 
                 case 'v': /* Verbose list */
                         IF_FEATURE_UNZIP_CDF(verbose++;)
-                        listing = 1;
+                        opts |= OPT_l;
                         break;
 
                 case 'x':
-                        x_opt_seen = 1;
+                        opts |= OPT_x;
+                        break;
+
+                case 'j':
+                        opts |= OPT_j;
                         break;
 
                 case 1:
@@ -521,7 +574,7 @@ int unzip_main(int argc, char **argv)
                                 /* +5: space for ".zip" and NUL */
                                 src_fn = xmalloc(strlen(optarg) + 5);
                                 strcpy(src_fn, optarg);
-                        } else if (!x_opt_seen) {
+                        } else if (!(opts & OPT_x)) {
                                 /* Include files */
                                 llist_add_to(&zaccept, optarg);
                         } else {
@@ -589,7 +642,7 @@ int unzip_main(int argc, char **argv)
         if (quiet <= 1) { /* not -qq */
                 if (quiet == 0)
                         printf("Archive:  %s\n", src_fn);
-                if (listing) {
+                if (opts & OPT_l) {
                         puts(verbose ?
                                 " Length   Method    Size  Cmpr    Date    Time   CRC-32   Name\n"
                                 "--------  ------  ------- ---- ---------- ----- --------  ----"
@@ -722,7 +775,6 @@ int unzip_main(int argc, char **argv)
                         if ((cdf.fmt.version_made_by >> 8) == 3) {
                                 /* This archive is created on Unix */
                                 dir_mode = file_mode = (cdf.fmt.external_attributes >> 16);
-//TODO: if (S_ISLNK(file_mode)) this is a symlink
                         }
                 }
 #endif
@@ -740,15 +792,22 @@ int unzip_main(int argc, char **argv)
 
                 /* Read filename */
                 free(dst_fn);
+                die_if_bad_fnamesize(zip.fmt.filename_len);
                 dst_fn = xzalloc(zip.fmt.filename_len + 1);
                 xread(zip_fd, dst_fn, zip.fmt.filename_len);
-
                 /* Skip extra header bytes */
                 unzip_skip(zip.fmt.extra_len);
 
                 /* Guard against "/abspath", "/../" and similar attacks */
                 overlapping_strcpy(dst_fn, strip_unsafe_prefix(dst_fn));
 
+                if (opts & OPT_j) /* Strip paths? */
+                        overlapping_strcpy(dst_fn, bb_basename(dst_fn));
+
+                /* Did this strip everything ("DIR/" case)? Then skip */
+                if (!dst_fn[0])
+                        goto skip_cmpsize;
+
                 /* Filter zip entries */
                 if (find_list_entry(zreject, dst_fn)
                  || (zaccept && !find_list_entry(zaccept, dst_fn))
@@ -756,7 +815,7 @@ int unzip_main(int argc, char **argv)
                         goto skip_cmpsize;
                 }
 
-                if (listing) {
+                if (opts & OPT_l) {
                         /* List entry */
                         char dtbuf[sizeof("mm-dd-yyyy hh:mm")];
                         sprintf(dtbuf, "%02u-%02u-%04u %02u:%02u",
@@ -814,11 +873,11 @@ int unzip_main(int argc, char **argv)
                         goto do_extract;
                 }
                 if (last_char_is(dst_fn, '/')) {
+                        int mode;
+
                         /* Extract directory */
-                        if (stat(dst_fn, &stat_buf) == -1) {
-                                if (errno != ENOENT) {
-                                        bb_perror_msg_and_die("can't stat '%s'", dst_fn);
-                                }
+                        mode = get_lstat_mode(dst_fn);
+                        if (mode == -1) { /* ENOENT */
                                 if (!quiet) {
                                         printf("   creating: %s\n", dst_fn);
                                 }
@@ -827,7 +886,7 @@ int unzip_main(int argc, char **argv)
                                         xfunc_die();
                                 }
                         } else {
-                                if (!S_ISDIR(stat_buf.st_mode)) {
+                                if (!S_ISDIR(mode)) {
                                         bb_error_msg_and_die("'%s' exists but is not a %s",
                                                 dst_fn, "directory");
                                 }
@@ -835,29 +894,33 @@ int unzip_main(int argc, char **argv)
                         goto skip_cmpsize;
                 }
  check_file:
-                /* Extract file */
-                if (stat(dst_fn, &stat_buf) == -1) {
-                        /* File does not exist */
-                        if (errno != ENOENT) {
-                                bb_perror_msg_and_die("can't stat '%s'", dst_fn);
+                /* Does target file already exist? */
+                {
+                        int mode = get_lstat_mode(dst_fn);
+                        if (mode == -1) {
+                                /* ENOENT: does not exist */
+                                goto do_open_and_extract;
                         }
-                        goto do_open_and_extract;
-                }
-                /* File already exists */
-                if (overwrite == O_NEVER) {
-                        goto skip_cmpsize;
-                }
-                if (!S_ISREG(stat_buf.st_mode)) {
-                        /* File is not regular file */
-                        bb_error_msg_and_die("'%s' exists but is not a %s",
-                                dst_fn, "regular file");
+                        if (overwrite == O_NEVER) {
+                                goto skip_cmpsize;
+                        }
+                        if (!S_ISREG(mode)) {
+ fishy:
+                                bb_error_msg_and_die("'%s' exists but is not a %s",
+                                        dst_fn, "regular file");
+                        }
+                        if (overwrite == O_ALWAYS) {
+                                goto do_open_and_extract;
+                        }
+                        printf("replace %s? [y]es, [n]o, [A]ll, [N]one, [r]ename: ", dst_fn);
+                        my_fgets80(key_buf);
+                        /* User input could take a long time. Is it still a regular file? */
+                        mode = get_lstat_mode(dst_fn);
+                        if (!S_ISREG(mode))
+                                goto fishy;
                 }
-                /* File is regular file */
-                if (overwrite == O_ALWAYS)
-                        goto do_open_and_extract;
-                printf("replace %s? [y]es, [n]o, [A]ll, [N]one, [r]ename: ", dst_fn);
-                my_fgets80(key_buf);
 
+                /* Extract (or skip) it */
                 switch (key_buf[0]) {
                 case 'A':
                         overwrite = O_ALWAYS;
@@ -865,9 +928,15 @@ int unzip_main(int argc, char **argv)
  do_open_and_extract:
                         unzip_create_leading_dirs(dst_fn);
 #if ENABLE_FEATURE_UNZIP_CDF
-                        dst_fd = xopen3(dst_fn, O_WRONLY | O_CREAT | O_TRUNC, file_mode);
+                        dst_fd = -1;
+                        if (!S_ISLNK(file_mode)) {
+                                dst_fd = xopen3(dst_fn,
+                                        O_WRONLY | O_CREAT | O_TRUNC | O_NOFOLLOW,
+                                        file_mode);
+                        }
 #else
-                        dst_fd = xopen(dst_fn, O_WRONLY | O_CREAT | O_TRUNC);
+                        /* O_NOFOLLOW defends against symlink attacks */
+                        dst_fd = xopen(dst_fn, O_WRONLY | O_CREAT | O_TRUNC | O_NOFOLLOW);
 #endif
  do_extract:
                         if (!quiet) {
@@ -875,10 +944,18 @@ int unzip_main(int argc, char **argv)
                                         ? " extracting: %s\n"
                                         : */ "  inflating: %s\n", dst_fn);
                         }
-                        unzip_extract(&zip, dst_fd);
-                        if (dst_fd != STDOUT_FILENO) {
-                                /* closing STDOUT is potentially bad for future business */
-                                close(dst_fd);
+#if ENABLE_FEATURE_UNZIP_CDF
+                        if (S_ISLNK(file_mode)) {
+                                if (dst_fd != STDOUT_FILENO) /* not -p? */
+                                        unzip_extract_symlink(&zip, dst_fn);
+                        } else
+#endif
+                        {
+                                unzip_extract(&zip, dst_fd);
+                                if (dst_fd != STDOUT_FILENO) {
+                                        /* closing STDOUT is potentially bad for future business */
+                                        close(dst_fd);
+                                }
                         }
                         break;
 
@@ -906,7 +983,7 @@ int unzip_main(int argc, char **argv)
                 total_entries++;
         }
 
-        if (listing && quiet <= 1) {
+        if ((opts & OPT_l) && quiet <= 1) {
                 if (!verbose) {
                         //      "  Length      Date    Time    Name\n"
                         //      "---------  ---------- -----   ----"
diff --git a/console-tools/chvt.c b/console-tools/chvt.c
index 2b993eb62..d8152de6b 100644
--- a/console-tools/chvt.c
+++ b/console-tools/chvt.c
@@ -7,12 +7,12 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config CHVT
-//config:       bool "chvt"
+//config:       bool "chvt (2 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         This program is used to change to another terminal.
-//config:         Example: chvt 4 (change to terminal /dev/tty4)
+//config:       This program is used to change to another terminal.
+//config:       Example: chvt 4 (change to terminal /dev/tty4)
 
 //applet:IF_CHVT(APPLET(chvt, BB_DIR_USR_BIN, BB_SUID_DROP))
 
diff --git a/console-tools/clear.c b/console-tools/clear.c
index b360d34d9..13eec498b 100644
--- a/console-tools/clear.c
+++ b/console-tools/clear.c
@@ -7,10 +7,10 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config CLEAR
-//config:       bool "clear"
+//config:       bool "clear (tiny)"
 //config:       default y
 //config:       help
-//config:         This program clears the terminal screen.
+//config:       This program clears the terminal screen.
 
 //applet:IF_CLEAR(APPLET(clear, BB_DIR_USR_BIN, BB_SUID_DROP))
 
diff --git a/console-tools/deallocvt.c b/console-tools/deallocvt.c
index 37c966af3..6ffb1471e 100644
--- a/console-tools/deallocvt.c
+++ b/console-tools/deallocvt.c
@@ -8,11 +8,11 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config DEALLOCVT
-//config:       bool "deallocvt"
+//config:       bool "deallocvt (1.9 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         This program deallocates unused virtual consoles.
+//config:       This program deallocates unused virtual consoles.
 
 //applet:IF_DEALLOCVT(APPLET(deallocvt, BB_DIR_USR_BIN, BB_SUID_DROP))
 
diff --git a/console-tools/dumpkmap.c b/console-tools/dumpkmap.c
index 4a249868a..d4e2cf281 100644
--- a/console-tools/dumpkmap.c
+++ b/console-tools/dumpkmap.c
@@ -8,12 +8,12 @@
  *
  */
 //config:config DUMPKMAP
-//config:       bool "dumpkmap"
+//config:       bool "dumpkmap (1.3 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         This program dumps the kernel's keyboard translation table to
-//config:         stdout, in binary format. You can then use loadkmap to load it.
+//config:       This program dumps the kernel's keyboard translation table to
+//config:       stdout, in binary format. You can then use loadkmap to load it.
 
 //applet:IF_DUMPKMAP(APPLET(dumpkmap, BB_DIR_BIN, BB_SUID_DROP))
 
diff --git a/console-tools/fgconsole.c b/console-tools/fgconsole.c
index 019761726..64311f6ea 100644
--- a/console-tools/fgconsole.c
+++ b/console-tools/fgconsole.c
@@ -7,11 +7,11 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config FGCONSOLE
-//config:       bool "fgconsole"
+//config:       bool "fgconsole (1.6 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         This program prints active (foreground) console number.
+//config:       This program prints active (foreground) console number.
 
 //applet:IF_FGCONSOLE(APPLET(fgconsole, BB_DIR_USR_BIN, BB_SUID_DROP))
 
diff --git a/console-tools/kbd_mode.c b/console-tools/kbd_mode.c
index f1238c6b4..d81c56e92 100644
--- a/console-tools/kbd_mode.c
+++ b/console-tools/kbd_mode.c
@@ -9,11 +9,11 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config KBD_MODE
-//config:       bool "kbd_mode"
+//config:       bool "kbd_mode (4 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         This program reports and sets keyboard mode.
+//config:       This program reports and sets keyboard mode.
 
 //applet:IF_KBD_MODE(APPLET(kbd_mode, BB_DIR_BIN, BB_SUID_DROP))
 
diff --git a/console-tools/loadfont.c b/console-tools/loadfont.c
index 29f723ec0..6dc8fa831 100644
--- a/console-tools/loadfont.c
+++ b/console-tools/loadfont.c
@@ -10,33 +10,33 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config LOADFONT
-//config:       bool "loadfont"
+//config:       bool "loadfont (5.4 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         This program loads a console font from standard input.
+//config:       This program loads a console font from standard input.
 //config:
 //config:config SETFONT
-//config:       bool "setfont"
+//config:       bool "setfont (26 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         Allows to load console screen map. Useful for i18n.
+//config:       Allows to load console screen map. Useful for i18n.
 //config:
 //config:config FEATURE_SETFONT_TEXTUAL_MAP
 //config:       bool "Support reading textual screen maps"
 //config:       default y
 //config:       depends on SETFONT
 //config:       help
-//config:         Support reading textual screen maps.
+//config:       Support reading textual screen maps.
 //config:
 //config:config DEFAULT_SETFONT_DIR
 //config:       string "Default directory for console-tools files"
 //config:       default ""
 //config:       depends on SETFONT
 //config:       help
-//config:         Directory to use if setfont's params are simple filenames
-//config:         (not /path/to/file or ./file). Default is "" (no default directory).
+//config:       Directory to use if setfont's params are simple filenames
+//config:       (not /path/to/file or ./file). Default is "" (no default directory).
 //config:
 //config:comment "Common options for loadfont and setfont"
 //config:       depends on LOADFONT || SETFONT
diff --git a/console-tools/loadkmap.c b/console-tools/loadkmap.c
index 70ab55a8e..839dc2083 100644
--- a/console-tools/loadkmap.c
+++ b/console-tools/loadkmap.c
@@ -7,12 +7,12 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config LOADKMAP
-//config:       bool "loadkmap"
+//config:       bool "loadkmap (1.5 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         This program loads a keyboard translation table from
-//config:         standard input.
+//config:       This program loads a keyboard translation table from
+//config:       standard input.
 
 //applet:IF_LOADKMAP(APPLET(loadkmap, BB_DIR_SBIN, BB_SUID_DROP))
 
diff --git a/console-tools/openvt.c b/console-tools/openvt.c
index 5cbc717ec..f3db28367 100644
--- a/console-tools/openvt.c
+++ b/console-tools/openvt.c
@@ -8,12 +8,12 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config OPENVT
-//config:       bool "openvt"
+//config:       bool "openvt (7 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         This program is used to start a command on an unused
-//config:         virtual terminal.
+//config:       This program is used to start a command on an unused
+//config:       virtual terminal.
 
 //applet:IF_OPENVT(APPLET(openvt, BB_DIR_USR_BIN, BB_SUID_DROP))
 
diff --git a/console-tools/reset.c b/console-tools/reset.c
index 587c0d11a..04e5b0ca1 100644
--- a/console-tools/reset.c
+++ b/console-tools/reset.c
@@ -10,11 +10,11 @@
 /* "Standard" version of this tool is in ncurses package */
 
 //config:config RESET
-//config:       bool "reset"
+//config:       bool "reset (275 bytes)"
 //config:       default y
 //config:       help
-//config:         This program is used to reset the terminal screen, if it
-//config:         gets messed up.
+//config:       This program is used to reset the terminal screen, if it
+//config:       gets messed up.
 
 //applet:IF_RESET(APPLET(reset, BB_DIR_USR_BIN, BB_SUID_DROP))
 
diff --git a/console-tools/resize.c b/console-tools/resize.c
index 567086f09..62928a01e 100644
--- a/console-tools/resize.c
+++ b/console-tools/resize.c
@@ -7,21 +7,21 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config RESIZE
-//config:       bool "resize"
+//config:       bool "resize (756 bytes)"
 //config:       default y
 //config:       help
-//config:         This program is used to (re)set the width and height of your current
-//config:         terminal.
+//config:       This program is used to (re)set the width and height of your current
+//config:       terminal.
 //config:
 //config:config FEATURE_RESIZE_PRINT
 //config:       bool "Print environment variables"
 //config:       default y
 //config:       depends on RESIZE
 //config:       help
-//config:         Prints the newly set size (number of columns and rows) of
-//config:         the terminal.
-//config:         E.g.:
-//config:         COLUMNS=80;LINES=44;export COLUMNS LINES;
+//config:       Prints the newly set size (number of columns and rows) of
+//config:       the terminal.
+//config:       E.g.:
+//config:       COLUMNS=80;LINES=44;export COLUMNS LINES;
 
 //applet:IF_RESIZE(APPLET(resize, BB_DIR_USR_BIN, BB_SUID_DROP))
 
diff --git a/console-tools/setconsole.c b/console-tools/setconsole.c
index d47a33d59..ad0f756ca 100644
--- a/console-tools/setconsole.c
+++ b/console-tools/setconsole.c
@@ -8,12 +8,12 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config SETCONSOLE
-//config:       bool "setconsole"
+//config:       bool "setconsole (3.7 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         This program redirects the system console to another device,
-//config:         like the current tty while logged in via telnet.
+//config:       This program redirects the system console to another device,
+//config:       like the current tty while logged in via telnet.
 //config:
 //config:config FEATURE_SETCONSOLE_LONG_OPTIONS
 //config:       bool "Enable long options"
diff --git a/console-tools/setkeycodes.c b/console-tools/setkeycodes.c
index 11fc37ae9..543fbe3e0 100644
--- a/console-tools/setkeycodes.c
+++ b/console-tools/setkeycodes.c
@@ -9,12 +9,12 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config SETKEYCODES
-//config:       bool "setkeycodes"
+//config:       bool "setkeycodes (1.7 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         This program loads entries into the kernel's scancode-to-keycode
-//config:         map, allowing unusual keyboards to generate usable keycodes.
+//config:       This program loads entries into the kernel's scancode-to-keycode
+//config:       map, allowing unusual keyboards to generate usable keycodes.
 
 //applet:IF_SETKEYCODES(APPLET(setkeycodes, BB_DIR_USR_BIN, BB_SUID_DROP))
 
diff --git a/console-tools/setlogcons.c b/console-tools/setlogcons.c
index 2ea36f039..1b5814eee 100644
--- a/console-tools/setlogcons.c
+++ b/console-tools/setlogcons.c
@@ -9,11 +9,11 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config SETLOGCONS
-//config:       bool "setlogcons"
+//config:       bool "setlogcons (1.8 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         This program redirects the output console of kernel messages.
+//config:       This program redirects the output console of kernel messages.
 
 //applet:IF_SETLOGCONS(APPLET(setlogcons, BB_DIR_USR_SBIN, BB_SUID_DROP))
 
diff --git a/console-tools/showkey.c b/console-tools/showkey.c
index c2447b887..c322ce99d 100644
--- a/console-tools/showkey.c
+++ b/console-tools/showkey.c
@@ -7,11 +7,11 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config SHOWKEY
-//config:       bool "showkey"
+//config:       bool "showkey (4.7 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         Shows keys pressed.
+//config:       Shows keys pressed.
 
 //applet:IF_SHOWKEY(APPLET(showkey, BB_DIR_USR_BIN, BB_SUID_DROP))
 
diff --git a/coreutils/Config.src b/coreutils/Config.src
index 1d2fea1fb..7a8a3a634 100644
--- a/coreutils/Config.src
+++ b/coreutils/Config.src
@@ -13,9 +13,9 @@ config FEATURE_VERBOSE
         bool "Support verbose options (usually -v) for various applets"
         default y
         help
-          Enable cp -v, rm -v and similar messages.
-          Also enables long option (--verbose) if it exists.
-          Without this option, -v is accepted but ignored.
+        Enable cp -v, rm -v and similar messages.
+        Also enables long option (--verbose) if it exists.
+        Without this option, -v is accepted but ignored.
 
 comment "Common options for cp and mv"
         depends on CP || MV
@@ -25,7 +25,7 @@ config FEATURE_PRESERVE_HARDLINKS
         default y
         depends on CP || MV
         help
-          Allow cp and mv to preserve hard links.
+        Allow cp and mv to preserve hard links.
 
 comment "Common options for df, du, ls"
         depends on DF || DU || LS
@@ -35,6 +35,6 @@ config FEATURE_HUMAN_READABLE
         default y
         depends on DF || DU || LS
         help
-          Allow df, du, and ls to have human readable output.
+        Allow df, du, and ls to have human readable output.
 
 endmenu
diff --git a/coreutils/basename.c b/coreutils/basename.c
index ace0148c0..566aeebda 100644
--- a/coreutils/basename.c
+++ b/coreutils/basename.c
@@ -15,12 +15,12 @@
  * 3) Save some space by using strcmp().  Calling strncmp() here was silly.
  */
 //config:config BASENAME
-//config:       bool "basename"
+//config:       bool "basename (371 bytes)"
 //config:       default y
 //config:       help
-//config:         basename is used to strip the directory and suffix from filenames,
-//config:         leaving just the filename itself. Enable this option if you wish
-//config:         to enable the 'basename' utility.
+//config:       basename is used to strip the directory and suffix from filenames,
+//config:       leaving just the filename itself. Enable this option if you wish
+//config:       to enable the 'basename' utility.
 
 //applet:IF_BASENAME(APPLET_NOFORK(basename, basename, BB_DIR_USR_BIN, BB_SUID_DROP, basename))
 
@@ -47,25 +47,24 @@
 /* This is a NOFORK applet. Be very careful! */
 
 int basename_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int basename_main(int argc, char **argv)
+int basename_main(int argc UNUSED_PARAM, char **argv)
 {
         size_t m, n;
         char *s;
 
         if (argv[1] && strcmp(argv[1], "--") == 0) {
                 argv++;
-                argc--;
         }
-
-        if ((unsigned)(argc-2) >= 2) {
+        if (!argv[1])
                 bb_show_usage();
-        }
 
         /* It should strip slash: /abc/def/ -> def */
         s = bb_get_last_path_component_strip(*++argv);
 
         m = strlen(s);
         if (*++argv) {
+                if (argv[1])
+                        bb_show_usage();
                 n = strlen(*argv);
                 if ((m > n) && (strcmp(s+m-n, *argv) == 0)) {
                         m -= n;
diff --git a/coreutils/cat.c b/coreutils/cat.c
index a9ba68d6b..390254512 100644
--- a/coreutils/cat.c
+++ b/coreutils/cat.c
@@ -7,25 +7,25 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config CAT
-//config:       bool "cat"
+//config:       bool "cat (5.6 kb)"
 //config:       default y
 //config:       help
-//config:         cat is used to concatenate files and print them to the standard
-//config:         output. Enable this option if you wish to enable the 'cat' utility.
+//config:       cat is used to concatenate files and print them to the standard
+//config:       output. Enable this option if you wish to enable the 'cat' utility.
 //config:
 //config:config FEATURE_CATN
 //config:       bool "Enable -n and -b options"
 //config:       default y
 //config:       depends on CAT
 //config:       help
-//config:         -n numbers all output lines while -b numbers nonempty output lines.
+//config:       -n numbers all output lines while -b numbers nonempty output lines.
 //config:
 //config:config FEATURE_CATV
 //config:       bool "cat -v[etA]"
 //config:       default y
 //config:       depends on CAT
 //config:       help
-//config:         Display nonprinting characters as escape sequences
+//config:       Display nonprinting characters as escape sequences
 
 //applet:IF_CAT(APPLET(cat, BB_DIR_BIN, BB_SUID_DROP))
 
diff --git a/coreutils/chgrp.c b/coreutils/chgrp.c
index 8dca63cf7..27a0edf0d 100644
--- a/coreutils/chgrp.c
+++ b/coreutils/chgrp.c
@@ -7,10 +7,10 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config CHGRP
-//config:       bool "chgrp"
+//config:       bool "chgrp (7.2 kb)"
 //config:       default y
 //config:       help
-//config:         chgrp is used to change the group ownership of files.
+//config:       chgrp is used to change the group ownership of files.
 
 //applet:IF_CHGRP(APPLET_NOEXEC(chgrp, chgrp, BB_DIR_BIN, BB_SUID_DROP, chgrp))
 
diff --git a/coreutils/chmod.c b/coreutils/chmod.c
index 80913f542..2174334d1 100644
--- a/coreutils/chmod.c
+++ b/coreutils/chmod.c
@@ -10,10 +10,10 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config CHMOD
-//config:       bool "chmod"
+//config:       bool "chmod (5.1 kb)"
 //config:       default y
 //config:       help
-//config:         chmod is used to change the access permission of files.
+//config:       chmod is used to change the access permission of files.
 
 //applet:IF_CHMOD(APPLET_NOEXEC(chmod, chmod, BB_DIR_BIN, BB_SUID_DROP, chmod))
 
diff --git a/coreutils/chown.c b/coreutils/chown.c
index 12cd0eacc..1bfc725cc 100644
--- a/coreutils/chown.c
+++ b/coreutils/chown.c
@@ -7,11 +7,11 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config CHOWN
-//config:       bool "chown"
+//config:       bool "chown (7.2 kb)"
 //config:       default y
 //config:       help
-//config:         chown is used to change the user and/or group ownership
-//config:         of files.
+//config:       chown is used to change the user and/or group ownership
+//config:       of files.
 //config:
 //config:config FEATURE_CHOWN_LONG_OPTIONS
 //config:       bool "Enable long options"
diff --git a/coreutils/chroot.c b/coreutils/chroot.c
index 5c067c1bd..44a587fe0 100644
--- a/coreutils/chroot.c
+++ b/coreutils/chroot.c
@@ -7,11 +7,11 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config CHROOT
-//config:       bool "chroot"
+//config:       bool "chroot (3.7 kb)"
 //config:       default y
 //config:       help
-//config:         chroot is used to change the root directory and run a command.
-//config:         The default command is `/bin/sh'.
+//config:       chroot is used to change the root directory and run a command.
+//config:       The default command is `/bin/sh'.
 
 //applet:IF_CHROOT(APPLET(chroot, BB_DIR_USR_SBIN, BB_SUID_DROP))
 
diff --git a/coreutils/cksum.c b/coreutils/cksum.c
index 9034fc19a..c0cf65d2a 100644
--- a/coreutils/cksum.c
+++ b/coreutils/cksum.c
@@ -7,10 +7,10 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config CKSUM
-//config:       bool "cksum"
+//config:       bool "cksum (4.2 kb)"
 //config:       default y
 //config:       help
-//config:         cksum is used to calculate the CRC32 checksum of a file.
+//config:       cksum is used to calculate the CRC32 checksum of a file.
 
 //applet:IF_CKSUM(APPLET_NOEXEC(cksum, cksum, BB_DIR_USR_BIN, BB_SUID_DROP, cksum))
 
diff --git a/coreutils/comm.c b/coreutils/comm.c
index b6a127809..5be11468c 100644
--- a/coreutils/comm.c
+++ b/coreutils/comm.c
@@ -7,11 +7,11 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config COMM
-//config:       bool "comm"
+//config:       bool "comm (3.9 kb)"
 //config:       default y
 //config:       help
-//config:         comm is used to compare two files line by line and return
-//config:         a three-column output.
+//config:       comm is used to compare two files line by line and return
+//config:       a three-column output.
 
 //applet:IF_COMM(APPLET(comm, BB_DIR_USR_BIN, BB_SUID_DROP))
 
diff --git a/coreutils/cp.c b/coreutils/cp.c
index 1e5f36d10..092e39583 100644
--- a/coreutils/cp.c
+++ b/coreutils/cp.c
@@ -12,18 +12,18 @@
  * Size reduction.
  */
 //config:config CP
-//config:       bool "cp"
+//config:       bool "cp (9.7 kb)"
 //config:       default y
 //config:       help
-//config:         cp is used to copy files and directories.
+//config:       cp is used to copy files and directories.
 //config:
 //config:config FEATURE_CP_LONG_OPTIONS
 //config:       bool "Enable long options"
 //config:       default y
 //config:       depends on CP && LONG_OPTS
 //config:       help
-//config:         Enable long options.
-//config:         Also add support for --parents option.
+//config:       Enable long options.
+//config:       Also add support for --parents option.
 
 //applet:IF_CP(APPLET_NOEXEC(cp, cp, BB_DIR_BIN, BB_SUID_DROP, cp))
 
diff --git a/coreutils/cut.c b/coreutils/cut.c
index a33a825f8..6578ce8ce 100644
--- a/coreutils/cut.c
+++ b/coreutils/cut.c
@@ -9,11 +9,11 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config CUT
-//config:       bool "cut"
+//config:       bool "cut (5.3 kb)"
 //config:       default y
 //config:       help
-//config:         cut is used to print selected parts of lines from
-//config:         each file to stdout.
+//config:       cut is used to print selected parts of lines from
+//config:       each file to stdout.
 
 //applet:IF_CUT(APPLET_NOEXEC(cut, cut, BB_DIR_USR_BIN, BB_SUID_DROP, cut))
 
diff --git a/coreutils/date.c b/coreutils/date.c
index 9d4a7dfea..0fb9f1f00 100644
--- a/coreutils/date.c
+++ b/coreutils/date.c
@@ -19,19 +19,19 @@
    much as possible, missed out a lot of bounds checking */
 
 //config:config DATE
-//config:       bool "date"
+//config:       bool "date (7.1 kb)"
 //config:       default y
 //config:       help
-//config:         date is used to set the system date or display the
-//config:         current time in the given format.
+//config:       date is used to set the system date or display the
+//config:       current time in the given format.
 //config:
 //config:config FEATURE_DATE_ISOFMT
 //config:       bool "Enable ISO date format output (-I)"
 //config:       default y
 //config:       depends on DATE
 //config:       help
-//config:         Enable option (-I) to output an ISO-8601 compliant
-//config:         date/time string.
+//config:       Enable option (-I) to output an ISO-8601 compliant
+//config:       date/time string.
 //config:
 //config:# defaults to "no": stat's nanosecond field is a bit non-portable
 //config:config FEATURE_DATE_NANO
@@ -40,23 +40,23 @@
 //config:       depends on DATE  # syscall(__NR_clock_gettime)
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         Support %[num]N format specifier. Adds ~250 bytes of code.
+//config:       Support %[num]N format specifier. Adds ~250 bytes of code.
 //config:
 //config:config FEATURE_DATE_COMPAT
 //config:       bool "Support weird 'date MMDDhhmm[[YY]YY][.ss]' format"
 //config:       default y
 //config:       depends on DATE
 //config:       help
-//config:         System time can be set by 'date -s DATE' and simply 'date DATE',
-//config:         but formats of DATE string are different. 'date DATE' accepts
-//config:         a rather weird MMDDhhmm[[YY]YY][.ss] format with completely
-//config:         unnatural placement of year between minutes and seconds.
-//config:         date -s (and other commands like touch -d) use more sensible
-//config:         formats (for one, ISO format YYYY-MM-DD hh:mm:ss.ssssss).
+//config:       System time can be set by 'date -s DATE' and simply 'date DATE',
+//config:       but formats of DATE string are different. 'date DATE' accepts
+//config:       a rather weird MMDDhhmm[[YY]YY][.ss] format with completely
+//config:       unnatural placement of year between minutes and seconds.
+//config:       date -s (and other commands like touch -d) use more sensible
+//config:       formats (for one, ISO format YYYY-MM-DD hh:mm:ss.ssssss).
 //config:
-//config:         With this option off, 'date DATE' is 'date -s DATE' support
-//config:         the same format. With it on, 'date DATE' additionally supports
-//config:         MMDDhhmm[[YY]YY][.ss] format.
+//config:       With this option off, 'date DATE' is 'date -s DATE' support
+//config:       the same format. With it on, 'date DATE' additionally supports
+//config:       MMDDhhmm[[YY]YY][.ss] format.
 
 //applet:IF_DATE(APPLET(date, BB_DIR_BIN, BB_SUID_DROP))
 
diff --git a/coreutils/dd.c b/coreutils/dd.c
index b37615313..f7f1c9564 100644
--- a/coreutils/dd.c
+++ b/coreutils/dd.c
@@ -7,49 +7,49 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config DD
-//config:       bool "dd"
+//config:       bool "dd (7.1 kb)"
 //config:       default y
 //config:       help
-//config:         dd copies a file (from standard input to standard output,
-//config:         by default) using specific input and output blocksizes,
-//config:         while optionally performing conversions on it.
+//config:       dd copies a file (from standard input to standard output,
+//config:       by default) using specific input and output blocksizes,
+//config:       while optionally performing conversions on it.
 //config:
 //config:config FEATURE_DD_SIGNAL_HANDLING
 //config:       bool "Enable signal handling for status reporting"
 //config:       default y
 //config:       depends on DD
 //config:       help
-//config:         Sending a SIGUSR1 signal to a running `dd' process makes it
-//config:         print to standard error the number of records read and written
-//config:         so far, then to resume copying.
+//config:       Sending a SIGUSR1 signal to a running `dd' process makes it
+//config:       print to standard error the number of records read and written
+//config:       so far, then to resume copying.
 //config:
-//config:         $ dd if=/dev/zero of=/dev/null &
-//config:         $ pid=$!; kill -USR1 $pid; sleep 1; kill $pid
-//config:         10899206+0 records in
-//config:         10899206+0 records out
+//config:       $ dd if=/dev/zero of=/dev/null &
+//config:       $ pid=$!; kill -USR1 $pid; sleep 1; kill $pid
+//config:       10899206+0 records in
+//config:       10899206+0 records out
 //config:
 //config:config FEATURE_DD_THIRD_STATUS_LINE
 //config:       bool "Enable the third status line upon signal"
 //config:       default y
 //config:       depends on DD && FEATURE_DD_SIGNAL_HANDLING
 //config:       help
-//config:         Displays a coreutils-like third status line with transferred bytes,
-//config:         elapsed time and speed.
+//config:       Displays a coreutils-like third status line with transferred bytes,
+//config:       elapsed time and speed.
 //config:
 //config:config FEATURE_DD_IBS_OBS
 //config:       bool "Enable ibs, obs and conv options"
 //config:       default y
 //config:       depends on DD
 //config:       help
-//config:         Enable support for writing a certain number of bytes in and out,
-//config:         at a time, and performing conversions on the data stream.
+//config:       Enable support for writing a certain number of bytes in and out,
+//config:       at a time, and performing conversions on the data stream.
 //config:
 //config:config FEATURE_DD_STATUS
 //config:       bool "Enable status display options"
 //config:       default y
 //config:       depends on DD
 //config:       help
-//config:         Enable support for status=noxfer/none option.
+//config:       Enable support for status=noxfer/none option.
 
 //applet:IF_DD(APPLET_NOEXEC(dd, dd, BB_DIR_BIN, BB_SUID_DROP, dd))
 
diff --git a/coreutils/df.c b/coreutils/df.c
index cf367161a..27dd2b5a8 100644
--- a/coreutils/df.c
+++ b/coreutils/df.c
@@ -18,20 +18,20 @@
  * Implement -P and -B; better coreutils compat; cleanup
  */
 //config:config DF
-//config:       bool "df"
+//config:       bool "df (7.5 kb)"
 //config:       default y
 //config:       help
-//config:         df reports the amount of disk space used and available
-//config:         on filesystems.
+//config:       df reports the amount of disk space used and available
+//config:       on filesystems.
 //config:
 //config:config FEATURE_DF_FANCY
 //config:       bool "Enable -a, -i, -B"
 //config:       default y
 //config:       depends on DF
 //config:       help
-//config:         -a Show all filesystems
-//config:         -i Inodes
-//config:         -B <SIZE> Blocksize
+//config:       -a Show all filesystems
+//config:       -i Inodes
+//config:       -B <SIZE> Blocksize
 
 //applet:IF_DF(APPLET(df, BB_DIR_BIN, BB_SUID_DROP))
 
diff --git a/coreutils/dirname.c b/coreutils/dirname.c
index 659381886..511267b78 100644
--- a/coreutils/dirname.c
+++ b/coreutils/dirname.c
@@ -7,11 +7,11 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config DIRNAME
-//config:       bool "dirname"
+//config:       bool "dirname (289 bytes)"
 //config:       default y
 //config:       help
-//config:         dirname is used to strip a non-directory suffix from
-//config:         a file name.
+//config:       dirname is used to strip a non-directory suffix from
+//config:       a file name.
 
 //applet:IF_DIRNAME(APPLET_NOFORK(dirname, dirname, BB_DIR_USR_BIN, BB_SUID_DROP, dirname))
 
diff --git a/coreutils/dos2unix.c b/coreutils/dos2unix.c
index 9d81ccca6..a3d008051 100644
--- a/coreutils/dos2unix.c
+++ b/coreutils/dos2unix.c
@@ -12,18 +12,18 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config DOS2UNIX
-//config:       bool "dos2unix"
+//config:       bool "dos2unix (5.1 kb)"
 //config:       default y
 //config:       help
-//config:         dos2unix is used to convert a text file from DOS format to
-//config:         UNIX format, and vice versa.
+//config:       dos2unix is used to convert a text file from DOS format to
+//config:       UNIX format, and vice versa.
 //config:
 //config:config UNIX2DOS
-//config:       bool "unix2dos"
+//config:       bool "unix2dos (5.1 kb)"
 //config:       default y
 //config:       help
-//config:         unix2dos is used to convert a text file from UNIX format to
-//config:         DOS format, and vice versa.
+//config:       unix2dos is used to convert a text file from UNIX format to
+//config:       DOS format, and vice versa.
 
 //applet:IF_DOS2UNIX(APPLET_NOEXEC(dos2unix, dos2unix, BB_DIR_USR_BIN, BB_SUID_DROP, dos2unix))
 //applet:IF_UNIX2DOS(APPLET_NOEXEC(unix2dos, dos2unix, BB_DIR_USR_BIN, BB_SUID_DROP, unix2dos))
diff --git a/coreutils/du.c b/coreutils/du.c
index 03e31a0e4..947c46e74 100644
--- a/coreutils/du.c
+++ b/coreutils/du.c
@@ -22,15 +22,15 @@
 //config:       bool "du (default blocksize of 512 bytes)"
 //config:       default y
 //config:       help
-//config:         du is used to report the amount of disk space used
-//config:         for specified files.
+//config:       du is used to report the amount of disk space used
+//config:       for specified files.
 //config:
 //config:config FEATURE_DU_DEFAULT_BLOCKSIZE_1K
 //config:       bool "Use a default blocksize of 1024 bytes (1K)"
 //config:       default y
 //config:       depends on DU
 //config:       help
-//config:         Use a blocksize of (1K) instead of the default 512b.
+//config:       Use a blocksize of (1K) instead of the default 512b.
 
 //applet:IF_DU(APPLET(du, BB_DIR_USR_BIN, BB_SUID_DROP))
 
diff --git a/coreutils/echo.c b/coreutils/echo.c
index a7e4ca9ac..af33319a1 100644
--- a/coreutils/echo.c
+++ b/coreutils/echo.c
@@ -22,7 +22,7 @@
 //config:       bool "echo (basic SuSv3 version taking no options)"
 //config:       default y
 //config:       help
-//config:         echo is used to print a specified string to stdout.
+//config:       echo is used to print a specified string to stdout.
 //config:
 //config:# this entry also appears in shell/Config.in, next to the echo builtin
 //config:config FEATURE_FANCY_ECHO
diff --git a/coreutils/env.c b/coreutils/env.c
index 2bd5f41d0..8def9c2da 100644
--- a/coreutils/env.c
+++ b/coreutils/env.c
@@ -24,12 +24,12 @@
  * - use xfunc_error_retval
  */
 //config:config ENV
-//config:       bool "env"
+//config:       bool "env (3.8 kb)"
 //config:       default y
 //config:       help
-//config:         env is used to set an environment variable and run
-//config:         a command; without options it displays the current
-//config:         environment.
+//config:       env is used to set an environment variable and run
+//config:       a command; without options it displays the current
+//config:       environment.
 //config:
 //config:config FEATURE_ENV_LONG_OPTIONS
 //config:       bool "Enable long options"
diff --git a/coreutils/expand.c b/coreutils/expand.c
index 9ce86ebff..64f2a539d 100644
--- a/coreutils/expand.c
+++ b/coreutils/expand.c
@@ -21,10 +21,10 @@
  *  Caveat: this versions of expand and unexpand don't accept tab lists.
  */
 //config:config EXPAND
-//config:       bool "expand"
+//config:       bool "expand (5.8 kb)"
 //config:       default y
 //config:       help
-//config:         By default, convert all tabs to spaces.
+//config:       By default, convert all tabs to spaces.
 //config:
 //config:config FEATURE_EXPAND_LONG_OPTIONS
 //config:       bool "Enable long options"
@@ -32,10 +32,10 @@
 //config:       depends on EXPAND && LONG_OPTS
 //config:
 //config:config UNEXPAND
-//config:       bool "unexpand"
+//config:       bool "unexpand (6 kb)"
 //config:       default y
 //config:       help
-//config:         By default, convert only leading sequences of blanks to tabs.
+//config:       By default, convert only leading sequences of blanks to tabs.
 //config:
 //config:config FEATURE_UNEXPAND_LONG_OPTIONS
 //config:       bool "Enable long options"
diff --git a/coreutils/expr.c b/coreutils/expr.c
index 639d29a55..0cf2b9bd9 100644
--- a/coreutils/expr.c
+++ b/coreutils/expr.c
@@ -23,20 +23,20 @@
  * provided they all associate ((x op x) op x).
  */
 //config:config EXPR
-//config:       bool "expr"
+//config:       bool "expr (6.1 kb)"
 //config:       default y
 //config:       help
-//config:         expr is used to calculate numbers and print the result
-//config:         to standard output.
+//config:       expr is used to calculate numbers and print the result
+//config:       to standard output.
 //config:
 //config:config EXPR_MATH_SUPPORT_64
 //config:       bool "Extend Posix numbers support to 64 bit"
 //config:       default y
 //config:       depends on EXPR
 //config:       help
-//config:         Enable 64-bit math support in the expr applet. This will make
-//config:         the applet slightly larger, but will allow computation with very
-//config:         large numbers.
+//config:       Enable 64-bit math support in the expr applet. This will make
+//config:       the applet slightly larger, but will allow computation with very
+//config:       large numbers.
 
 //applet:IF_EXPR(APPLET(expr, BB_DIR_USR_BIN, BB_SUID_DROP))
 
diff --git a/coreutils/factor.c b/coreutils/factor.c
index 8782d3d1e..ee3943a4a 100644
--- a/coreutils/factor.c
+++ b/coreutils/factor.c
@@ -4,10 +4,10 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config FACTOR
-//config:       bool "factor"
+//config:       bool "factor (2.6 kb)"
 //config:       default y
 //config:       help
-//config:         factor factorizes integers
+//config:       factor factorizes integers
 
 //applet:IF_FACTOR(APPLET(factor, BB_DIR_USR_BIN, BB_SUID_DROP))
 
diff --git a/coreutils/false.c b/coreutils/false.c
index b8f17c6a6..e3903efd0 100644
--- a/coreutils/false.c
+++ b/coreutils/false.c
@@ -7,10 +7,10 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config FALSE
-//config:       bool "false"
+//config:       bool "false (tiny)"
 //config:       default y
 //config:       help
-//config:         false returns an exit code of FALSE (1).
+//config:       false returns an exit code of FALSE (1).
 
 //applet:IF_FALSE(APPLET_NOFORK(false, false, BB_DIR_BIN, BB_SUID_DROP, false))
 
diff --git a/coreutils/fold.c b/coreutils/fold.c
index 01f9bce74..286db228d 100644
--- a/coreutils/fold.c
+++ b/coreutils/fold.c
@@ -10,10 +10,10 @@
    Licensed under GPLv2 or later, see file LICENSE in this source tree.
 */
 //config:config FOLD
-//config:       bool "fold"
+//config:       bool "fold (4.6 kb)"
 //config:       default y
 //config:       help
-//config:         Wrap text to fit a specific width.
+//config:       Wrap text to fit a specific width.
 
 //applet:IF_FOLD(APPLET_NOEXEC(fold, fold, BB_DIR_USR_BIN, BB_SUID_DROP, fold))
 
diff --git a/coreutils/fsync.c b/coreutils/fsync.c
index 596a2bcaf..5e77e2c16 100644
--- a/coreutils/fsync.c
+++ b/coreutils/fsync.c
@@ -7,10 +7,10 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config FSYNC
-//config:       bool "fsync"
+//config:       bool "fsync (3.7 kb)"
 //config:       default y
 //config:       help
-//config:         fsync is used to flush file-related cached blocks to disk.
+//config:       fsync is used to flush file-related cached blocks to disk.
 
 //applet:IF_FSYNC(APPLET_NOFORK(fsync, fsync, BB_DIR_BIN, BB_SUID_DROP, fsync))
 
diff --git a/coreutils/head.c b/coreutils/head.c
index d49113e7f..fc3a48d5b 100644
--- a/coreutils/head.c
+++ b/coreutils/head.c
@@ -7,11 +7,11 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config HEAD
-//config:       bool "head"
+//config:       bool "head (3.7 kb)"
 //config:       default y
 //config:       help
-//config:         head is used to print the first specified number of lines
-//config:         from files.
+//config:       head is used to print the first specified number of lines
+//config:       from files.
 //config:
 //config:config FEATURE_FANCY_HEAD
 //config:       bool "Enable -c, -q, and -v"
diff --git a/coreutils/hostid.c b/coreutils/hostid.c
index 5b47de1bc..d21e6d6ac 100644
--- a/coreutils/hostid.c
+++ b/coreutils/hostid.c
@@ -7,11 +7,11 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config HOSTID
-//config:       bool "hostid"
+//config:       bool "hostid (247 bytes)"
 //config:       default y
 //config:       help
-//config:         hostid prints the numeric identifier (in hexadecimal) for
-//config:         the current host.
+//config:       hostid prints the numeric identifier (in hexadecimal) for
+//config:       the current host.
 
 //applet:IF_HOSTID(APPLET_NOFORK(hostid, hostid, BB_DIR_USR_BIN, BB_SUID_DROP, hostid))
 
diff --git a/coreutils/id.c b/coreutils/id.c
index ab7ac1e55..6043bca61 100644
--- a/coreutils/id.c
+++ b/coreutils/id.c
@@ -13,16 +13,16 @@
  * Added -G option Tito Ragusa (C) 2008 for SUSv3.
  */
 //config:config ID
-//config:       bool "id"
+//config:       bool "id (6.7 kb)"
 //config:       default y
 //config:       help
-//config:         id displays the current user and group ID names.
+//config:       id displays the current user and group ID names.
 //config:
 //config:config GROUPS
-//config:       bool "groups"
+//config:       bool "groups (6.5 kb)"
 //config:       default y
 //config:       help
-//config:         Print the group names associated with current user id.
+//config:       Print the group names associated with current user id.
 
 //applet:IF_GROUPS(APPLET_NOEXEC(groups, id, BB_DIR_USR_BIN, BB_SUID_DROP, groups))
 //applet:IF_ID(    APPLET_NOEXEC(id,     id, BB_DIR_USR_BIN, BB_SUID_DROP, id    ))
diff --git a/coreutils/install.c b/coreutils/install.c
index 2a642bdb6..a1342bb13 100644
--- a/coreutils/install.c
+++ b/coreutils/install.c
@@ -6,10 +6,10 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config INSTALL
-//config:       bool "install"
+//config:       bool "install (12 kb)"
 //config:       default y
 //config:       help
-//config:         Copy files and set attributes.
+//config:       Copy files and set attributes.
 //config:
 //config:config FEATURE_INSTALL_LONG_OPTIONS
 //config:       bool "Enable long options"
diff --git a/coreutils/link.c b/coreutils/link.c
index ac3ef85d9..56832fdf6 100644
--- a/coreutils/link.c
+++ b/coreutils/link.c
@@ -6,10 +6,10 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config LINK
-//config:       bool "link"
+//config:       bool "link (3.1 kb)"
 //config:       default y
 //config:       help
-//config:         link creates hard links between files.
+//config:       link creates hard links between files.
 
 //applet:IF_LINK(APPLET_NOFORK(link, link, BB_DIR_BIN, BB_SUID_DROP, link))
 
diff --git a/coreutils/ln.c b/coreutils/ln.c
index 0e2abace4..fed96af42 100644
--- a/coreutils/ln.c
+++ b/coreutils/ln.c
@@ -7,10 +7,10 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config LN
-//config:       bool "ln"
+//config:       bool "ln (4.5 kb)"
 //config:       default y
 //config:       help
-//config:         ln is used to create hard or soft links between files.
+//config:       ln is used to create hard or soft links between files.
 
 //applet:IF_LN(APPLET_NOEXEC(ln, ln, BB_DIR_BIN, BB_SUID_DROP, ln))
 
diff --git a/coreutils/logname.c b/coreutils/logname.c
index a9b1c956d..e614ca7cf 100644
--- a/coreutils/logname.c
+++ b/coreutils/logname.c
@@ -16,10 +16,10 @@
  * a diagnostic message and an error return.
  */
 //config:config LOGNAME
-//config:       bool "logname"
+//config:       bool "logname (894 bytes)"
 //config:       default y
 //config:       help
-//config:         logname is used to print the current user's login name.
+//config:       logname is used to print the current user's login name.
 
 //applet:IF_LOGNAME(APPLET_NOFORK(logname, logname, BB_DIR_USR_BIN, BB_SUID_DROP, logname))
 
diff --git a/coreutils/ls.c b/coreutils/ls.c
index 61b4409a7..4c0944bb0 100644
--- a/coreutils/ls.c
+++ b/coreutils/ls.c
@@ -28,10 +28,10 @@
  * ls sorts listing now, and supports almost all options.
  */
 //config:config LS
-//config:       bool "ls"
+//config:       bool "ls (14 kb)"
 //config:       default y
 //config:       help
-//config:         ls is used to list the contents of directories.
+//config:       ls is used to list the contents of directories.
 //config:
 //config:config FEATURE_LS_FILETYPES
 //config:       bool "Enable filetyping options (-p and -F)"
@@ -58,39 +58,39 @@
 //config:       default y
 //config:       depends on LS
 //config:       help
-//config:         Allow ls to sort file names alphabetically.
+//config:       Allow ls to sort file names alphabetically.
 //config:
 //config:config FEATURE_LS_TIMESTAMPS
 //config:       bool "Show file timestamps"
 //config:       default y
 //config:       depends on LS
 //config:       help
-//config:         Allow ls to display timestamps for files.
+//config:       Allow ls to display timestamps for files.
 //config:
 //config:config FEATURE_LS_USERNAME
 //config:       bool "Show username/groupnames"
 //config:       default y
 //config:       depends on LS
 //config:       help
-//config:         Allow ls to display username/groupname for files.
+//config:       Allow ls to display username/groupname for files.
 //config:
 //config:config FEATURE_LS_COLOR
 //config:       bool "Allow use of color to identify file types"
 //config:       default y
 //config:       depends on LS && LONG_OPTS
 //config:       help
-//config:         This enables the --color option to ls.
+//config:       This enables the --color option to ls.
 //config:
 //config:config FEATURE_LS_COLOR_IS_DEFAULT
 //config:       bool "Produce colored ls output by default"
 //config:       default y
 //config:       depends on FEATURE_LS_COLOR
 //config:       help
-//config:         Saying yes here will turn coloring on by default,
-//config:         even if no "--color" option is given to the ls command.
-//config:         This is not recommended, since the colors are not
-//config:         configurable, and the output may not be legible on
-//config:         many output screens.
+//config:       Saying yes here will turn coloring on by default,
+//config:       even if no "--color" option is given to the ls command.
+//config:       This is not recommended, since the colors are not
+//config:       configurable, and the output may not be legible on
+//config:       many output screens.
 
 //applet:IF_LS(APPLET_NOEXEC(ls, ls, BB_DIR_BIN, BB_SUID_DROP, ls))
 
diff --git a/coreutils/md5_sha1_sum.c b/coreutils/md5_sha1_sum.c
index 50111bd26..bcccdd64f 100644
--- a/coreutils/md5_sha1_sum.c
+++ b/coreutils/md5_sha1_sum.c
@@ -6,34 +6,34 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config MD5SUM
-//config:       bool "md5sum"
+//config:       bool "md5sum (6.8 kb)"
 //config:       default y
 //config:       help
-//config:         md5sum is used to print or check MD5 checksums.
+//config:       md5sum is used to print or check MD5 checksums.
 //config:
 //config:config SHA1SUM
-//config:       bool "sha1sum"
+//config:       bool "sha1sum (6 kb)"
 //config:       default y
 //config:       help
-//config:         Compute and check SHA1 message digest
+//config:       Compute and check SHA1 message digest
 //config:
 //config:config SHA256SUM
-//config:       bool "sha256sum"
+//config:       bool "sha256sum (7.1 kb)"
 //config:       default y
 //config:       help
-//config:         Compute and check SHA256 message digest
+//config:       Compute and check SHA256 message digest
 //config:
 //config:config SHA512SUM
-//config:       bool "sha512sum"
+//config:       bool "sha512sum (7.6 kb)"
 //config:       default y
 //config:       help
-//config:         Compute and check SHA512 message digest
+//config:       Compute and check SHA512 message digest
 //config:
 //config:config SHA3SUM
-//config:       bool "sha3sum"
+//config:       bool "sha3sum (6.3 kb)"
 //config:       default y
 //config:       help
-//config:         Compute and check SHA3 message digest
+//config:       Compute and check SHA3 message digest
 //config:
 //config:comment "Common options for md5sum, sha1sum, sha256sum, sha512sum, sha3sum"
 //config:       depends on MD5SUM || SHA1SUM || SHA256SUM || SHA512SUM || SHA3SUM
@@ -43,9 +43,9 @@
 //config:       default y
 //config:       depends on MD5SUM || SHA1SUM || SHA256SUM || SHA512SUM || SHA3SUM
 //config:       help
-//config:         Enabling the -c options allows files to be checked
-//config:         against pre-calculated hash values.
-//config:         -s and -w are useful options when verifying checksums.
+//config:       Enabling the -c options allows files to be checked
+//config:       against pre-calculated hash values.
+//config:       -s and -w are useful options when verifying checksums.
 
 //applet:IF_MD5SUM(APPLET_NOEXEC(md5sum, md5_sha1_sum, BB_DIR_USR_BIN, BB_SUID_DROP, md5sum))
 //applet:IF_SHA1SUM(APPLET_NOEXEC(sha1sum, md5_sha1_sum, BB_DIR_USR_BIN, BB_SUID_DROP, sha1sum))
diff --git a/coreutils/mkdir.c b/coreutils/mkdir.c
index fcc34f1ad..22851187c 100644
--- a/coreutils/mkdir.c
+++ b/coreutils/mkdir.c
@@ -14,10 +14,10 @@
 /* Nov 28, 2006      Yoshinori Sato <ysato@users.sourceforge.jp>: Add SELinux Support.
  */
 //config:config MKDIR
-//config:       bool "mkdir"
+//config:       bool "mkdir (4.4 kb)"
 //config:       default y
 //config:       help
-//config:         mkdir is used to create directories with the specified names.
+//config:       mkdir is used to create directories with the specified names.
 //config:
 //config:config FEATURE_MKDIR_LONG_OPTIONS
 //config:       bool "Enable long options"
diff --git a/coreutils/mkfifo.c b/coreutils/mkfifo.c
index 66509a9c0..0f614017e 100644
--- a/coreutils/mkfifo.c
+++ b/coreutils/mkfifo.c
@@ -7,11 +7,11 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config MKFIFO
-//config:       bool "mkfifo"
+//config:       bool "mkfifo (3.7 kb)"
 //config:       default y
 //config:       help
-//config:         mkfifo is used to create FIFOs (named pipes).
-//config:         The 'mknod' program can also create FIFOs.
+//config:       mkfifo is used to create FIFOs (named pipes).
+//config:       The 'mknod' program can also create FIFOs.
 
 //applet:IF_MKFIFO(APPLET_NOEXEC(mkfifo, mkfifo, BB_DIR_USR_BIN, BB_SUID_DROP, mkfifo))
 
diff --git a/coreutils/mknod.c b/coreutils/mknod.c
index 466ef5c06..565b33d20 100644
--- a/coreutils/mknod.c
+++ b/coreutils/mknod.c
@@ -7,11 +7,11 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config MKNOD
-//config:       bool "mknod"
+//config:       bool "mknod (4 kb)"
 //config:       default y
 //config:       help
-//config:         mknod is used to create FIFOs or block/character special
-//config:         files with the specified names.
+//config:       mknod is used to create FIFOs or block/character special
+//config:       files with the specified names.
 
 //applet:IF_MKNOD(APPLET_NOEXEC(mknod, mknod, BB_DIR_BIN, BB_SUID_DROP, mknod))
 
diff --git a/coreutils/mktemp.c b/coreutils/mktemp.c
index 65353697a..bfef0b4a6 100644
--- a/coreutils/mktemp.c
+++ b/coreutils/mktemp.c
@@ -31,10 +31,10 @@
  *        -p; else /tmp [deprecated]
  */
 //config:config MKTEMP
-//config:       bool "mktemp"
+//config:       bool "mktemp (4 kb)"
 //config:       default y
 //config:       help
-//config:         mktemp is used to create unique temporary files
+//config:       mktemp is used to create unique temporary files
 
 //applet:IF_MKTEMP(APPLET(mktemp, BB_DIR_BIN, BB_SUID_DROP))
 
diff --git a/coreutils/mv.c b/coreutils/mv.c
index df2ef0a52..147dd3bb2 100644
--- a/coreutils/mv.c
+++ b/coreutils/mv.c
@@ -12,10 +12,10 @@
  * Size reduction and improved error checking.
  */
 //config:config MV
-//config:       bool "mv"
+//config:       bool "mv (9.8 kb)"
 //config:       default y
 //config:       help
-//config:         mv is used to move or rename files or directories.
+//config:       mv is used to move or rename files or directories.
 //config:
 //config:config FEATURE_MV_LONG_OPTIONS
 //config:       bool "Enable long options"
diff --git a/coreutils/nice.c b/coreutils/nice.c
index 3676ee663..0bf055299 100644
--- a/coreutils/nice.c
+++ b/coreutils/nice.c
@@ -7,10 +7,10 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config NICE
-//config:       bool "nice"
+//config:       bool "nice (1.8 kb)"
 //config:       default y
 //config:       help
-//config:         nice runs a program with modified scheduling priority.
+//config:       nice runs a program with modified scheduling priority.
 
 //applet:IF_NICE(APPLET(nice, BB_DIR_BIN, BB_SUID_DROP))
 
diff --git a/coreutils/nl.c b/coreutils/nl.c
index dc468a90b..93e78c490 100644
--- a/coreutils/nl.c
+++ b/coreutils/nl.c
@@ -5,10 +5,10 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config NL
-//config:       bool "nl"
+//config:       bool "nl (4.3 kb)"
 //config:       default y
 //config:       help
-//config:         nl is used to number lines of files.
+//config:       nl is used to number lines of files.
 
 //applet:IF_NL(APPLET(nl, BB_DIR_USR_BIN, BB_SUID_DROP))
 
diff --git a/coreutils/nohup.c b/coreutils/nohup.c
index d8489686d..8e28f9029 100644
--- a/coreutils/nohup.c
+++ b/coreutils/nohup.c
@@ -10,10 +10,10 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config NOHUP
-//config:       bool "nohup"
+//config:       bool "nohup (2 kb)"
 //config:       default y
 //config:       help
-//config:         run a command immune to hangups, with output to a non-tty.
+//config:       run a command immune to hangups, with output to a non-tty.
 
 //applet:IF_NOHUP(APPLET(nohup, BB_DIR_USR_BIN, BB_SUID_DROP))
 
diff --git a/coreutils/nproc.c b/coreutils/nproc.c
index d7c6a4ba1..68a831865 100644
--- a/coreutils/nproc.c
+++ b/coreutils/nproc.c
@@ -4,10 +4,10 @@
  * Licensed under GPLv2, see LICENSE in this source tree
  */
 //config:config NPROC
-//config:       bool "nproc"
+//config:       bool "nproc (248 bytes)"
 //config:       default y
 //config:       help
-//config:         Print number of CPUs
+//config:       Print number of CPUs
 
 //applet:IF_NPROC(APPLET(nproc, BB_DIR_USR_BIN, BB_SUID_DROP))
 
diff --git a/coreutils/od.c b/coreutils/od.c
index 4b05ee77c..e3a68435b 100644
--- a/coreutils/od.c
+++ b/coreutils/od.c
@@ -11,10 +11,10 @@
  * Original copyright notice is retained at the end of this file.
  */
 //config:config OD
-//config:       bool "od"
+//config:       bool "od (11 kb)"
 //config:       default y
 //config:       help
-//config:         od is used to dump binary files in octal and other formats.
+//config:       od is used to dump binary files in octal and other formats.
 
 //applet:IF_OD(APPLET(od, BB_DIR_USR_BIN, BB_SUID_DROP))
 
diff --git a/coreutils/od_bloaty.c b/coreutils/od_bloaty.c
index b02fb09bd..513c8ef37 100644
--- a/coreutils/od_bloaty.c
+++ b/coreutils/od_bloaty.c
@@ -672,7 +672,7 @@ decode_one_format(const char *s_orig, const char *s, struct tspec *tspec)
                 fmt = FLOATING_POINT;
                 ++s;
                 p = strchr(FDL, *s);
-                if (!p) {
+                if (!p || *p == '\0') {
                         size = sizeof(double);
                         if (isdigit(s[0])) {
                                 size = bb_strtou(s, &end, 0);
@@ -693,6 +693,7 @@ decode_one_format(const char *s_orig, const char *s, struct tspec *tspec)
                         };
 
                         size = FDL_sizeof[p - FDL];
+                        s++; /* skip F/D/L */
                 }
 
                 size_spec = fp_type_size[size];
diff --git a/coreutils/paste.c b/coreutils/paste.c
index 3920859d6..52f67f951 100644
--- a/coreutils/paste.c
+++ b/coreutils/paste.c
@@ -7,11 +7,11 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config PASTE
-//config:       bool "paste"
+//config:       bool "paste (4.5 kb)"
 //config:       default y
 //config:       help
-//config:         paste is used to paste lines of different files together
-//config:         and write the result to stdout
+//config:       paste is used to paste lines of different files together
+//config:       and write the result to stdout
 
 //applet:IF_PASTE(APPLET_NOEXEC(paste, paste, BB_DIR_USR_BIN, BB_SUID_DROP, paste))
 
diff --git a/coreutils/printenv.c b/coreutils/printenv.c
index fbd64945d..b0468b3f7 100644
--- a/coreutils/printenv.c
+++ b/coreutils/printenv.c
@@ -8,10 +8,10 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config PRINTENV
-//config:       bool "printenv"
+//config:       bool "printenv (1 kb)"
 //config:       default y
 //config:       help
-//config:         printenv is used to print all or part of environment.
+//config:       printenv is used to print all or part of environment.
 
 //applet:IF_PRINTENV(APPLET_NOFORK(printenv, printenv, BB_DIR_BIN, BB_SUID_DROP, printenv))
 
diff --git a/coreutils/printf.c b/coreutils/printf.c
index 65bb5a935..d3fc72adb 100644
--- a/coreutils/printf.c
+++ b/coreutils/printf.c
@@ -39,11 +39,11 @@
 /* 19990508 Busy Boxed! Dave Cinege */
 
 //config:config PRINTF
-//config:       bool "printf"
+//config:       bool "printf (3.3 kb)"
 //config:       default y
 //config:       help
-//config:         printf is used to format and print specified strings.
-//config:         It's similar to `echo' except it has more options.
+//config:       printf is used to format and print specified strings.
+//config:       It's similar to `echo' except it has more options.
 
 //applet:IF_PRINTF(APPLET_NOFORK(printf, printf, BB_DIR_USR_BIN, BB_SUID_DROP, printf))
 
diff --git a/coreutils/pwd.c b/coreutils/pwd.c
index 05dee497b..345d85100 100644
--- a/coreutils/pwd.c
+++ b/coreutils/pwd.c
@@ -7,10 +7,10 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config PWD
-//config:       bool "pwd"
+//config:       bool "pwd (3.4 kb)"
 //config:       default y
 //config:       help
-//config:         pwd is used to print the current directory.
+//config:       pwd is used to print the current directory.
 
 //applet:IF_PWD(APPLET_NOFORK(pwd, pwd, BB_DIR_BIN, BB_SUID_DROP, pwd))
 
diff --git a/coreutils/readlink.c b/coreutils/readlink.c
index 1b223b3c5..9690290e3 100644
--- a/coreutils/readlink.c
+++ b/coreutils/readlink.c
@@ -7,18 +7,18 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config READLINK
-//config:       bool "readlink"
+//config:       bool "readlink (3.6 kb)"
 //config:       default y
 //config:       help
-//config:         This program reads a symbolic link and returns the name
-//config:         of the file it points to
+//config:       This program reads a symbolic link and returns the name
+//config:       of the file it points to
 //config:
 //config:config FEATURE_READLINK_FOLLOW
 //config:       bool "Enable canonicalization by following all symlinks (-f)"
 //config:       default y
 //config:       depends on READLINK
 //config:       help
-//config:         Enable the readlink option (-f).
+//config:       Enable the readlink option (-f).
 
 //applet:IF_READLINK(APPLET(readlink, BB_DIR_USR_BIN, BB_SUID_DROP))
 
diff --git a/coreutils/realpath.c b/coreutils/realpath.c
index 0c2d544e4..6a61c3dc8 100644
--- a/coreutils/realpath.c
+++ b/coreutils/realpath.c
@@ -7,11 +7,11 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config REALPATH
-//config:       bool "realpath"
+//config:       bool "realpath (1.1 kb)"
 //config:       default y
 //config:       help
-//config:         Return the canonicalized absolute pathname.
-//config:         This isn't provided by GNU shellutils, but where else does it belong.
+//config:       Return the canonicalized absolute pathname.
+//config:       This isn't provided by GNU shellutils, but where else does it belong.
 
 //applet:IF_REALPATH(APPLET(realpath, BB_DIR_USR_BIN, BB_SUID_DROP))
 
diff --git a/coreutils/rm.c b/coreutils/rm.c
index cec34cb9d..f91c94570 100644
--- a/coreutils/rm.c
+++ b/coreutils/rm.c
@@ -11,10 +11,10 @@
  * Size reduction.
  */
 //config:config RM
-//config:       bool "rm"
+//config:       bool "rm (4.9 kb)"
 //config:       default y
 //config:       help
-//config:         rm is used to remove files or directories.
+//config:       rm is used to remove files or directories.
 
 //applet:IF_RM(APPLET_NOFORK(rm, rm, BB_DIR_BIN, BB_SUID_DROP, rm))
 
diff --git a/coreutils/rmdir.c b/coreutils/rmdir.c
index 8979941ce..c04ce78f8 100644
--- a/coreutils/rmdir.c
+++ b/coreutils/rmdir.c
@@ -7,18 +7,18 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config RMDIR
-//config:       bool "rmdir"
+//config:       bool "rmdir (3.4 kb)"
 //config:       default y
 //config:       help
-//config:         rmdir is used to remove empty directories.
+//config:       rmdir is used to remove empty directories.
 //config:
 //config:config FEATURE_RMDIR_LONG_OPTIONS
 //config:       bool "Enable long options"
 //config:       default y
 //config:       depends on RMDIR && LONG_OPTS
 //config:       help
-//config:         Support long options for the rmdir applet, including
-//config:         --ignore-fail-on-non-empty for compatibility with GNU rmdir.
+//config:       Support long options for the rmdir applet, including
+//config:       --ignore-fail-on-non-empty for compatibility with GNU rmdir.
 
 //applet:IF_RMDIR(APPLET_NOFORK(rmdir, rmdir, BB_DIR_BIN, BB_SUID_DROP, rmdir))
 
diff --git a/coreutils/seq.c b/coreutils/seq.c
index ed4946b05..f36dbb4ec 100644
--- a/coreutils/seq.c
+++ b/coreutils/seq.c
@@ -7,10 +7,10 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config SEQ
-//config:       bool "seq"
+//config:       bool "seq (3.6 kb)"
 //config:       default y
 //config:       help
-//config:         print a sequence of numbers
+//config:       print a sequence of numbers
 
 //applet:IF_SEQ(APPLET_NOFORK(seq, seq, BB_DIR_USR_BIN, BB_SUID_DROP, seq))
 
diff --git a/coreutils/shred.c b/coreutils/shred.c
index b3c009539..3ceb58d19 100644
--- a/coreutils/shred.c
+++ b/coreutils/shred.c
@@ -5,10 +5,10 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config SHRED
-//config:       bool "shred"
+//config:       bool "shred (5 kb)"
 //config:       default y
 //config:       help
-//config:         Overwrite a file to hide its contents, and optionally delete it
+//config:       Overwrite a file to hide its contents, and optionally delete it
 
 //applet:IF_SHRED(APPLET(shred, BB_DIR_USR_BIN, BB_SUID_DROP))
 
diff --git a/coreutils/shuf.c b/coreutils/shuf.c
index 217f15c97..403041534 100644
--- a/coreutils/shuf.c
+++ b/coreutils/shuf.c
@@ -8,10 +8,10 @@
  */
 
 //config:config SHUF
-//config:       bool "shuf"
+//config:       bool "shuf (5.4 kb)"
 //config:       default y
 //config:       help
-//config:         Generate random permutations
+//config:       Generate random permutations
 
 //kbuild:lib-$(CONFIG_SHUF) += shuf.o
 //applet:IF_SHUF(APPLET_NOEXEC(shuf, shuf, BB_DIR_USR_BIN, BB_SUID_DROP, shuf))
diff --git a/coreutils/sleep.c b/coreutils/sleep.c
index ad2d6b526..9b9581ca9 100644
--- a/coreutils/sleep.c
+++ b/coreutils/sleep.c
@@ -13,32 +13,32 @@
  * time suffixes for seconds, minutes, hours, and days.
  */
 //config:config SLEEP
-//config:       bool "sleep"
+//config:       bool "sleep (1.7 kb)"
 //config:       default y
 //config:       help
-//config:         sleep is used to pause for a specified number of seconds.
-//config:         It comes in 3 versions:
-//config:         - small: takes one integer parameter
-//config:         - fancy: takes multiple integer arguments with suffixes:
-//config:           sleep 1d 2h 3m 15s
-//config:         - fancy with fractional numbers:
-//config:           sleep 2.3s 4.5h sleeps for 16202.3 seconds
-//config:         Last one is "the most compatible" with coreutils sleep,
-//config:         but it adds around 1k of code.
+//config:       sleep is used to pause for a specified number of seconds.
+//config:       It comes in 3 versions:
+//config:       - small: takes one integer parameter
+//config:       - fancy: takes multiple integer arguments with suffixes:
+//config:               sleep 1d 2h 3m 15s
+//config:       - fancy with fractional numbers:
+//config:               sleep 2.3s 4.5h sleeps for 16202.3 seconds
+//config:       Last one is "the most compatible" with coreutils sleep,
+//config:       but it adds around 1k of code.
 //config:
 //config:config FEATURE_FANCY_SLEEP
 //config:       bool "Enable multiple arguments and s/m/h/d suffixes"
 //config:       default y
 //config:       depends on SLEEP
 //config:       help
-//config:         Allow sleep to pause for specified minutes, hours, and days.
+//config:       Allow sleep to pause for specified minutes, hours, and days.
 //config:
 //config:config FEATURE_FLOAT_SLEEP
 //config:       bool "Enable fractional arguments"
 //config:       default y
 //config:       depends on FEATURE_FANCY_SLEEP
 //config:       help
-//config:         Allow for fractional numeric parameters.
+//config:       Allow for fractional numeric parameters.
 
 /* Do not make this applet NOFORK. It breaks ^C-ing of pauses in shells */
 //applet:IF_SLEEP(APPLET(sleep, BB_DIR_BIN, BB_SUID_DROP))
diff --git a/coreutils/sort.c b/coreutils/sort.c
index 1ccce93c5..9860dca64 100644
--- a/coreutils/sort.c
+++ b/coreutils/sort.c
@@ -12,22 +12,22 @@
  * http://www.opengroup.org/onlinepubs/007904975/utilities/sort.html
  */
 //config:config SORT
-//config:       bool "sort"
+//config:       bool "sort (7.4 kb)"
 //config:       default y
 //config:       help
-//config:         sort is used to sort lines of text in specified files.
+//config:       sort is used to sort lines of text in specified files.
 //config:
 //config:config FEATURE_SORT_BIG
 //config:       bool "Full SuSv3 compliant sort (support -ktcsbdfiozgM)"
 //config:       default y
 //config:       depends on SORT
 //config:       help
-//config:         Without this, sort only supports -r, -u, and an integer version
-//config:         of -n. Selecting this adds sort keys, floating point support, and
-//config:         more. This adds a little over 3k to a nonstatic build on x86.
+//config:       Without this, sort only supports -r, -u, and an integer version
+//config:       of -n. Selecting this adds sort keys, floating point support, and
+//config:       more. This adds a little over 3k to a nonstatic build on x86.
 //config:
-//config:         The SuSv3 sort standard is available at:
-//config:         http://www.opengroup.org/onlinepubs/007904975/utilities/sort.html
+//config:       The SuSv3 sort standard is available at:
+//config:       http://www.opengroup.org/onlinepubs/007904975/utilities/sort.html
 
 //applet:IF_SORT(APPLET_NOEXEC(sort, sort, BB_DIR_USR_BIN, BB_SUID_DROP, sort))
 
diff --git a/coreutils/split.c b/coreutils/split.c
index 7af359d0e..d0c63573a 100644
--- a/coreutils/split.c
+++ b/coreutils/split.c
@@ -6,19 +6,19 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config SPLIT
-//config:       bool "split"
+//config:       bool "split (5.4 kb)"
 //config:       default y
 //config:       help
-//config:         Split a file into pieces.
+//config:       Split a file into pieces.
 //config:
 //config:config FEATURE_SPLIT_FANCY
 //config:       bool "Fancy extensions"
 //config:       default y
 //config:       depends on SPLIT
 //config:       help
-//config:         Add support for features not required by SUSv3.
-//config:         Supports additional suffixes 'b' for 512 bytes,
-//config:         'g' for 1GiB for the -b option.
+//config:       Add support for features not required by SUSv3.
+//config:       Supports additional suffixes 'b' for 512 bytes,
+//config:       'g' for 1GiB for the -b option.
 
 //applet:IF_SPLIT(APPLET(split, BB_DIR_USR_BIN, BB_SUID_DROP))
 
diff --git a/coreutils/stat.c b/coreutils/stat.c
index 109b5258c..96efa1d5d 100644
--- a/coreutils/stat.c
+++ b/coreutils/stat.c
@@ -13,27 +13,27 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config STAT
-//config:       bool "stat"
+//config:       bool "stat (10 kb)"
 //config:       default y
 //config:       help
-//config:         display file or filesystem status.
+//config:       display file or filesystem status.
 //config:
 //config:config FEATURE_STAT_FORMAT
 //config:       bool "Enable custom formats (-c)"
 //config:       default y
 //config:       depends on STAT
 //config:       help
-//config:         Without this, stat will not support the '-c format' option where
-//config:         users can pass a custom format string for output. This adds about
-//config:         7k to a nonstatic build on amd64.
+//config:       Without this, stat will not support the '-c format' option where
+//config:       users can pass a custom format string for output. This adds about
+//config:       7k to a nonstatic build on amd64.
 //config:
 //config:config FEATURE_STAT_FILESYSTEM
 //config:       bool "Enable display of filesystem status (-f)"
 //config:       default y
 //config:       depends on STAT
 //config:       help
-//config:         Without this, stat will not support the '-f' option to display
-//config:         information about filesystem status.
+//config:       Without this, stat will not support the '-f' option to display
+//config:       information about filesystem status.
 
 //applet:IF_STAT(APPLET(stat, BB_DIR_BIN, BB_SUID_DROP))
 
diff --git a/coreutils/stty.c b/coreutils/stty.c
index e818d579c..f987fbbcf 100644
--- a/coreutils/stty.c
+++ b/coreutils/stty.c
@@ -20,10 +20,10 @@
    Special for busybox ported by Vladimir Oleynik <dzo@simtreas.ru> 2001
 */
 //config:config STTY
-//config:       bool "stty"
+//config:       bool "stty (8.6 kb)"
 //config:       default y
 //config:       help
-//config:         stty is used to change and print terminal line settings.
+//config:       stty is used to change and print terminal line settings.
 
 //applet:IF_STTY(APPLET(stty, BB_DIR_BIN, BB_SUID_DROP))
 
diff --git a/coreutils/sum.c b/coreutils/sum.c
index 2a91f963c..ee758877f 100644
--- a/coreutils/sum.c
+++ b/coreutils/sum.c
@@ -13,10 +13,10 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config SUM
-//config:       bool "sum"
+//config:       bool "sum (4.3 kb)"
 //config:       default y
 //config:       help
-//config:         checksum and count the blocks in a file
+//config:       checksum and count the blocks in a file
 
 //applet:IF_SUM(APPLET(sum, BB_DIR_USR_BIN, BB_SUID_DROP))
 
diff --git a/coreutils/sync.c b/coreutils/sync.c
index 5e189f6f4..66445281a 100644
--- a/coreutils/sync.c
+++ b/coreutils/sync.c
@@ -8,17 +8,17 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config SYNC
-//config:       bool "sync"
+//config:       bool "sync (769 bytes)"
 //config:       default y
 //config:       help
-//config:         sync is used to flush filesystem buffers.
+//config:       sync is used to flush filesystem buffers.
 //config:config FEATURE_SYNC_FANCY
 //config:       bool "Enable -d and -f flags (requires syncfs(2) in libc)"
 //config:       default y
 //config:       depends on SYNC
 //config:       help
-//config:         sync -d FILE... executes fdatasync() on each FILE.
-//config:         sync -f FILE... executes syncfs() on each FILE.
+//config:       sync -d FILE... executes fdatasync() on each FILE.
+//config:       sync -f FILE... executes syncfs() on each FILE.
 
 //applet:IF_SYNC(APPLET_NOFORK(sync, sync, BB_DIR_BIN, BB_SUID_DROP, sync))
 
diff --git a/coreutils/tac.c b/coreutils/tac.c
index ca5617c83..6d3ea9c19 100644
--- a/coreutils/tac.c
+++ b/coreutils/tac.c
@@ -13,10 +13,10 @@
  * http://www.uclibc.org/lists/busybox/2003-July/008813.html
  */
 //config:config TAC
-//config:       bool "tac"
+//config:       bool "tac (4.1 kb)"
 //config:       default y
 //config:       help
-//config:         tac is used to concatenate and print files in reverse.
+//config:       tac is used to concatenate and print files in reverse.
 
 //applet:IF_TAC(APPLET_NOEXEC(tac, tac, BB_DIR_USR_BIN, BB_SUID_DROP, tac))
 
diff --git a/coreutils/tail.c b/coreutils/tail.c
index e7a24a7a8..fd310f422 100644
--- a/coreutils/tail.c
+++ b/coreutils/tail.c
@@ -19,23 +19,23 @@
  * 7) lseek attempted when count==0 even if arg was +0 (from top)
  */
 //config:config TAIL
-//config:       bool "tail"
+//config:       bool "tail (7.1 kb)"
 //config:       default y
 //config:       help
-//config:         tail is used to print the last specified number of lines
-//config:         from files.
+//config:       tail is used to print the last specified number of lines
+//config:       from files.
 //config:
 //config:config FEATURE_FANCY_TAIL
 //config:       bool "Enable -q, -s, -v, and -F options"
 //config:       default y
 //config:       depends on TAIL
 //config:       help
-//config:         These options are provided by GNU tail, but
-//config:         are not specific in the SUSv3 standard:
-//config:           -q      Never output headers giving file names
-//config:           -s SEC  Wait SEC seconds between reads with -f
-//config:           -v      Always output headers giving file names
-//config:           -F      Same as -f, but keep retrying
+//config:       These options are provided by GNU tail, but
+//config:       are not specified in the SUSv3 standard:
+//config:               -q      Never output headers giving file names
+//config:               -s SEC  Wait SEC seconds between reads with -f
+//config:               -v      Always output headers giving file names
+//config:               -F      Same as -f, but keep retrying
 
 //applet:IF_TAIL(APPLET(tail, BB_DIR_USR_BIN, BB_SUID_DROP))
 
diff --git a/coreutils/tee.c b/coreutils/tee.c
index 602d06737..f0ec791bb 100644
--- a/coreutils/tee.c
+++ b/coreutils/tee.c
@@ -7,18 +7,18 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config TEE
-//config:       bool "tee"
+//config:       bool "tee (4.3 kb)"
 //config:       default y
 //config:       help
-//config:         tee is used to read from standard input and write
-//config:         to standard output and files.
+//config:       tee is used to read from standard input and write
+//config:       to standard output and files.
 //config:
 //config:config FEATURE_TEE_USE_BLOCK_IO
 //config:       bool "Enable block I/O (larger/faster) instead of byte I/O"
 //config:       default y
 //config:       depends on TEE
 //config:       help
-//config:         Enable this option for a faster tee, at expense of size.
+//config:       Enable this option for a faster tee, at expense of size.
 
 //applet:IF_TEE(APPLET(tee, BB_DIR_USR_BIN, BB_SUID_DROP))
 
diff --git a/coreutils/test.c b/coreutils/test.c
index d4f93312a..fca55551e 100644
--- a/coreutils/test.c
+++ b/coreutils/test.c
@@ -20,31 +20,31 @@
  *     "This program is in the Public Domain."
  */
 //config:config TEST
-//config:       bool "test"
+//config:       bool "test (3.6 kb)"
 //config:       default y
 //config:       help
-//config:         test is used to check file types and compare values,
-//config:         returning an appropriate exit code. The bash shell
-//config:         has test built in, ash can build it in optionally.
+//config:       test is used to check file types and compare values,
+//config:       returning an appropriate exit code. The bash shell
+//config:       has test built in, ash can build it in optionally.
 //config:
 //config:config TEST1
 //config:       bool "test as ["
 //config:       default y
 //config:       help
-//config:         Provide test command in the "[ EXPR ]" form
+//config:       Provide test command in the "[ EXPR ]" form
 //config:
 //config:config TEST2
 //config:       bool "test as [["
 //config:       default y
 //config:       help
-//config:         Provide test command in the "[[ EXPR ]]" form
+//config:       Provide test command in the "[[ EXPR ]]" form
 //config:
 //config:config FEATURE_TEST_64
 //config:       bool "Extend test to 64 bit"
 //config:       default y
 //config:       depends on TEST || TEST1 || TEST2 || ASH_TEST || HUSH_TEST
 //config:       help
-//config:         Enable 64-bit support in test.
+//config:       Enable 64-bit support in test.
 
 //applet:IF_TEST(APPLET_NOFORK(test, test, BB_DIR_USR_BIN, BB_SUID_DROP, test))
 //applet:IF_TEST1(APPLET_NOFORK([,   test, BB_DIR_USR_BIN, BB_SUID_DROP, test))
diff --git a/coreutils/timeout.c b/coreutils/timeout.c
index f29dc8a9c..4a6117f59 100644
--- a/coreutils/timeout.c
+++ b/coreutils/timeout.c
@@ -28,11 +28,11 @@
  * rewrite  14-11-2008 vda
  */
 //config:config TIMEOUT
-//config:       bool "timeout"
+//config:       bool "timeout (5.5 kb)"
 //config:       default y
 //config:       help
-//config:         Runs a program and watches it. If it does not terminate in
-//config:         specified number of seconds, it is sent a signal.
+//config:       Runs a program and watches it. If it does not terminate in
+//config:       specified number of seconds, it is sent a signal.
 
 //applet:IF_TIMEOUT(APPLET(timeout, BB_DIR_USR_BIN, BB_SUID_DROP))
 
diff --git a/coreutils/touch.c b/coreutils/touch.c
index 92d5a718a..11b40d427 100644
--- a/coreutils/touch.c
+++ b/coreutils/touch.c
@@ -13,26 +13,26 @@
  * Also, exiting on a failure was a bug.  All args should be processed.
  */
 //config:config TOUCH
-//config:       bool "touch"
+//config:       bool "touch (5.8 kb)"
 //config:       default y
 //config:       help
-//config:         touch is used to create or change the access and/or
-//config:         modification timestamp of specified files.
+//config:       touch is used to create or change the access and/or
+//config:       modification timestamp of specified files.
 //config:
 //config:config FEATURE_TOUCH_NODEREF
 //config:       bool "Add support for -h"
 //config:       default y
 //config:       depends on TOUCH
 //config:       help
-//config:         Enable touch to have the -h option.
-//config:         This requires libc support for lutimes() function.
+//config:       Enable touch to have the -h option.
+//config:       This requires libc support for lutimes() function.
 //config:
 //config:config FEATURE_TOUCH_SUSV3
 //config:       bool "Add support for SUSV3 features (-d -t -r)"
 //config:       default y
 //config:       depends on TOUCH
 //config:       help
-//config:         Enable touch to use a reference file or a given date/time argument.
+//config:       Enable touch to use a reference file or a given date/time argument.
 
 //applet:IF_TOUCH(APPLET_NOFORK(touch, touch, BB_DIR_BIN, BB_SUID_DROP, touch))
 
diff --git a/coreutils/tr.c b/coreutils/tr.c
index f552096f3..64e4efc91 100644
--- a/coreutils/tr.c
+++ b/coreutils/tr.c
@@ -19,30 +19,30 @@
  * TODO: graph, print
  */
 //config:config TR
-//config:       bool "tr"
+//config:       bool "tr (5.5 kb)"
 //config:       default y
 //config:       help
-//config:         tr is used to squeeze, and/or delete characters from standard
-//config:         input, writing to standard output.
+//config:       tr is used to squeeze, and/or delete characters from standard
+//config:       input, writing to standard output.
 //config:
 //config:config FEATURE_TR_CLASSES
 //config:       bool "Enable character classes (such as [:upper:])"
 //config:       default y
 //config:       depends on TR
 //config:       help
-//config:         Enable character classes, enabling commands such as:
-//config:         tr [:upper:] [:lower:] to convert input into lowercase.
+//config:       Enable character classes, enabling commands such as:
+//config:       tr [:upper:] [:lower:] to convert input into lowercase.
 //config:
 //config:config FEATURE_TR_EQUIV
 //config:       bool "Enable equivalence classes"
 //config:       default y
 //config:       depends on TR
 //config:       help
-//config:         Enable equivalence classes, which essentially add the enclosed
-//config:         character to the current set. For instance, tr [=a=] xyz would
-//config:         replace all instances of 'a' with 'xyz'. This option is mainly
-//config:         useful for cases when no other way of expressing a character
-//config:         is possible.
+//config:       Enable equivalence classes, which essentially add the enclosed
+//config:       character to the current set. For instance, tr [=a=] xyz would
+//config:       replace all instances of 'a' with 'xyz'. This option is mainly
+//config:       useful for cases when no other way of expressing a character
+//config:       is possible.
 
 //applet:IF_TR(APPLET(tr, BB_DIR_USR_BIN, BB_SUID_DROP))
 
diff --git a/coreutils/true.c b/coreutils/true.c
index 6a9493f9d..400388c34 100644
--- a/coreutils/true.c
+++ b/coreutils/true.c
@@ -7,10 +7,10 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config TRUE
-//config:       bool "true"
+//config:       bool "true (tiny)"
 //config:       default y
 //config:       help
-//config:         true returns an exit code of TRUE (0).
+//config:       true returns an exit code of TRUE (0).
 
 //applet:IF_TRUE(APPLET_NOFORK(true, true, BB_DIR_BIN, BB_SUID_DROP, true))
 
diff --git a/coreutils/truncate.c b/coreutils/truncate.c
index 253fe0015..f67abaf40 100644
--- a/coreutils/truncate.c
+++ b/coreutils/truncate.c
@@ -6,11 +6,11 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config TRUNCATE
-//config:       bool "truncate"
+//config:       bool "truncate (4.7 kb)"
 //config:       default y
 //config:       help
-//config:         truncate truncates files to a given size. If a file does
-//config:         not exist, it is created unless told otherwise.
+//config:       truncate truncates files to a given size. If a file does
+//config:       not exist, it is created unless told otherwise.
 
 //applet:IF_TRUNCATE(APPLET_NOFORK(truncate, truncate, BB_DIR_USR_BIN, BB_SUID_DROP, truncate))
 
diff --git a/coreutils/tty.c b/coreutils/tty.c
index 359e5bc93..331941a01 100644
--- a/coreutils/tty.c
+++ b/coreutils/tty.c
@@ -7,11 +7,11 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config TTY
-//config:       bool "tty"
+//config:       bool "tty (3.3 kb)"
 //config:       default y
 //config:       help
-//config:         tty is used to print the name of the current terminal to
-//config:         standard output.
+//config:       tty is used to print the name of the current terminal to
+//config:       standard output.
 
 //applet:IF_TTY(APPLET(tty, BB_DIR_USR_BIN, BB_SUID_DROP))
 
diff --git a/coreutils/uname.c b/coreutils/uname.c
index 9c6a06ebb..aad58cab0 100644
--- a/coreutils/uname.c
+++ b/coreutils/uname.c
@@ -43,32 +43,32 @@
  *  Fix handling of -a to not print "unknown", add -o and -i support.
  */
 //config:config UNAME
-//config:       bool "uname"
+//config:       bool "uname (3.7 kb)"
 //config:       default y
 //config:       help
-//config:         uname is used to print system information.
+//config:       uname is used to print system information.
 //config:
 //config:config UNAME_OSNAME
 //config:       string "Operating system name"
 //config:       default "GNU/Linux"
 //config:       depends on UNAME
 //config:       help
-//config:         Sets the operating system name reported by uname -o.  The
-//config:         default is "GNU/Linux".
+//config:       Sets the operating system name reported by uname -o.  The
+//config:       default is "GNU/Linux".
 //config:
 //can't use "ARCH" for this applet, all hell breaks loose in build system :)
-//config:config BBARCH
-//config:       bool "arch"
+//config:config BB_ARCH
+//config:       bool "arch (1.6 kb)"
 //config:       default y
 //config:       help
-//config:         Same as uname -m.
+//config:       Same as uname -m.
 
 //applet:IF_UNAME(APPLET(uname, BB_DIR_BIN, BB_SUID_DROP))
-//                 APPLET_ODDNAME:name  main   location    suid_type     help
-//applet:IF_BBARCH(APPLET_ODDNAME(arch, uname, BB_DIR_BIN, BB_SUID_DROP, arch))
+//                  APPLET_ODDNAME:name  main   location    suid_type     help
+//applet:IF_BB_ARCH(APPLET_ODDNAME(arch, uname, BB_DIR_BIN, BB_SUID_DROP, arch))
 
-//kbuild:lib-$(CONFIG_UNAME)  += uname.o
-//kbuild:lib-$(CONFIG_BBARCH) += uname.o
+//kbuild:lib-$(CONFIG_UNAME)   += uname.o
+//kbuild:lib-$(CONFIG_BB_ARCH) += uname.o
 
 /* BB_AUDIT SUSv3 compliant */
 /* http://www.opengroup.org/onlinepubs/007904975/utilities/uname.html */
@@ -131,7 +131,7 @@ int uname_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
         toprint = (1 << 4); /* "arch" = "uname -m" */
 
 #if ENABLE_UNAME
-        if (!ENABLE_BBARCH || applet_name[0] == 'u') {
+        if (!ENABLE_BB_ARCH || applet_name[0] == 'u') {
 # if ENABLE_LONG_OPTS
                 static const char uname_longopts[] ALIGN1 =
                         /* name, has_arg, val */
@@ -172,7 +172,7 @@ int uname_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
                 }
         }
 #endif
-        if (ENABLE_BBARCH && (!ENABLE_UNAME || applet_name[0] == 'a')) {
+        if (ENABLE_BB_ARCH && (!ENABLE_UNAME || applet_name[0] == 'a')) {
                 puts(uname_info.name.machine);
         } else {
 #if ENABLE_UNAME
diff --git a/coreutils/uniq.c b/coreutils/uniq.c
index 2b62ad3ae..f71557b67 100644
--- a/coreutils/uniq.c
+++ b/coreutils/uniq.c
@@ -7,10 +7,10 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config UNIQ
-//config:       bool "uniq"
+//config:       bool "uniq (4.8 kb)"
 //config:       default y
 //config:       help
-//config:         uniq is used to remove duplicate lines from a sorted file.
+//config:       uniq is used to remove duplicate lines from a sorted file.
 
 //applet:IF_UNIQ(APPLET(uniq, BB_DIR_USR_BIN, BB_SUID_DROP))
 
diff --git a/coreutils/unlink.c b/coreutils/unlink.c
index 2879638d3..3322d5b47 100644
--- a/coreutils/unlink.c
+++ b/coreutils/unlink.c
@@ -6,10 +6,10 @@
  * Licensed under GPLv2, see LICENSE in this source tree
  */
 //config:config UNLINK
-//config:       bool "unlink"
+//config:       bool "unlink (3.5 kb)"
 //config:       default y
 //config:       help
-//config:         unlink deletes a file by calling unlink()
+//config:       unlink deletes a file by calling unlink()
 
 //applet:IF_UNLINK(APPLET(unlink, BB_DIR_USR_BIN, BB_SUID_DROP))
 
diff --git a/coreutils/usleep.c b/coreutils/usleep.c
index 7bc30c2a2..7c25aada1 100644
--- a/coreutils/usleep.c
+++ b/coreutils/usleep.c
@@ -7,10 +7,10 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config USLEEP
-//config:       bool "usleep"
+//config:       bool "usleep (1.1 kb)"
 //config:       default y
 //config:       help
-//config:         usleep is used to pause for a specified number of microseconds.
+//config:       usleep is used to pause for a specified number of microseconds.
 
 //applet:IF_USLEEP(APPLET_NOFORK(usleep, usleep, BB_DIR_BIN, BB_SUID_DROP, usleep))
 
diff --git a/coreutils/uudecode.c b/coreutils/uudecode.c
index 2fe771f69..4e72e86ee 100644
--- a/coreutils/uudecode.c
+++ b/coreutils/uudecode.c
@@ -11,10 +11,10 @@
  * "end" line
  */
 //config:config UUDECODE
-//config:       bool "uudecode"
+//config:       bool "uudecode (5.9 kb)"
 //config:       default y
 //config:       help
-//config:         uudecode is used to decode a uuencoded file.
+//config:       uudecode is used to decode a uuencoded file.
 
 //applet:IF_UUDECODE(APPLET(uudecode, BB_DIR_USR_BIN, BB_SUID_DROP))
 
@@ -176,10 +176,10 @@ int uudecode_main(int argc UNUSED_PARAM, char **argv)
 //kbuild:lib-$(CONFIG_BASE64) += uudecode.o
 
 //config:config BASE64
-//config:       bool "base64"
+//config:       bool "base64 (5 kb)"
 //config:       default y
 //config:       help
-//config:         Base64 encode and decode
+//config:       Base64 encode and decode
 
 //usage:#define base64_trivial_usage
 //usage:        "[-d] [FILE]"
diff --git a/coreutils/uuencode.c b/coreutils/uuencode.c
index 917cdaea5..7164f838a 100644
--- a/coreutils/uuencode.c
+++ b/coreutils/uuencode.c
@@ -8,10 +8,10 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config UUENCODE
-//config:       bool "uuencode"
+//config:       bool "uuencode (4.6 kb)"
 //config:       default y
 //config:       help
-//config:         uuencode is used to uuencode a file.
+//config:       uuencode is used to uuencode a file.
 
 //applet:IF_UUENCODE(APPLET(uuencode, BB_DIR_USR_BIN, BB_SUID_DROP))
 
diff --git a/coreutils/wc.c b/coreutils/wc.c
index 4c53049b0..c74b7a65f 100644
--- a/coreutils/wc.c
+++ b/coreutils/wc.c
@@ -33,18 +33,18 @@
  * for which 'wc -c' should output '0'.
  */
 //config:config WC
-//config:       bool "wc"
+//config:       bool "wc (4.4 kb)"
 //config:       default y
 //config:       help
-//config:         wc is used to print the number of bytes, words, and lines,
-//config:         in specified files.
+//config:       wc is used to print the number of bytes, words, and lines,
+//config:       in specified files.
 //config:
 //config:config FEATURE_WC_LARGE
 //config:       bool "Support very large counts"
 //config:       default y
 //config:       depends on WC
 //config:       help
-//config:         Use "unsigned long long" for counter variables.
+//config:       Use "unsigned long long" for counter variables.
 
 //applet:IF_WC(APPLET(wc, BB_DIR_USR_BIN, BB_SUID_DROP))
 
diff --git a/coreutils/who.c b/coreutils/who.c
index 4adead77e..91f99138c 100644
--- a/coreutils/who.c
+++ b/coreutils/who.c
@@ -17,26 +17,26 @@
  *----------------------------------------------------------------------
  */
 //config:config WHO
-//config:      bool "who"
-//config:      default y
-//config:      depends on FEATURE_UTMP
-//config:      help
-//config:        who is used to show who is logged on.
+//config:       bool "who (3.7 kb)"
+//config:       default y
+//config:       depends on FEATURE_UTMP
+//config:       help
+//config:       Print users currently logged on.
 //config:
 // procps-ng has this variation of "who":
 //config:config W
-//config:      bool "w"
-//config:      default y
-//config:      depends on FEATURE_UTMP
-//config:      help
-//config:        w is used to show who is logged on.
+//config:       bool "w (3.7 kb)"
+//config:       default y
+//config:       depends on FEATURE_UTMP
+//config:       help
+//config:       Print users currently logged on.
 //config:
 //config:config USERS
-//config:      bool "users"
-//config:      default y
-//config:      depends on FEATURE_UTMP
-//config:      help
-//config:        Print users currently logged on.
+//config:       bool "users (3.2 kb)"
+//config:       default y
+//config:       depends on FEATURE_UTMP
+//config:       help
+//config:       Print users currently logged on.
 
 //                APPLET_ODDNAME:name   main location        suid_type     help
 //applet:IF_USERS(APPLET_ODDNAME(users, who, BB_DIR_USR_BIN, BB_SUID_DROP, users))
diff --git a/coreutils/whoami.c b/coreutils/whoami.c
index 635712829..9dab15817 100644
--- a/coreutils/whoami.c
+++ b/coreutils/whoami.c
@@ -7,11 +7,11 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config WHOAMI
-//config:       bool "whoami"
+//config:       bool "whoami (2.9 kb)"
 //config:       default y
 //config:       help
-//config:         whoami is used to print the username of the current
-//config:         user id (same as id -un).
+//config:       whoami is used to print the username of the current
+//config:       user id (same as id -un).
 
 //applet:IF_WHOAMI(APPLET_NOFORK(whoami, whoami, BB_DIR_USR_BIN, BB_SUID_DROP, whoami))
 
diff --git a/coreutils/yes.c b/coreutils/yes.c
index ce6a90fc0..a5a444249 100644
--- a/coreutils/yes.c
+++ b/coreutils/yes.c
@@ -11,11 +11,11 @@
  * Size reductions and removed redundant applet name prefix from error messages.
  */
 //config:config YES
-//config:       bool "yes"
+//config:       bool "yes (956 bytes)"
 //config:       default y
 //config:       help
-//config:         yes is used to repeatedly output a specific string, or
-//config:         the default string `y'.
+//config:       yes is used to repeatedly output a specific string, or
+//config:       the default string `y'.
 
 //applet:IF_YES(APPLET_NOFORK(yes, yes, BB_DIR_USR_BIN, BB_SUID_DROP, yes))
 
diff --git a/debianutils/pipe_progress.c b/debianutils/pipe_progress.c
index 21d330b59..e6b7601fa 100644
--- a/debianutils/pipe_progress.c
+++ b/debianutils/pipe_progress.c
@@ -7,10 +7,10 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config PIPE_PROGRESS
-//config:       bool "pipe_progress"
+//config:       bool "pipe_progress (225 bytes)"
 //config:       default y
 //config:       help
-//config:         Display a dot to indicate pipe activity.
+//config:       Display a dot to indicate pipe activity.
 
 //applet:IF_PIPE_PROGRESS(APPLET(pipe_progress, BB_DIR_BIN, BB_SUID_DROP))
 
diff --git a/debianutils/run_parts.c b/debianutils/run_parts.c
index 3ef28f1d4..c6a90a486 100644
--- a/debianutils/run_parts.c
+++ b/debianutils/run_parts.c
@@ -23,19 +23,19 @@
  * broken compatibility because the BusyBox policy doesn't allow them.
  */
 //config:config RUN_PARTS
-//config:       bool "run-parts"
+//config:       bool "run-parts (5.6 kb)"
 //config:       default y
 //config:       help
-//config:         run-parts is a utility designed to run all the scripts in a directory.
+//config:       run-parts is a utility designed to run all the scripts in a directory.
 //config:
-//config:         It is useful to set up a directory like cron.daily, where you need to
-//config:         execute all the scripts in that directory.
+//config:       It is useful to set up a directory like cron.daily, where you need to
+//config:       execute all the scripts in that directory.
 //config:
-//config:         In this implementation of run-parts some features (such as report
-//config:         mode) are not implemented.
+//config:       In this implementation of run-parts some features (such as report
+//config:       mode) are not implemented.
 //config:
-//config:         Unless you know that run-parts is used in some of your scripts
-//config:         you can safely say N here.
+//config:       Unless you know that run-parts is used in some of your scripts
+//config:       you can safely say N here.
 //config:
 //config:config FEATURE_RUN_PARTS_LONG_OPTIONS
 //config:       bool "Enable long options"
@@ -47,9 +47,9 @@
 //config:       default y
 //config:       depends on RUN_PARTS
 //config:       help
-//config:         Support additional options:
-//config:         -l --list print the names of the all matching files (not
-//config:                   limited to executables), but don't actually run them.
+//config:       Support additional options:
+//config:       -l --list print the names of the all matching files (not
+//config:       limited to executables), but don't actually run them.
 
 //applet:IF_RUN_PARTS(APPLET_ODDNAME(run-parts, run_parts, BB_DIR_BIN, BB_SUID_DROP, run_parts))
 
diff --git a/debianutils/start_stop_daemon.c b/debianutils/start_stop_daemon.c
index 4a9e0653e..9d60b2c7f 100644
--- a/debianutils/start_stop_daemon.c
+++ b/debianutils/start_stop_daemon.c
@@ -57,12 +57,12 @@ Misc options:
         -v,--verbose            Verbose
 */
 //config:config START_STOP_DAEMON
-//config:       bool "start-stop-daemon"
+//config:       bool "start-stop-daemon (12 kb)"
 //config:       default y
 //config:       help
-//config:         start-stop-daemon is used to control the creation and
-//config:         termination of system-level processes, usually the ones
-//config:         started during the startup of the system.
+//config:       start-stop-daemon is used to control the creation and
+//config:       termination of system-level processes, usually the ones
+//config:       started during the startup of the system.
 //config:
 //config:config FEATURE_START_STOP_DAEMON_LONG_OPTIONS
 //config:       bool "Enable long options"
@@ -74,9 +74,9 @@ Misc options:
 //config:       default y
 //config:       depends on START_STOP_DAEMON
 //config:       help
-//config:         -o|--oknodo ignored since we exit with 0 anyway
-//config:         -v|--verbose
-//config:         -N|--nicelevel N
+//config:       -o|--oknodo ignored since we exit with 0 anyway
+//config:       -v|--verbose
+//config:       -N|--nicelevel N
 
 //applet:IF_START_STOP_DAEMON(APPLET_ODDNAME(start-stop-daemon, start_stop_daemon, BB_DIR_SBIN, BB_SUID_DROP, start_stop_daemon))
 
diff --git a/debianutils/which.c b/debianutils/which.c
index af33ba72e..491557167 100644
--- a/debianutils/which.c
+++ b/debianutils/which.c
@@ -6,11 +6,11 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config WHICH
-//config:       bool "which"
+//config:       bool "which (3.7 kb)"
 //config:       default y
 //config:       help
-//config:         which is used to find programs in your PATH and
-//config:         print out their pathnames.
+//config:       which is used to find programs in your PATH and
+//config:       print out their pathnames.
 
 //applet:IF_WHICH(APPLET(which, BB_DIR_USR_BIN, BB_SUID_DROP))
 
diff --git a/e2fsprogs/chattr.c b/e2fsprogs/chattr.c
index 043f39591..72327d728 100644
--- a/e2fsprogs/chattr.c
+++ b/e2fsprogs/chattr.c
@@ -10,10 +10,10 @@
  * Public License
  */
 //config:config CHATTR
-//config:       bool "chattr"
+//config:       bool "chattr (3.2 kb)"
 //config:       default y
 //config:       help
-//config:         chattr changes the file attributes on a second extended file system.
+//config:       chattr changes the file attributes on a second extended file system.
 
 //applet:IF_CHATTR(APPLET(chattr, BB_DIR_BIN, BB_SUID_DROP))
 
diff --git a/e2fsprogs/fsck.c b/e2fsprogs/fsck.c
index eb53002b1..1c285bb92 100644
--- a/e2fsprogs/fsck.c
+++ b/e2fsprogs/fsck.c
@@ -34,12 +34,12 @@
  * It doesn't guess filesystem types from on-disk format.
  */
 //config:config FSCK
-//config:       bool "fsck"
+//config:       bool "fsck (6.7 kb)"
 //config:       default y
 //config:       help
-//config:         fsck is used to check and optionally repair one or more filesystems.
-//config:         In actuality, fsck is simply a front-end for the various file system
-//config:         checkers (fsck.fstype) available under Linux.
+//config:       fsck is used to check and optionally repair one or more filesystems.
+//config:       In actuality, fsck is simply a front-end for the various file system
+//config:       checkers (fsck.fstype) available under Linux.
 
 //applet:IF_FSCK(APPLET(fsck, BB_DIR_SBIN, BB_SUID_DROP))
 
diff --git a/e2fsprogs/lsattr.c b/e2fsprogs/lsattr.c
index d2348b5f7..756d26832 100644
--- a/e2fsprogs/lsattr.c
+++ b/e2fsprogs/lsattr.c
@@ -10,11 +10,11 @@
  * Public License
  */
 //config:config LSATTR
-//config:       bool "lsattr"
+//config:       bool "lsattr (5 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         lsattr lists the file attributes on a second extended file system.
+//config:       lsattr lists the file attributes on a second extended file system.
 
 //applet:IF_LSATTR(APPLET(lsattr, BB_DIR_BIN, BB_SUID_DROP))
 
diff --git a/e2fsprogs/tune2fs.c b/e2fsprogs/tune2fs.c
index e9bad66ad..95411db5f 100644
--- a/e2fsprogs/tune2fs.c
+++ b/e2fsprogs/tune2fs.c
@@ -7,11 +7,11 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config TUNE2FS
-//config:       bool "tune2fs"
+//config:       bool "tune2fs (4.4 kb)"
 //config:       default n  # off: it is too limited compared to upstream version
 //config:       help
-//config:         tune2fs allows the system administrator to adjust various tunable
-//config:         filesystem parameters on Linux ext2/ext3 filesystems.
+//config:       tune2fs allows the system administrator to adjust various tunable
+//config:       filesystem parameters on Linux ext2/ext3 filesystems.
 
 //applet:IF_TUNE2FS(APPLET(tune2fs, BB_DIR_SBIN, BB_SUID_DROP))
 
diff --git a/editors/Config.src b/editors/Config.src
index 8f2b265bd..0920bc494 100644
--- a/editors/Config.src
+++ b/editors/Config.src
@@ -12,7 +12,7 @@ config FEATURE_ALLOW_EXEC
         default y
         depends on VI || AWK
         help
-          Enables vi and awk features which allow user to execute
-          shell commands (using system() C call).
+        Enables vi and awk features which allow user to execute
+        shell commands (using system() C call).
 
 endmenu
diff --git a/editors/awk.c b/editors/awk.c
index e8e2c96f8..602a1d5e7 100644
--- a/editors/awk.c
+++ b/editors/awk.c
@@ -8,30 +8,30 @@
  */
 
 //config:config AWK
-//config:       bool "awk"
+//config:       bool "awk (22 kb)"
 //config:       default y
 //config:       help
-//config:         Awk is used as a pattern scanning and processing language. This is
-//config:         the BusyBox implementation of that programming language.
+//config:       Awk is used as a pattern scanning and processing language. This is
+//config:       the BusyBox implementation of that programming language.
 //config:
 //config:config FEATURE_AWK_LIBM
 //config:       bool "Enable math functions (requires libm)"
 //config:       default y
 //config:       depends on AWK
 //config:       help
-//config:         Enable math functions of the Awk programming language.
-//config:         NOTE: This will require libm to be present for linking.
+//config:       Enable math functions of the Awk programming language.
+//config:       NOTE: This requires libm to be present for linking.
 //config:
 //config:config FEATURE_AWK_GNU_EXTENSIONS
 //config:       bool "Enable a few GNU extensions"
 //config:       default y
 //config:       depends on AWK
 //config:       help
-//config:         Enable a few features from gawk:
-//config:         * command line option -e AWK_PROGRAM
-//config:         * simultaneous use of -f and -e on the command line.
-//config:           This enables the use of awk library files.
-//config:           Ex: awk -f mylib.awk -e '{print myfunction($1);}' ...
+//config:       Enable a few features from gawk:
+//config:       * command line option -e AWK_PROGRAM
+//config:       * simultaneous use of -f and -e on the command line.
+//config:       This enables the use of awk library files.
+//config:       Example: awk -f mylib.awk -e '{print myfunction($1);}' ...
 
 //applet:IF_AWK(APPLET_NOEXEC(awk, awk, BB_DIR_USR_BIN, BB_SUID_DROP, awk))
 
diff --git a/editors/cmp.c b/editors/cmp.c
index a4af6f480..f53d9603c 100644
--- a/editors/cmp.c
+++ b/editors/cmp.c
@@ -11,11 +11,11 @@
 /* http://www.opengroup.org/onlinepubs/007904975/utilities/cmp.html */
 
 //config:config CMP
-//config:       bool "cmp"
+//config:       bool "cmp (5.4 kb)"
 //config:       default y
 //config:       help
-//config:         cmp is used to compare two files and returns the result
-//config:         to standard output.
+//config:       cmp is used to compare two files and returns the result
+//config:       to standard output.
 
 //kbuild:lib-$(CONFIG_CMP) += cmp.o
 
diff --git a/editors/diff.c b/editors/diff.c
index 975bc4603..62f558944 100644
--- a/editors/diff.c
+++ b/editors/diff.c
@@ -77,12 +77,12 @@
  */
 
 //config:config DIFF
-//config:       bool "diff"
+//config:       bool "diff (13 kb)"
 //config:       default y
 //config:       help
-//config:         diff compares two files or directories and outputs the
-//config:         differences between them in a form that can be given to
-//config:         the patch command.
+//config:       diff compares two files or directories and outputs the
+//config:       differences between them in a form that can be given to
+//config:       the patch command.
 //config:
 //config:config FEATURE_DIFF_LONG_OPTIONS
 //config:       bool "Enable long options"
@@ -94,8 +94,8 @@
 //config:       default y
 //config:       depends on DIFF
 //config:       help
-//config:         This option enables support for directory and subdirectory
-//config:         comparison.
+//config:       This option enables support for directory and subdirectory
+//config:       comparison.
 
 //kbuild:lib-$(CONFIG_DIFF) += diff.o
 
diff --git a/editors/ed.c b/editors/ed.c
index c028b78cb..c594d3da1 100644
--- a/editors/ed.c
+++ b/editors/ed.c
@@ -8,12 +8,12 @@
  */
 
 //config:config ED
-//config:       bool "ed"
+//config:       bool "ed (25 kb)"
 //config:       default y
 //config:       help
-//config:         The original 1970's Unix text editor, from the days of teletypes.
-//config:         Small, simple, evil. Part of SUSv3. If you're not already using
-//config:         this, you don't need it.
+//config:       The original 1970's Unix text editor, from the days of teletypes.
+//config:       Small, simple, evil. Part of SUSv3. If you're not already using
+//config:       this, you don't need it.
 
 //kbuild:lib-$(CONFIG_ED) += ed.o
 
diff --git a/editors/patch.c b/editors/patch.c
index 731a8c58a..81316fae3 100644
--- a/editors/patch.c
+++ b/editors/patch.c
@@ -23,10 +23,10 @@
  */
 
 //config:config PATCH
-//config:       bool "patch"
+//config:       bool "patch (9.1 kb)"
 //config:       default y
 //config:       help
-//config:         Apply a unified diff formatted patch.
+//config:       Apply a unified diff formatted patch.
 
 //applet:IF_PATCH(APPLET(patch, BB_DIR_USR_BIN, BB_SUID_DROP))
 
diff --git a/editors/patch_toybox.c b/editors/patch_toybox.c
index 5174acd6a..2c958d287 100644
--- a/editors/patch_toybox.c
+++ b/editors/patch_toybox.c
@@ -26,7 +26,7 @@
 USE_PATCH(NEWTOY(patch, USE_TOYBOX_DEBUG("x")"up#i:R", TOYFLAG_USR|TOYFLAG_BIN))
 
 config PATCH
-        bool "patch"
+        bool "patch (9.1 kb)"
         default y
         help
           usage: patch [-i file] [-p depth] [-Ru]
diff --git a/editors/sed.c b/editors/sed.c
index b2c7ba829..e10078b7c 100644
--- a/editors/sed.c
+++ b/editors/sed.c
@@ -57,11 +57,11 @@
  */
 
 //config:config SED
-//config:       bool "sed"
+//config:       bool "sed (12 kb)"
 //config:       default y
 //config:       help
-//config:         sed is used to perform text transformations on a file
-//config:         or input from a pipeline.
+//config:       sed is used to perform text transformations on a file
+//config:       or input from a pipeline.
 
 //kbuild:lib-$(CONFIG_SED) += sed.o
 
diff --git a/editors/vi.c b/editors/vi.c
index 900b41cb5..91e954a87 100644
--- a/editors/vi.c
+++ b/editors/vi.c
@@ -21,13 +21,13 @@
  */
 
 //config:config VI
-//config:       bool "vi"
+//config:       bool "vi (22 kb)"
 //config:       default y
 //config:       help
-//config:         'vi' is a text editor. More specifically, it is the One True
-//config:         text editor <grin>. It does, however, have a rather steep
-//config:         learning curve. If you are not already comfortable with 'vi'
-//config:         you may wish to use something else.
+//config:       'vi' is a text editor. More specifically, it is the One True
+//config:       text editor <grin>. It does, however, have a rather steep
+//config:       learning curve. If you are not already comfortable with 'vi'
+//config:       you may wish to use something else.
 //config:
 //config:config FEATURE_VI_MAX_LEN
 //config:       int "Maximum screen width"
@@ -35,77 +35,77 @@
 //config:       default 4096
 //config:       depends on VI
 //config:       help
-//config:         Contrary to what you may think, this is not eating much.
-//config:         Make it smaller than 4k only if you are very limited on memory.
+//config:       Contrary to what you may think, this is not eating much.
+//config:       Make it smaller than 4k only if you are very limited on memory.
 //config:
 //config:config FEATURE_VI_8BIT
 //config:       bool "Allow to display 8-bit chars (otherwise shows dots)"
 //config:       default n
 //config:       depends on VI
 //config:       help
-//config:         If your terminal can display characters with high bit set,
-//config:         you may want to enable this. Note: vi is not Unicode-capable.
-//config:         If your terminal combines several 8-bit bytes into one character
-//config:         (as in Unicode mode), this will not work properly.
+//config:       If your terminal can display characters with high bit set,
+//config:       you may want to enable this. Note: vi is not Unicode-capable.
+//config:       If your terminal combines several 8-bit bytes into one character
+//config:       (as in Unicode mode), this will not work properly.
 //config:
 //config:config FEATURE_VI_COLON
 //config:       bool "Enable \":\" colon commands (no \"ex\" mode)"
 //config:       default y
 //config:       depends on VI
 //config:       help
-//config:         Enable a limited set of colon commands. This does not
-//config:         provide an "ex" mode.
+//config:       Enable a limited set of colon commands. This does not
+//config:       provide an "ex" mode.
 //config:
 //config:config FEATURE_VI_YANKMARK
 //config:       bool "Enable yank/put commands and mark cmds"
 //config:       default y
 //config:       depends on VI
 //config:       help
-//config:         This will enable you to use yank and put, as well as mark.
+//config:       This enables you to use yank and put, as well as mark.
 //config:
 //config:config FEATURE_VI_SEARCH
 //config:       bool "Enable search and replace cmds"
 //config:       default y
 //config:       depends on VI
 //config:       help
-//config:         Select this if you wish to be able to do search and replace.
+//config:       Select this if you wish to be able to do search and replace.
 //config:
 //config:config FEATURE_VI_REGEX_SEARCH
 //config:       bool "Enable regex in search and replace"
 //config:       default n   # Uses GNU regex, which may be unavailable. FIXME
 //config:       depends on FEATURE_VI_SEARCH
 //config:       help
-//config:         Use extended regex search.
+//config:       Use extended regex search.
 //config:
 //config:config FEATURE_VI_USE_SIGNALS
 //config:       bool "Catch signals"
 //config:       default y
 //config:       depends on VI
 //config:       help
-//config:         Selecting this option will make vi signal aware. This will support
-//config:         SIGWINCH to deal with Window Changes, catch ^Z and ^C and alarms.
+//config:       Selecting this option will make vi signal aware. This will support
+//config:       SIGWINCH to deal with Window Changes, catch ^Z and ^C and alarms.
 //config:
 //config:config FEATURE_VI_DOT_CMD
 //config:       bool "Remember previous cmd and \".\" cmd"
 //config:       default y
 //config:       depends on VI
 //config:       help
-//config:         Make vi remember the last command and be able to repeat it.
+//config:       Make vi remember the last command and be able to repeat it.
 //config:
 //config:config FEATURE_VI_READONLY
 //config:       bool "Enable -R option and \"view\" mode"
 //config:       default y
 //config:       depends on VI
 //config:       help
-//config:         Enable the read-only command line option, which allows the user to
-//config:         open a file in read-only mode.
+//config:       Enable the read-only command line option, which allows the user to
+//config:       open a file in read-only mode.
 //config:
 //config:config FEATURE_VI_SETOPTS
 //config:       bool "Enable settable options, ai ic showmatch"
 //config:       default y
 //config:       depends on VI
 //config:       help
-//config:         Enable the editor to set some (ai, ic, showmatch) options.
+//config:       Enable the editor to set some (ai, ic, showmatch) options.
 //config:
 //config:config FEATURE_VI_SET
 //config:       bool "Support :set"
@@ -117,37 +117,37 @@
 //config:       default y
 //config:       depends on VI
 //config:       help
-//config:         Behave nicely with terminals that get resized.
+//config:       Behave nicely with terminals that get resized.
 //config:
 //config:config FEATURE_VI_ASK_TERMINAL
 //config:       bool "Use 'tell me cursor position' ESC sequence to measure window"
 //config:       default y
 //config:       depends on VI
 //config:       help
-//config:         If terminal size can't be retrieved and $LINES/$COLUMNS are not set,
-//config:         this option makes vi perform a last-ditch effort to find it:
-//config:         position cursor to 999,999 and ask terminal to report real
-//config:         cursor position using "ESC [ 6 n" escape sequence, then read stdin.
-//config:         This is not clean but helps a lot on serial lines and such.
+//config:       If terminal size can't be retrieved and $LINES/$COLUMNS are not set,
+//config:       this option makes vi perform a last-ditch effort to find it:
+//config:       position cursor to 999,999 and ask terminal to report real
+//config:       cursor position using "ESC [ 6 n" escape sequence, then read stdin.
+//config:       This is not clean but helps a lot on serial lines and such.
 //config:
 //config:config FEATURE_VI_UNDO
 //config:       bool "Support undo command \"u\""
 //config:       default y
 //config:       depends on VI
 //config:       help
-//config:         Support the 'u' command to undo insertion, deletion, and replacement
-//config:         of text.
+//config:       Support the 'u' command to undo insertion, deletion, and replacement
+//config:       of text.
 //config:
 //config:config FEATURE_VI_UNDO_QUEUE
 //config:       bool "Enable undo operation queuing"
 //config:       default y
 //config:       depends on FEATURE_VI_UNDO
 //config:       help
-//config:         The vi undo functions can use an intermediate queue to greatly lower
-//config:         malloc() calls and overhead. When the maximum size of this queue is
-//config:         reached, the contents of the queue are committed to the undo stack.
-//config:         This increases the size of the undo code and allows some undo
-//config:         operations (especially un-typing/backspacing) to be far more useful.
+//config:       The vi undo functions can use an intermediate queue to greatly lower
+//config:       malloc() calls and overhead. When the maximum size of this queue is
+//config:       reached, the contents of the queue are committed to the undo stack.
+//config:       This increases the size of the undo code and allows some undo
+//config:       operations (especially un-typing/backspacing) to be far more useful.
 //config:
 //config:config FEATURE_VI_UNDO_QUEUE_MAX
 //config:       int "Maximum undo character queue size"
@@ -155,13 +155,13 @@
 //config:       range 32 65536
 //config:       depends on FEATURE_VI_UNDO_QUEUE
 //config:       help
-//config:         This option sets the number of bytes used at runtime for the queue.
-//config:         Smaller values will create more undo objects and reduce the amount
-//config:         of typed or backspaced characters that are grouped into one undo
-//config:         operation; larger values increase the potential size of each undo
-//config:         and will generally malloc() larger objects and less frequently.
-//config:         Unless you want more (or less) frequent "undo points" while typing,
-//config:         you should probably leave this unchanged.
+//config:       This option sets the number of bytes used at runtime for the queue.
+//config:       Smaller values will create more undo objects and reduce the amount
+//config:       of typed or backspaced characters that are grouped into one undo
+//config:       operation; larger values increase the potential size of each undo
+//config:       and will generally malloc() larger objects and less frequently.
+//config:       Unless you want more (or less) frequent "undo points" while typing,
+//config:       you should probably leave this unchanged.
 
 //applet:IF_VI(APPLET(vi, BB_DIR_BIN, BB_SUID_DROP))
 
diff --git a/findutils/find.c b/findutils/find.c
index 0596c0059..69baf065d 100644
--- a/findutils/find.c
+++ b/findutils/find.c
@@ -54,36 +54,36 @@
  */
 
 //config:config FIND
-//config:       bool "find"
+//config:       bool "find (14 kb)"
 //config:       default y
 //config:       help
-//config:         find is used to search your system to find specified files.
+//config:       find is used to search your system to find specified files.
 //config:
 //config:config FEATURE_FIND_PRINT0
 //config:       bool "Enable -print0: NUL-terminated output"
 //config:       default y
 //config:       depends on FIND
 //config:       help
-//config:         Causes output names to be separated by a NUL character
-//config:         rather than a newline. This allows names that contain
-//config:         newlines and other whitespace to be more easily
-//config:         interpreted by other programs.
+//config:       Causes output names to be separated by a NUL character
+//config:       rather than a newline. This allows names that contain
+//config:       newlines and other whitespace to be more easily
+//config:       interpreted by other programs.
 //config:
 //config:config FEATURE_FIND_MTIME
 //config:       bool "Enable -mtime: modified time matching"
 //config:       default y
 //config:       depends on FIND
 //config:       help
-//config:         Allow searching based on the modification time of
-//config:         files, in days.
+//config:       Allow searching based on the modification time of
+//config:       files, in days.
 //config:
 //config:config FEATURE_FIND_MMIN
 //config:       bool "Enable -mmin: modified time matching by minutes"
 //config:       default y
 //config:       depends on FIND
 //config:       help
-//config:         Allow searching based on the modification time of
-//config:         files, in minutes.
+//config:       Allow searching based on the modification time of
+//config:       files, in minutes.
 //config:
 //config:config FEATURE_FIND_PERM
 //config:       bool "Enable -perm: permissions matching"
@@ -95,8 +95,8 @@
 //config:       default y
 //config:       depends on FIND
 //config:       help
-//config:         Enable searching based on file type (file,
-//config:         directory, socket, device, etc.).
+//config:       Enable searching based on file type (file,
+//config:       directory, socket, device, etc.).
 //config:
 //config:config FEATURE_FIND_XDEV
 //config:       bool "Enable -xdev: 'stay in filesystem'"
@@ -113,8 +113,8 @@
 //config:       default y
 //config:       depends on FIND
 //config:       help
-//config:         Support the 'find -newer' option for finding any files which have
-//config:         modification time that is more recent than the specified FILE.
+//config:       Support the 'find -newer' option for finding any files which have
+//config:       modification time that is more recent than the specified FILE.
 //config:
 //config:config FEATURE_FIND_INUM
 //config:       bool "Enable -inum: inode number matching"
@@ -126,18 +126,18 @@
 //config:       default y
 //config:       depends on FIND
 //config:       help
-//config:         Support the 'find -exec' option for executing commands based upon
-//config:         the files matched.
+//config:       Support the 'find -exec' option for executing commands based upon
+//config:       the files matched.
 //config:
 //config:config FEATURE_FIND_EXEC_PLUS
 //config:       bool "Enable -exec ... {} +"
 //config:       default y
 //config:       depends on FEATURE_FIND_EXEC
 //config:       help
-//config:         Support the 'find -exec ... {} +' option for executing commands
-//config:         for all matched files at once.
-//config:         Without this option, -exec + is a synonym for -exec ;
-//config:         (IOW: it works correctly, but without expected speedup)
+//config:       Support the 'find -exec ... {} +' option for executing commands
+//config:       for all matched files at once.
+//config:       Without this option, -exec + is a synonym for -exec ;
+//config:       (IOW: it works correctly, but without expected speedup)
 //config:
 //config:config FEATURE_FIND_USER
 //config:       bool "Enable -user: username/uid matching"
@@ -154,23 +154,23 @@
 //config:       default y
 //config:       depends on FIND
 //config:       help
-//config:         Support the '!' operator to invert the test results.
-//config:         If 'Enable full-blown desktop' is enabled, then will also support
-//config:         the non-POSIX notation '-not'.
+//config:       Support the '!' operator to invert the test results.
+//config:       If 'Enable full-blown desktop' is enabled, then will also support
+//config:       the non-POSIX notation '-not'.
 //config:
 //config:config FEATURE_FIND_DEPTH
 //config:       bool "Enable -depth"
 //config:       default y
 //config:       depends on FIND
 //config:       help
-//config:         Process each directory's contents before the directory itself.
+//config:       Process each directory's contents before the directory itself.
 //config:
 //config:config FEATURE_FIND_PAREN
 //config:       bool "Enable parens in options"
 //config:       default y
 //config:       depends on FIND
 //config:       help
-//config:         Enable usage of parens '(' to specify logical order of arguments.
+//config:       Enable usage of parens '(' to specify logical order of arguments.
 //config:
 //config:config FEATURE_FIND_SIZE
 //config:       bool "Enable -size: file size matching"
@@ -182,45 +182,45 @@
 //config:       default y
 //config:       depends on FIND
 //config:       help
-//config:         If the file is a directory, don't descend into it. Useful for
-//config:         exclusion .svn and CVS directories.
+//config:       If the file is a directory, don't descend into it. Useful for
+//config:       exclusion .svn and CVS directories.
 //config:
 //config:config FEATURE_FIND_DELETE
 //config:       bool "Enable -delete: delete files/dirs"
 //config:       default y
 //config:       depends on FIND && FEATURE_FIND_DEPTH
 //config:       help
-//config:         Support the 'find -delete' option for deleting files and directories.
-//config:         WARNING: This option can do much harm if used wrong. Busybox will not
-//config:         try to protect the user from doing stupid things. Use with care.
+//config:       Support the 'find -delete' option for deleting files and directories.
+//config:       WARNING: This option can do much harm if used wrong. Busybox will not
+//config:       try to protect the user from doing stupid things. Use with care.
 //config:
 //config:config FEATURE_FIND_PATH
 //config:       bool "Enable -path: match pathname with shell pattern"
 //config:       default y
 //config:       depends on FIND
 //config:       help
-//config:         The -path option matches whole pathname instead of just filename.
+//config:       The -path option matches whole pathname instead of just filename.
 //config:
 //config:config FEATURE_FIND_REGEX
 //config:       bool "Enable -regex: match pathname with regex"
 //config:       default y
 //config:       depends on FIND
 //config:       help
-//config:         The -regex option matches whole pathname against regular expression.
+//config:       The -regex option matches whole pathname against regular expression.
 //config:
 //config:config FEATURE_FIND_CONTEXT
 //config:       bool "Enable -context: security context matching"
 //config:       default n
 //config:       depends on FIND && SELINUX
 //config:       help
-//config:         Support the 'find -context' option for matching security context.
+//config:       Support the 'find -context' option for matching security context.
 //config:
 //config:config FEATURE_FIND_LINKS
 //config:       bool "Enable -links: link count matching"
 //config:       default y
 //config:       depends on FIND
 //config:       help
-//config:         Support the 'find -links' option for matching number of links.
+//config:       Support the 'find -links' option for matching number of links.
 
 //applet:IF_FIND(APPLET_NOEXEC(find, find, BB_DIR_USR_BIN, BB_SUID_DROP, find))
 
diff --git a/findutils/grep.c b/findutils/grep.c
index d66d85a53..568ab12c2 100644
--- a/findutils/grep.c
+++ b/findutils/grep.c
@@ -19,31 +19,31 @@
  */
 
 //config:config GREP
-//config:       bool "grep"
+//config:       bool "grep (8.5 kb)"
 //config:       default y
 //config:       help
-//config:         grep is used to search files for a specified pattern.
+//config:       grep is used to search files for a specified pattern.
 //config:
 //config:config EGREP
-//config:       bool "egrep"
+//config:       bool "egrep (7.6 kb)"
 //config:       default y
 //config:       help
-//config:         Alias to "grep -E"
+//config:       Alias to "grep -E".
 //config:
 //config:config FGREP
-//config:       bool "fgrep"
+//config:       bool "fgrep (7.6 kb)"
 //config:       default y
 //config:       help
-//config:         Alias to "grep -F"
+//config:       Alias to "grep -F".
 //config:
 //config:config FEATURE_GREP_CONTEXT
 //config:       bool "Enable before and after context flags (-A, -B and -C)"
 //config:       default y
 //config:       depends on GREP || EGREP || FGREP
 //config:       help
-//config:         Print the specified number of leading (-B) and/or trailing (-A)
-//config:         context surrounding our matching lines.
-//config:         Print the specified number of context lines (-C).
+//config:       Print the specified number of leading (-B) and/or trailing (-A)
+//config:       context surrounding our matching lines.
+//config:       Print the specified number of context lines (-C).
 
 //applet:IF_GREP(APPLET(grep, BB_DIR_BIN, BB_SUID_DROP))
 //                APPLET_ODDNAME:name   main  location    suid_type     help
diff --git a/findutils/xargs.c b/findutils/xargs.c
index eca1185ec..e5384d14c 100644
--- a/findutils/xargs.c
+++ b/findutils/xargs.c
@@ -16,50 +16,50 @@
  */
 
 //config:config XARGS
-//config:       bool "xargs"
+//config:       bool "xargs (6.7 kb)"
 //config:       default y
 //config:       help
-//config:         xargs is used to execute a specified command for
-//config:         every item from standard input.
+//config:       xargs is used to execute a specified command for
+//config:       every item from standard input.
 //config:
 //config:config FEATURE_XARGS_SUPPORT_CONFIRMATION
 //config:       bool "Enable -p: prompt and confirmation"
 //config:       default y
 //config:       depends on XARGS
 //config:       help
-//config:         Support -p: prompt the user whether to run each command
-//config:         line and read a line from the terminal.
+//config:       Support -p: prompt the user whether to run each command
+//config:       line and read a line from the terminal.
 //config:
 //config:config FEATURE_XARGS_SUPPORT_QUOTES
 //config:       bool "Enable single and double quotes and backslash"
 //config:       default y
 //config:       depends on XARGS
 //config:       help
-//config:         Support quoting in the input.
+//config:       Support quoting in the input.
 //config:
 //config:config FEATURE_XARGS_SUPPORT_TERMOPT
 //config:       bool "Enable -x: exit if -s or -n is exceeded"
 //config:       default y
 //config:       depends on XARGS
 //config:       help
-//config:         Support -x: exit if the command size (see the -s or -n option)
-//config:         is exceeded.
+//config:       Support -x: exit if the command size (see the -s or -n option)
+//config:       is exceeded.
 //config:
 //config:config FEATURE_XARGS_SUPPORT_ZERO_TERM
 //config:       bool "Enable -0: NUL-terminated input"
 //config:       default y
 //config:       depends on XARGS
 //config:       help
-//config:         Support -0: input items are terminated by a NUL character
-//config:         instead of whitespace, and the quotes and backslash
-//config:         are not special.
+//config:       Support -0: input items are terminated by a NUL character
+//config:       instead of whitespace, and the quotes and backslash
+//config:       are not special.
 //config:
 //config:config FEATURE_XARGS_SUPPORT_REPL_STR
 //config:       bool "Enable -I STR: string to replace"
 //config:       default y
 //config:       depends on XARGS
 //config:       help
-//config:         Support -I STR and -i[STR] options.
+//config:       Support -I STR and -i[STR] options.
 
 //applet:IF_XARGS(APPLET_NOEXEC(xargs, xargs, BB_DIR_USR_BIN, BB_SUID_DROP, xargs))
 
diff --git a/include/libbb.h b/include/libbb.h
index c58cbc250..105a0b988 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -1511,6 +1511,9 @@ extern void selinux_or_die(void) FAST_FUNC;
  *   HOME=pw->pw_dir
  *   SHELL=shell
  * else does nothing
+ *
+ * NB: CHANGEENV and CLEARENV use setenv() - this leaks memory!
+ * If setup_environment() is used is vforked child, this leaks memory _in parent too_!
  */
 #define SETUP_ENV_CHANGEENV (1 << 0)
 #define SETUP_ENV_CLEARENV  (1 << 1)
diff --git a/init/bootchartd.c b/init/bootchartd.c
index 92aaade0f..b5dd17439 100644
--- a/init/bootchartd.c
+++ b/init/bootchartd.c
@@ -8,43 +8,43 @@
 //kbuild:lib-$(CONFIG_BOOTCHARTD) += bootchartd.o
 
 //config:config BOOTCHARTD
-//config:       bool "bootchartd"
+//config:       bool "bootchartd (10 kb)"
 //config:       default y
 //config:       help
-//config:         bootchartd is commonly used to profile the boot process
-//config:         for the purpose of speeding it up. In this case, it is started
-//config:         by the kernel as the init process. This is configured by adding
-//config:         the init=/sbin/bootchartd option to the kernel command line.
+//config:       bootchartd is commonly used to profile the boot process
+//config:       for the purpose of speeding it up. In this case, it is started
+//config:       by the kernel as the init process. This is configured by adding
+//config:       the init=/sbin/bootchartd option to the kernel command line.
 //config:
-//config:         It can also be used to monitor the resource usage of a specific
-//config:         application or the running system in general. In this case,
-//config:         bootchartd is started interactively by running bootchartd start
-//config:         and stopped using bootchartd stop.
+//config:       It can also be used to monitor the resource usage of a specific
+//config:       application or the running system in general. In this case,
+//config:       bootchartd is started interactively by running bootchartd start
+//config:       and stopped using bootchartd stop.
 //config:
 //config:config FEATURE_BOOTCHARTD_BLOATED_HEADER
 //config:       bool "Compatible, bloated header"
 //config:       default y
 //config:       depends on BOOTCHARTD
 //config:       help
-//config:         Create extended header file compatible with "big" bootchartd.
-//config:         "Big" bootchartd is a shell script and it dumps some
-//config:         "convenient" info int the header, such as:
-//config:           title = Boot chart for `hostname` (`date`)
-//config:           system.uname = `uname -srvm`
-//config:           system.release = `cat /etc/DISTRO-release`
-//config:           system.cpu = `grep '^model name' /proc/cpuinfo | head -1` ($cpucount)
-//config:           system.kernel.options = `cat /proc/cmdline`
-//config:         This data is not mandatory for bootchart graph generation,
-//config:         and is considered bloat. Nevertheless, this option
-//config:         makes bootchartd applet to dump a subset of it.
+//config:       Create extended header file compatible with "big" bootchartd.
+//config:       "Big" bootchartd is a shell script and it dumps some
+//config:       "convenient" info int the header, such as:
+//config:               title = Boot chart for `hostname` (`date`)
+//config:               system.uname = `uname -srvm`
+//config:               system.release = `cat /etc/DISTRO-release`
+//config:               system.cpu = `grep '^model name' /proc/cpuinfo | head -1` ($cpucount)
+//config:               system.kernel.options = `cat /proc/cmdline`
+//config:       This data is not mandatory for bootchart graph generation,
+//config:       and is considered bloat. Nevertheless, this option
+//config:       makes bootchartd applet to dump a subset of it.
 //config:
 //config:config FEATURE_BOOTCHARTD_CONFIG_FILE
 //config:       bool "Support bootchartd.conf"
 //config:       default y
 //config:       depends on BOOTCHARTD
 //config:       help
-//config:         Enable reading and parsing of $PWD/bootchartd.conf
-//config:         and /etc/bootchartd.conf files.
+//config:       Enable reading and parsing of $PWD/bootchartd.conf
+//config:       and /etc/bootchartd.conf files.
 
 #include "libbb.h"
 #include "common_bufsiz.h"
@@ -171,7 +171,9 @@ static int dump_procs(FILE *fp, int look_for_login_process)
                         p++;
                         strchrnul(p, ')')[0] = '\0';
                         /* Is it gdm, kdm or a getty? */
-                        if (((p[0] == 'g' || p[0] == 'k' || p[0] == 'x') && p[1] == 'd' && p[2] == 'm')
+                        if (((p[0] == 'g' || p[0] == 'k' || p[0] == 'x')
+                             && p[1] == 'd' && p[2] == 'm' && p[3] == '\0'
+                            )
                          || strstr(p, "getty")
                         ) {
                                 found_login_process = 1;
@@ -190,7 +192,7 @@ static char *make_tempdir(void)
         if (!tempdir) {
 #ifdef __linux__
                 /* /tmp is not writable (happens when we are used as init).
-                 * Try to mount a tmpfs, them cd and lazily unmount it.
+                 * Try to mount a tmpfs, then cd and lazily unmount it.
                  * Since we unmount it at once, we can mount it anywhere.
                  * Try a few locations which are likely ti exist.
                  */
diff --git a/init/halt.c b/init/halt.c
index f69b89772..632c6cc56 100644
--- a/init/halt.c
+++ b/init/halt.c
@@ -8,42 +8,42 @@
  */
 
 //config:config HALT
-//config:       bool "halt"
+//config:       bool "halt (3.7 kb)"
 //config:       default y
 //config:       help
-//config:         Stop all processes and halt the system.
+//config:       Stop all processes and halt the system.
 //config:
 //config:config POWEROFF
-//config:       bool "poweroff"
+//config:       bool "poweroff (3.7 kb)"
 //config:       default y
 //config:       help
-//config:         Stop all processes and power off the system.
+//config:       Stop all processes and power off the system.
 //config:
 //config:config REBOOT
-//config:       bool "reboot"
+//config:       bool "reboot (3.7 kb)"
 //config:       default y
 //config:       help
-//config:         Stop all processes and reboot the system.
+//config:       Stop all processes and reboot the system.
 //config:
 //config:config FEATURE_CALL_TELINIT
 //config:       bool "Call telinit on shutdown and reboot"
 //config:       default y
 //config:       depends on (HALT || POWEROFF || REBOOT) && !INIT
 //config:       help
-//config:         Call an external program (normally telinit) to facilitate
-//config:         a switch to a proper runlevel.
+//config:       Call an external program (normally telinit) to facilitate
+//config:       a switch to a proper runlevel.
 //config:
-//config:         This option is only available if you selected halt and friends,
-//config:         but did not select init.
+//config:       This option is only available if you selected halt and friends,
+//config:       but did not select init.
 //config:
 //config:config TELINIT_PATH
 //config:       string "Path to telinit executable"
 //config:       default "/sbin/telinit"
 //config:       depends on FEATURE_CALL_TELINIT
 //config:       help
-//config:         When busybox halt and friends have to call external telinit
-//config:         to facilitate proper shutdown, this path is to be used when
-//config:         locating telinit executable.
+//config:       When busybox halt and friends have to call external telinit
+//config:       to facilitate proper shutdown, this path is to be used when
+//config:       locating telinit executable.
 
 //applet:IF_HALT(APPLET(halt, BB_DIR_SBIN, BB_SUID_DROP))
 //                   APPLET_ODDNAME:name      main  location     suid_type     help
diff --git a/init/init.c b/init/init.c
index 4d6355167..ab137a981 100644
--- a/init/init.c
+++ b/init/init.c
@@ -10,38 +10,38 @@
  */
 
 //config:config INIT
-//config:       bool "init"
+//config:       bool "init (9.3 kb)"
 //config:       default y
 //config:       select FEATURE_SYSLOG
 //config:       help
-//config:         init is the first program run when the system boots.
+//config:       init is the first program run when the system boots.
 //config:
 //config:config LINUXRC
 //config:       bool "linuxrc: support running init from initrd (not initramfs)"
 //config:       default y
 //config:       select FEATURE_SYSLOG
 //config:       help
-//config:         Legacy support for running init under the old-style initrd. Allows
-//config:         the name linuxrc to act as init, and it doesn't assume init is PID 1.
+//config:       Legacy support for running init under the old-style initrd. Allows
+//config:       the name linuxrc to act as init, and it doesn't assume init is PID 1.
 //config:
-//config:         This does not apply to initramfs, which runs /init as PID 1 and
-//config:         requires no special support.
+//config:       This does not apply to initramfs, which runs /init as PID 1 and
+//config:       requires no special support.
 //config:
 //config:config FEATURE_USE_INITTAB
 //config:       bool "Support reading an inittab file"
 //config:       default y
 //config:       depends on INIT || LINUXRC
 //config:       help
-//config:         Allow init to read an inittab file when the system boot.
+//config:       Allow init to read an inittab file when the system boot.
 //config:
 //config:config FEATURE_KILL_REMOVED
 //config:       bool "Support killing processes that have been removed from inittab"
 //config:       default n
 //config:       depends on FEATURE_USE_INITTAB
 //config:       help
-//config:         When respawn entries are removed from inittab and a SIGHUP is
-//config:         sent to init, this option will make init kill the processes
-//config:         that have been removed.
+//config:       When respawn entries are removed from inittab and a SIGHUP is
+//config:       sent to init, this option will make init kill the processes
+//config:       that have been removed.
 //config:
 //config:config FEATURE_KILL_DELAY
 //config:       int "How long to wait between TERM and KILL (0 - send TERM only)" if FEATURE_KILL_REMOVED
@@ -49,34 +49,34 @@
 //config:       default 0
 //config:       depends on FEATURE_KILL_REMOVED
 //config:       help
-//config:         With nonzero setting, init sends TERM, forks, child waits N
-//config:         seconds, sends KILL and exits. Setting it too high is unwise
-//config:         (child will hang around for too long and could actually kill
-//config:         the wrong process!)
+//config:       With nonzero setting, init sends TERM, forks, child waits N
+//config:       seconds, sends KILL and exits. Setting it too high is unwise
+//config:       (child will hang around for too long and could actually kill
+//config:       the wrong process!)
 //config:
 //config:config FEATURE_INIT_SCTTY
 //config:       bool "Run commands with leading dash with controlling tty"
 //config:       default y
 //config:       depends on INIT || LINUXRC
 //config:       help
-//config:         If this option is enabled, init will try to give a controlling
-//config:         tty to any command which has leading hyphen (often it's "-/bin/sh").
-//config:         More precisely, init will do "ioctl(STDIN_FILENO, TIOCSCTTY, 0)".
-//config:         If device attached to STDIN_FILENO can be a ctty but is not yet
-//config:         a ctty for other session, it will become this process' ctty.
-//config:         This is not the traditional init behavour, but is often what you want
-//config:         in an embedded system where the console is only accessed during
-//config:         development or for maintenance.
-//config:         NB: using cttyhack applet may work better.
+//config:       If this option is enabled, init will try to give a controlling
+//config:       tty to any command which has leading hyphen (often it's "-/bin/sh").
+//config:       More precisely, init will do "ioctl(STDIN_FILENO, TIOCSCTTY, 0)".
+//config:       If device attached to STDIN_FILENO can be a ctty but is not yet
+//config:       a ctty for other session, it will become this process' ctty.
+//config:       This is not the traditional init behavour, but is often what you want
+//config:       in an embedded system where the console is only accessed during
+//config:       development or for maintenance.
+//config:       NB: using cttyhack applet may work better.
 //config:
 //config:config FEATURE_INIT_SYSLOG
 //config:       bool "Enable init to write to syslog"
 //config:       default y
 //config:       depends on INIT || LINUXRC
 //config:       help
-//config:         If selected, some init messages are sent to syslog.
-//config:         Otherwise, they are sent to VT #5 if linux virtual tty is detected
-//config:         (if not, no separate logging is done).
+//config:       If selected, some init messages are sent to syslog.
+//config:       Otherwise, they are sent to VT #5 if linux virtual tty is detected
+//config:       (if not, no separate logging is done).
 //config:
 //config:config FEATURE_INIT_QUIET
 //config:       bool "Be quiet on boot (no 'init started:' message)"
@@ -88,37 +88,37 @@
 //config:       default n       # not Y because this is a debug option
 //config:       depends on INIT || LINUXRC
 //config:       help
-//config:         If this option is enabled and the file /.init_enable_core
-//config:         exists, then init will call setrlimit() to allow unlimited
-//config:         core file sizes. If this option is disabled, processes
-//config:         will not generate any core files.
+//config:       If this option is enabled and the file /.init_enable_core
+//config:       exists, then init will call setrlimit() to allow unlimited
+//config:       core file sizes. If this option is disabled, processes
+//config:       will not generate any core files.
 //config:
 //config:config INIT_TERMINAL_TYPE
 //config:       string "Initial terminal type"
 //config:       default "linux"
 //config:       depends on INIT || LINUXRC
 //config:       help
-//config:         This is the initial value set by init for the TERM environment
-//config:         variable. This variable is used by programs which make use of
-//config:         extended terminal capabilities.
+//config:       This is the initial value set by init for the TERM environment
+//config:       variable. This variable is used by programs which make use of
+//config:       extended terminal capabilities.
 //config:
-//config:         Note that on Linux, init attempts to detect serial terminal and
-//config:         sets TERM to "vt102" if one is found.
+//config:       Note that on Linux, init attempts to detect serial terminal and
+//config:       sets TERM to "vt102" if one is found.
 //config:
 //config:config FEATURE_INIT_MODIFY_CMDLINE
 //config:       bool "Clear init's command line"
 //config:       default y
 //config:       depends on INIT || LINUXRC
 //config:       help
-//config:         When launched as PID 1 and after parsing its arguments, init
-//config:         wipes all the arguments but argv[0] and rewrites argv[0] to
-//config:         contain only "init", so that its command line appears solely as
-//config:         "init" in tools such as ps.
-//config:         If this option is set to Y, init will keep its original behavior,
-//config:         otherwise, all the arguments including argv[0] will be preserved,
-//config:         be they parsed or ignored by init.
-//config:         The original command-line used to launch init can then be
-//config:         retrieved in /proc/1/cmdline on Linux, for example.
+//config:       When launched as PID 1 and after parsing its arguments, init
+//config:       wipes all the arguments but argv[0] and rewrites argv[0] to
+//config:       contain only "init", so that its command line appears solely as
+//config:       "init" in tools such as ps.
+//config:       If this option is set to Y, init will keep its original behavior,
+//config:       otherwise, all the arguments including argv[0] will be preserved,
+//config:       be they parsed or ignored by init.
+//config:       The original command-line used to launch init can then be
+//config:       retrieved in /proc/1/cmdline on Linux, for example.
 
 //applet:IF_INIT(APPLET(init, BB_DIR_SBIN, BB_SUID_DROP))
 //applet:IF_LINUXRC(APPLET_ODDNAME(linuxrc, init, BB_DIR_ROOT, BB_SUID_DROP, linuxrc))
diff --git a/libbb/Config.src b/libbb/Config.src
index 16c79dbf0..9da8b65ee 100644
--- a/libbb/Config.src
+++ b/libbb/Config.src
@@ -11,14 +11,14 @@ choice
         prompt "Buffer allocation policy"
         default FEATURE_BUFFERS_USE_MALLOC
         help
-          There are 3 ways BusyBox can handle buffer allocations:
-          - Use malloc. This costs code size for the call to xmalloc.
-          - Put them on stack. For some very small machines with limited stack
-            space, this can be deadly. For most folks, this works just fine.
-          - Put them in BSS. This works beautifully for computers with a real
-            MMU (and OS support), but wastes runtime RAM for uCLinux. This
-            behavior was the only one available for BusyBox versions 0.48 and
-            earlier.
+        There are 3 ways BusyBox can handle buffer allocations:
+        - Use malloc. This costs code size for the call to xmalloc.
+        - Put them on stack. For some very small machines with limited stack
+        space, this can be deadly. For most folks, this works just fine.
+        - Put them in BSS. This works beautifully for computers with a real
+        MMU (and OS support), but wastes runtime RAM for uCLinux. This
+        behavior was the only one available for BusyBox versions 0.48 and
+        earlier.
 
 config FEATURE_BUFFERS_USE_MALLOC
         bool "Allocate with Malloc"
@@ -36,52 +36,52 @@ config PASSWORD_MINLEN
         default 6
         range 5 32
         help
-          Minimum allowable password length.
+        Minimum allowable password length.
 
 config MD5_SMALL
         int "MD5: Trade bytes for speed (0:fast, 3:slow)"
         default 1  # all "fast or small" options default to small
         range 0 3
         help
-          Trade binary size versus speed for the md5sum algorithm.
-          Approximate values running uClibc and hashing
-          linux-2.4.4.tar.bz2 were:
-                            user times (sec)  text size (386)
-          0 (fastest)         1.1                6144
-          1                   1.4                5392
-          2                   3.0                5088
-          3 (smallest)        5.1                4912
+        Trade binary size versus speed for the md5sum algorithm.
+        Approximate values running uClibc and hashing
+        linux-2.4.4.tar.bz2 were:
+        value               user times (sec)  text size (386)
+        0 (fastest)         1.1                6144
+        1                   1.4                5392
+        2                   3.0                5088
+        3 (smallest)        5.1                4912
 
 config SHA3_SMALL
         int "SHA3: Trade bytes for speed (0:fast, 1:slow)"
         default 1  # all "fast or small" options default to small
         range 0 1
         help
-          Trade binary size versus speed for the sha3sum algorithm.
-          SHA3_SMALL=0 compared to SHA3_SMALL=1 (approximate):
-          64-bit x86: +270 bytes of code, 45% faster
-          32-bit x86: +450 bytes of code, 75% faster
+        Trade binary size versus speed for the sha3sum algorithm.
+        SHA3_SMALL=0 compared to SHA3_SMALL=1 (approximate):
+        64-bit x86: +270 bytes of code, 45% faster
+        32-bit x86: +450 bytes of code, 75% faster
 
 config FEATURE_FAST_TOP
         bool "Faster /proc scanning code (+100 bytes)"
         default n  # all "fast or small" options default to small
         help
-          This option makes top and ps ~20% faster (or 20% less CPU hungry),
-          but code size is slightly bigger.
+        This option makes top and ps ~20% faster (or 20% less CPU hungry),
+        but code size is slightly bigger.
 
 config FEATURE_ETC_NETWORKS
         bool "Support /etc/networks"
         default n
         help
-          Enable support for network names in /etc/networks. This is
-          a rarely used feature which allows you to use names
-          instead of IP/mask pairs in route command.
+        Enable support for network names in /etc/networks. This is
+        a rarely used feature which allows you to use names
+        instead of IP/mask pairs in route command.
 
 config FEATURE_EDITING
         bool "Command line editing"
         default y
         help
-          Enable line editing (mainly for shell command line).
+        Enable line editing (mainly for shell command line).
 
 config FEATURE_EDITING_MAX_LEN
         int "Maximum length of input"
@@ -89,17 +89,17 @@ config FEATURE_EDITING_MAX_LEN
         default 1024
         depends on FEATURE_EDITING
         help
-          Line editing code uses on-stack buffers for storage.
-          You may want to decrease this parameter if your target machine
-          benefits from smaller stack usage.
+        Line editing code uses on-stack buffers for storage.
+        You may want to decrease this parameter if your target machine
+        benefits from smaller stack usage.
 
 config FEATURE_EDITING_VI
         bool "vi-style line editing commands"
         default n
         depends on FEATURE_EDITING
         help
-          Enable vi-style line editing. In shells, this mode can be
-          turned on and off with "set -o vi" and "set +o vi".
+        Enable vi-style line editing. In shells, this mode can be
+        turned on and off with "set -o vi" and "set +o vi".
 
 config FEATURE_EDITING_HISTORY
         int "History size"
@@ -108,29 +108,29 @@ config FEATURE_EDITING_HISTORY
         default 255
         depends on FEATURE_EDITING
         help
-          Specify command history size (0 - disable).
+        Specify command history size (0 - disable).
 
 config FEATURE_EDITING_SAVEHISTORY
         bool "History saving"
         default y
         depends on FEATURE_EDITING
         help
-          Enable history saving in shells.
+        Enable history saving in shells.
 
 config FEATURE_EDITING_SAVE_ON_EXIT
         bool "Save history on shell exit, not after every command"
         default n
         depends on FEATURE_EDITING_SAVEHISTORY
         help
-          Save history on shell exit, not after every command.
+        Save history on shell exit, not after every command.
 
 config FEATURE_REVERSE_SEARCH
         bool "Reverse history search"
         default y
         depends on FEATURE_EDITING
         help
-          Enable readline-like Ctrl-R combination for reverse history search.
-          Increases code by about 0.5k.
+        Enable readline-like Ctrl-R combination for reverse history search.
+        Increases code by about 0.5k.
 
 config FEATURE_TAB_COMPLETION
         bool "Tab completion"
@@ -147,237 +147,237 @@ config FEATURE_EDITING_FANCY_PROMPT
         default y
         depends on FEATURE_EDITING
         help
-          Setting this option allows for prompts to use things like \w and
-          \$ and escape codes.
+        Setting this option allows for prompts to use things like \w and
+        \$ and escape codes.
 
 config FEATURE_EDITING_ASK_TERMINAL
         bool "Query cursor position from terminal"
         default n
         depends on FEATURE_EDITING
         help
-          Allow usage of "ESC [ 6 n" sequence. Terminal answers back with
-          current cursor position. This information is used to make line
-          editing more robust in some cases.
-          If you are not sure whether your terminals respond to this code
-          correctly, or want to save on code size (about 400 bytes),
-          then do not turn this option on.
+        Allow usage of "ESC [ 6 n" sequence. Terminal answers back with
+        current cursor position. This information is used to make line
+        editing more robust in some cases.
+        If you are not sure whether your terminals respond to this code
+        correctly, or want to save on code size (about 400 bytes),
+        then do not turn this option on.
 
 config LOCALE_SUPPORT
         bool "Enable locale support (system needs locale for this to work)"
         default n
         help
-          Enable this if your system has locale support and you would like
-          busybox to support locale settings.
+        Enable this if your system has locale support and you would like
+        busybox to support locale settings.
 
 config UNICODE_SUPPORT
         bool "Support Unicode"
         default y
         help
-          This makes various applets aware that one byte is not
-          one character on screen.
+        This makes various applets aware that one byte is not
+        one character on screen.
 
-          Busybox aims to eventually work correctly with Unicode displays.
-          Any older encodings are not guaranteed to work.
-          Probably by the time when busybox will be fully Unicode-clean,
-          other encodings will be mainly of historic interest.
+        Busybox aims to eventually work correctly with Unicode displays.
+        Any older encodings are not guaranteed to work.
+        Probably by the time when busybox will be fully Unicode-clean,
+        other encodings will be mainly of historic interest.
 
 config UNICODE_USING_LOCALE
         bool "Use libc routines for Unicode (else uses internal ones)"
         default n
         depends on UNICODE_SUPPORT && LOCALE_SUPPORT
         help
-          With this option on, Unicode support is implemented using libc
-          routines. Otherwise, internal implementation is used.
-          Internal implementation is smaller.
+        With this option on, Unicode support is implemented using libc
+        routines. Otherwise, internal implementation is used.
+        Internal implementation is smaller.
 
 config FEATURE_CHECK_UNICODE_IN_ENV
         bool "Check $LC_ALL, $LC_CTYPE and $LANG environment variables"
         default n
         depends on UNICODE_SUPPORT && !UNICODE_USING_LOCALE
         help
-          With this option on, Unicode support is activated
-          only if locale-related variables have the value of the form
-          "xxxx.utf8"
+        With this option on, Unicode support is activated
+        only if locale-related variables have the value of the form
+        "xxxx.utf8"
 
-          Otherwise, Unicode support will be always enabled and active.
+        Otherwise, Unicode support will be always enabled and active.
 
 config SUBST_WCHAR
         int "Character code to substitute unprintable characters with"
         depends on UNICODE_SUPPORT
         default 63
         help
-          Typical values are 63 for '?' (works with any output device),
-          30 for ASCII substitute control code,
-          65533 (0xfffd) for Unicode replacement character.
+        Typical values are 63 for '?' (works with any output device),
+        30 for ASCII substitute control code,
+        65533 (0xfffd) for Unicode replacement character.
 
 config LAST_SUPPORTED_WCHAR
         int "Range of supported Unicode characters"
         depends on UNICODE_SUPPORT
         default 767
         help
-          Any character with Unicode value bigger than this is assumed
-          to be non-printable on output device. Many applets replace
-          such characters with substitution character.
-
-          The idea is that many valid printable Unicode chars
-          nevertheless are not displayed correctly. Think about
-          combining charachers, double-wide hieroglyphs, obscure
-          characters in dozens of ancient scripts...
-          Many terminals, terminal emulators, xterms etc will fail
-          to handle them correctly. Choose the smallest value
-          which suits your needs.
-
-          Typical values are:
-          126 - ASCII only
-          767 (0x2ff) - there are no combining chars in [0..767] range
+        Any character with Unicode value bigger than this is assumed
+        to be non-printable on output device. Many applets replace
+        such characters with substitution character.
+
+        The idea is that many valid printable Unicode chars
+        nevertheless are not displayed correctly. Think about
+        combining charachers, double-wide hieroglyphs, obscure
+        characters in dozens of ancient scripts...
+        Many terminals, terminal emulators, xterms etc will fail
+        to handle them correctly. Choose the smallest value
+        which suits your needs.
+
+        Typical values are:
+        126 - ASCII only
+        767 (0x2ff) - there are no combining chars in [0..767] range
                         (the range includes Latin 1, Latin Ext. A and B),
                         code is ~700 bytes smaller for this case.
-          4351 (0x10ff) - there are no double-wide chars in [0..4351] range,
+        4351 (0x10ff) - there are no double-wide chars in [0..4351] range,
                         code is ~300 bytes smaller for this case.
-          12799 (0x31ff) - nearly all non-ideographic characters are
+        12799 (0x31ff) - nearly all non-ideographic characters are
                         available in [0..12799] range, including
                         East Asian scripts like katakana, hiragana, hangul,
                         bopomofo...
-          0 - off, any valid printable Unicode character will be printed.
+        0 - off, any valid printable Unicode character will be printed.
 
 config UNICODE_COMBINING_WCHARS
         bool "Allow zero-width Unicode characters on output"
         default n
         depends on UNICODE_SUPPORT
         help
-          With this option off, any Unicode char with width of 0
-          is substituted on output.
+        With this option off, any Unicode char with width of 0
+        is substituted on output.
 
 config UNICODE_WIDE_WCHARS
         bool "Allow wide Unicode characters on output"
         default n
         depends on UNICODE_SUPPORT
         help
-          With this option off, any Unicode char with width > 1
-          is substituted on output.
+        With this option off, any Unicode char with width > 1
+        is substituted on output.
 
 config UNICODE_BIDI_SUPPORT
         bool "Bidirectional character-aware line input"
         default n
         depends on UNICODE_SUPPORT && !UNICODE_USING_LOCALE
         help
-          With this option on, right-to-left Unicode characters
-          are treated differently on input (e.g. cursor movement).
+        With this option on, right-to-left Unicode characters
+        are treated differently on input (e.g. cursor movement).
 
 config UNICODE_NEUTRAL_TABLE
         bool "In bidi input, support non-ASCII neutral chars too"
         default n
         depends on UNICODE_BIDI_SUPPORT
         help
-          In most cases it's enough to treat only ASCII non-letters
-          (i.e. punctuation, numbers and space) as characters
-          with neutral directionality.
-          With this option on, more extensive (and bigger) table
-          of neutral chars will be used.
+        In most cases it's enough to treat only ASCII non-letters
+        (i.e. punctuation, numbers and space) as characters
+        with neutral directionality.
+        With this option on, more extensive (and bigger) table
+        of neutral chars will be used.
 
 config UNICODE_PRESERVE_BROKEN
         bool "Make it possible to enter sequences of chars which are not Unicode"
         default n
         depends on UNICODE_SUPPORT
         help
-          With this option on, on line-editing input (such as used by shells)
-          invalid UTF-8 bytes are not substituted with the selected
-          substitution character.
-          For example, this means that entering 'l', 's', ' ', 0xff, [Enter]
-          at shell prompt will list file named 0xff (single char name
-          with char value 255), not file named '?'.
+        With this option on, on line-editing input (such as used by shells)
+        invalid UTF-8 bytes are not substituted with the selected
+        substitution character.
+        For example, this means that entering 'l', 's', ' ', 0xff, [Enter]
+        at shell prompt will list file named 0xff (single char name
+        with char value 255), not file named '?'.
 
 config FEATURE_NON_POSIX_CP
         bool "Non-POSIX, but safer, copying to special nodes"
         default y
         help
-          With this option, "cp file symlink" will delete symlink
-          and create a regular file. This does not conform to POSIX,
-          but prevents a symlink attack.
-          Similarly, "cp file device" will not send file's data
-          to the device. (To do that, use "cat file >device")
+        With this option, "cp file symlink" will delete symlink
+        and create a regular file. This does not conform to POSIX,
+        but prevents a symlink attack.
+        Similarly, "cp file device" will not send file's data
+        to the device. (To do that, use "cat file >device")
 
 config FEATURE_VERBOSE_CP_MESSAGE
         bool "Give more precise messages when copy fails (cp, mv etc)"
         default n
         help
-          Error messages with this feature enabled:
+        Error messages with this feature enabled:
 
-            $ cp file /does_not_exist/file
-            cp: cannot create '/does_not_exist/file': Path does not exist
-            $ cp file /vmlinuz/file
-            cp: cannot stat '/vmlinuz/file': Path has non-directory component
+        $ cp file /does_not_exist/file
+        cp: cannot create '/does_not_exist/file': Path does not exist
+        $ cp file /vmlinuz/file
+        cp: cannot stat '/vmlinuz/file': Path has non-directory component
 
-          If this feature is not enabled, they will be, respectively:
+        If this feature is not enabled, they will be, respectively:
 
-            cp: cannot create '/does_not_exist/file': No such file or directory
-            cp: cannot stat '/vmlinuz/file': Not a directory
+        cp: cannot create '/does_not_exist/file': No such file or directory
+        cp: cannot stat '/vmlinuz/file': Not a directory
 
-          This will cost you ~60 bytes.
+        This will cost you ~60 bytes.
 
 config FEATURE_USE_SENDFILE
         bool "Use sendfile system call"
         default y
         select PLATFORM_LINUX
         help
-          When enabled, busybox will use the kernel sendfile() function
-          instead of read/write loops to copy data between file descriptors
-          (for example, cp command does this a lot).
-          If sendfile() doesn't work, copying code falls back to read/write
-          loop. sendfile() was originally implemented for faster I/O
-          from files to sockets, but since Linux 2.6.33 it was extended
-          to work for many more file types.
+        When enabled, busybox will use the kernel sendfile() function
+        instead of read/write loops to copy data between file descriptors
+        (for example, cp command does this a lot).
+        If sendfile() doesn't work, copying code falls back to read/write
+        loop. sendfile() was originally implemented for faster I/O
+        from files to sockets, but since Linux 2.6.33 it was extended
+        to work for many more file types.
 
 config FEATURE_COPYBUF_KB
         int "Copy buffer size, in kilobytes"
         range 1 1024
         default 4
         help
-          Size of buffer used by cp, mv, install, wget etc.
-          Buffers which are 4 kb or less will be allocated on stack.
-          Bigger buffers will be allocated with mmap, with fallback to 4 kb
-          stack buffer if mmap fails.
+        Size of buffer used by cp, mv, install, wget etc.
+        Buffers which are 4 kb or less will be allocated on stack.
+        Bigger buffers will be allocated with mmap, with fallback to 4 kb
+        stack buffer if mmap fails.
 
 config FEATURE_SKIP_ROOTFS
         bool "Skip rootfs in mount table"
         default y
         help
-          Ignore rootfs entry in mount table.
+        Ignore rootfs entry in mount table.
 
-          In Linux, kernel has a special filesystem, rootfs, which is initially
-          mounted on /. It contains initramfs data, if kernel is configured
-          to have one. Usually, another file system is mounted over / early
-          in boot process, and therefore most tools which manipulate
-          mount table, such as df, will skip rootfs entry.
+        In Linux, kernel has a special filesystem, rootfs, which is initially
+        mounted on /. It contains initramfs data, if kernel is configured
+        to have one. Usually, another file system is mounted over / early
+        in boot process, and therefore most tools which manipulate
+        mount table, such as df, will skip rootfs entry.
 
-          However, some systems do not mount anything on /.
-          If you need to configure busybox for one of these systems,
-          you may find it useful to turn this option off to make df show
-          initramfs statistics.
+        However, some systems do not mount anything on /.
+        If you need to configure busybox for one of these systems,
+        you may find it useful to turn this option off to make df show
+        initramfs statistics.
 
-          Otherwise, choose Y.
+        Otherwise, choose Y.
 
 config MONOTONIC_SYSCALL
         bool "Use clock_gettime(CLOCK_MONOTONIC) syscall"
         default y
         select PLATFORM_LINUX
         help
-          Use clock_gettime(CLOCK_MONOTONIC) syscall for measuring
-          time intervals (time, ping, traceroute etc need this).
-          Probably requires Linux 2.6+. If not selected, gettimeofday
-          will be used instead (which gives wrong results if date/time
-          is reset).
+        Use clock_gettime(CLOCK_MONOTONIC) syscall for measuring
+        time intervals (time, ping, traceroute etc need this).
+        Probably requires Linux 2.6+. If not selected, gettimeofday
+        will be used instead (which gives wrong results if date/time
+        is reset).
 
 config IOCTL_HEX2STR_ERROR
         bool "Use ioctl names rather than hex values in error messages"
         default y
         help
-          Use ioctl names rather than hex values in error messages
-          (e.g. VT_DISALLOCATE rather than 0x5608). If disabled this
-          saves about 1400 bytes.
+        Use ioctl names rather than hex values in error messages
+        (e.g. VT_DISALLOCATE rather than 0x5608). If disabled this
+        saves about 1400 bytes.
 
 config FEATURE_HWIB
         bool "Support infiniband HW"
         default y
         help
-          Support for printing infiniband addresses in network applets.
+        Support for printing infiniband addresses in network applets.
diff --git a/libbb/common_bufsiz.c b/libbb/common_bufsiz.c
index f1124ba0e..6bc6d7bc9 100644
--- a/libbb/common_bufsiz.c
+++ b/libbb/common_bufsiz.c
@@ -10,35 +10,35 @@
 //config:       bool "Use the end of BSS page"
 //config:       default n
 //config:       help
-//config:         Attempt to reclaim a small unused part of BSS.
+//config:       Attempt to reclaim a small unused part of BSS.
 //config:
-//config:         Executables have the following parts:
-//config:         = read-only executable code and constants, also known as "text"
-//config:         = read-write data
-//config:         = non-initialized (zeroed on demand) data, also known as "bss"
+//config:       Executables have the following parts:
+//config:       = read-only executable code and constants, also known as "text"
+//config:       = read-write data
+//config:       = non-initialized (zeroed on demand) data, also known as "bss"
 //config:
-//config:         At link time, "text" is padded to a full page. At runtime, all "text"
-//config:         pages are mapped RO and executable.
+//config:       At link time, "text" is padded to a full page. At runtime, all "text"
+//config:       pages are mapped RO and executable.
 //config:
-//config:         "Data" starts on the next page boundary, but is not padded
-//config:         to a full page at the end. "Bss" starts wherever "data" ends.
-//config:         At runtime, "data" pages are mapped RW and they are file-backed
-//config:         (this includes a small portion of "bss" which may live in the last
-//config:         partial page of "data").
-//config:         Pages which are fully in "bss" are mapped to anonymous memory.
+//config:       "Data" starts on the next page boundary, but is not padded
+//config:       to a full page at the end. "Bss" starts wherever "data" ends.
+//config:       At runtime, "data" pages are mapped RW and they are file-backed
+//config:       (this includes a small portion of "bss" which may live in the last
+//config:       partial page of "data").
+//config:       Pages which are fully in "bss" are mapped to anonymous memory.
 //config:
-//config:         "Bss" end is usually not page-aligned. There is an unused space
-//config:         in the last page. Linker marks its start with the "_end" symbol.
+//config:       "Bss" end is usually not page-aligned. There is an unused space
+//config:       in the last page. Linker marks its start with the "_end" symbol.
 //config:
-//config:         This option will attempt to use that space for bb_common_bufsiz1[]
-//config:         array. If it fits after _end, it will be used, and COMMON_BUFSIZE
-//config:         will be enlarged from its guaranteed minimum size of 1 kbyte.
-//config:         This may require recompilation a second time, since value of _end
-//config:         is known only after final link.
+//config:       This option will attempt to use that space for bb_common_bufsiz1[]
+//config:       array. If it fits after _end, it will be used, and COMMON_BUFSIZE
+//config:       will be enlarged from its guaranteed minimum size of 1 kbyte.
+//config:       This may require recompilation a second time, since value of _end
+//config:       is known only after final link.
 //config:
-//config:         If you are getting a build error like this:
-//config:               appletlib.c:(.text.main+0xd): undefined reference to '_end'
-//config:         disable this option.
+//config:       If you are getting a build error like this:
+//config:               appletlib.c:(.text.main+0xd): undefined reference to '_end'
+//config:       disable this option.
 
 //kbuild:lib-y += common_bufsiz.o
 
diff --git a/libbb/parse_config.c b/libbb/parse_config.c
index 408439766..307ae2cd2 100644
--- a/libbb/parse_config.c
+++ b/libbb/parse_config.c
@@ -13,7 +13,7 @@
 ////config:     bool "Uniform config file parser debugging applet: parse"
 ////config:     default n
 ////config:     help
-////config:       Typical usage of parse API:
+////config:     Typical usage of parse API:
 ////config:             char *t[3];
 ////config:             parser_t *p = config_open(filename);
 ////config:             while (config_read(p, t, 3, 0, delimiters, flags)) { // 1..3 tokens
diff --git a/libbb/u_signal_names.c b/libbb/u_signal_names.c
index b49714f2a..bf984a44e 100644
--- a/libbb/u_signal_names.c
+++ b/libbb/u_signal_names.c
@@ -11,8 +11,8 @@
 //config:       bool "Support RTMIN[+n] and RTMAX[-n] signal names"
 //config:       default y
 //config:       help
-//config:         Support RTMIN[+n] and RTMAX[-n] signal names
-//config:         in kill, killall etc. This costs ~250 bytes.
+//config:       Support RTMIN[+n] and RTMAX[-n] signal names
+//config:       in kill, killall etc. This costs ~250 bytes.
 
 #include "libbb.h"
 
diff --git a/libbb/xfuncs_printf.c b/libbb/xfuncs_printf.c
index 1b11caf6b..f569b0263 100644
--- a/libbb/xfuncs_printf.c
+++ b/libbb/xfuncs_printf.c
@@ -344,20 +344,28 @@ void FAST_FUNC xsetenv(const char *key, const char *value)
  */
 void FAST_FUNC bb_unsetenv(const char *var)
 {
-        char *tp = strchr(var, '=');
-
-        if (!tp) {
-                unsetenv(var);
-                return;
+        char onstack[128 - 16]; /* smaller stack setup code on x86 */
+        char *tp;
+
+        tp = strchr(var, '=');
+        if (tp) {
+                /* In case var was putenv'ed, we can't replace '='
+                 * with NUL and unsetenv(var) - it won't work,
+                 * env is modified by the replacement, unsetenv
+                 * sees "VAR" instead of "VAR=VAL" and does not remove it!
+                 * Horror :(
+                 */
+                unsigned sz = tp - var;
+                if (sz < sizeof(onstack)) {
+                        ((char*)mempcpy(onstack, var, sz))[0] = '\0';
+                        tp = NULL;
+                        var = onstack;
+                } else {
+                        /* unlikely: very long var name */
+                        var = tp = xstrndup(var, sz);
+                }
         }
-
-        /* In case var was putenv'ed, we can't replace '='
-         * with NUL and unsetenv(var) - it won't work,
-         * env is modified by the replacement, unsetenv
-         * sees "VAR" instead of "VAR=VAL" and does not remove it!
-         * horror :( */
-        tp = xstrndup(var, tp - var);
-        unsetenv(tp);
+        unsetenv(var);
         free(tp);
 }
 
diff --git a/loginutils/Config.src b/loginutils/Config.src
index beb4eb855..680f42118 100644
--- a/loginutils/Config.src
+++ b/loginutils/Config.src
@@ -9,87 +9,87 @@ config FEATURE_SHADOWPASSWDS
         bool "Support shadow passwords"
         default y
         help
-          Build support for shadow password in /etc/shadow. This file is only
-          readable by root and thus the encrypted passwords are no longer
-          publicly readable.
+        Build support for shadow password in /etc/shadow. This file is only
+        readable by root and thus the encrypted passwords are no longer
+        publicly readable.
 
 config USE_BB_PWD_GRP
         bool "Use internal password and group functions rather than system functions"
         default y
         help
-          If you leave this disabled, busybox will use the system's password
-          and group functions. And if you are using the GNU C library
-          (glibc), you will then need to install the /etc/nsswitch.conf
-          configuration file and the required /lib/libnss_* libraries in
-          order for the password and group functions to work. This generally
-          makes your embedded system quite a bit larger.
+        If you leave this disabled, busybox will use the system's password
+        and group functions. And if you are using the GNU C library
+        (glibc), you will then need to install the /etc/nsswitch.conf
+        configuration file and the required /lib/libnss_* libraries in
+        order for the password and group functions to work. This generally
+        makes your embedded system quite a bit larger.
 
-          Enabling this option will cause busybox to directly access the
-          system's /etc/password, /etc/group files (and your system will be
-          smaller, and I will get fewer emails asking about how glibc NSS
-          works). When this option is enabled, you will not be able to use
-          PAM to access remote LDAP password servers and whatnot. And if you
-          want hostname resolution to work with glibc, you still need the
-          /lib/libnss_* libraries.
+        Enabling this option will cause busybox to directly access the
+        system's /etc/password, /etc/group files (and your system will be
+        smaller, and I will get fewer emails asking about how glibc NSS
+        works). When this option is enabled, you will not be able to use
+        PAM to access remote LDAP password servers and whatnot. And if you
+        want hostname resolution to work with glibc, you still need the
+        /lib/libnss_* libraries.
 
-          If you need to use glibc's nsswitch.conf mechanism
-          (e.g. if user/group database is NOT stored in /etc/passwd etc),
-          you must NOT use this option.
+        If you need to use glibc's nsswitch.conf mechanism
+        (e.g. if user/group database is NOT stored in /etc/passwd etc),
+        you must NOT use this option.
 
-          If you enable this option, it will add about 1.5k.
+        If you enable this option, it will add about 1.5k.
 
 config USE_BB_SHADOW
         bool "Use internal shadow password functions"
         default y
         depends on USE_BB_PWD_GRP && FEATURE_SHADOWPASSWDS
         help
-          If you leave this disabled, busybox will use the system's shadow
-          password handling functions. And if you are using the GNU C library
-          (glibc), you will then need to install the /etc/nsswitch.conf
-          configuration file and the required /lib/libnss_* libraries in
-          order for the shadow password functions to work. This generally
-          makes your embedded system quite a bit larger.
+        If you leave this disabled, busybox will use the system's shadow
+        password handling functions. And if you are using the GNU C library
+        (glibc), you will then need to install the /etc/nsswitch.conf
+        configuration file and the required /lib/libnss_* libraries in
+        order for the shadow password functions to work. This generally
+        makes your embedded system quite a bit larger.
 
-          Enabling this option will cause busybox to directly access the
-          system's /etc/shadow file when handling shadow passwords. This
-          makes your system smaller (and I will get fewer emails asking about
-          how glibc NSS works). When this option is enabled, you will not be
-          able to use PAM to access shadow passwords from remote LDAP
-          password servers and whatnot.
+        Enabling this option will cause busybox to directly access the
+        system's /etc/shadow file when handling shadow passwords. This
+        makes your system smaller (and I will get fewer emails asking about
+        how glibc NSS works). When this option is enabled, you will not be
+        able to use PAM to access shadow passwords from remote LDAP
+        password servers and whatnot.
 
 config USE_BB_CRYPT
         bool "Use internal crypt functions"
         default y
         help
-          Busybox has internal DES and MD5 crypt functions.
-          They produce results which are identical to corresponding
-          standard C library functions.
+        Busybox has internal DES and MD5 crypt functions.
+        They produce results which are identical to corresponding
+        standard C library functions.
 
-          If you leave this disabled, busybox will use the system's
-          crypt functions. Most C libraries use large (~70k)
-          static buffers there, and also combine them with more general
-          DES encryption/decryption.
+        If you leave this disabled, busybox will use the system's
+        crypt functions. Most C libraries use large (~70k)
+        static buffers there, and also combine them with more general
+        DES encryption/decryption.
 
-          For busybox, having large static buffers is undesirable,
-          especially on NOMMU machines. Busybox also doesn't need
-          DES encryption/decryption and can do with smaller code.
+        For busybox, having large static buffers is undesirable,
+        especially on NOMMU machines. Busybox also doesn't need
+        DES encryption/decryption and can do with smaller code.
 
-          If you enable this option, it will add about 4.8k of code
-          if you are building dynamically linked executable.
-          In static build, it makes code _smaller_ by about 1.2k,
-          and likely many kilobytes less of bss.
+        If you enable this option, it will add about 4.8k of code
+        if you are building dynamically linked executable.
+        In static build, it makes code _smaller_ by about 1.2k,
+        and likely many kilobytes less of bss.
 
 config USE_BB_CRYPT_SHA
         bool "Enable SHA256/512 crypt functions"
         default y
         depends on USE_BB_CRYPT
         help
-          Enable this if you have passwords starting with "$5$" or "$6$"
-          in your /etc/passwd or /etc/shadow files. These passwords
-          are hashed using SHA256 and SHA512 algorithms. Support for them
-          was added to glibc in 2008.
-          With this option off, login will fail password check for any
-          user which has password encrypted with these algorithms.
+        Enable this if you have passwords starting with "$5$" or "$6$"
+        in your /etc/passwd or /etc/shadow files. These passwords
+        are hashed using SHA256 and SHA512 algorithms. Support for them
+        was added to glibc in 2008.
+        With this option off, login will fail password check for any
+        user which has password encrypted with these algorithms.
 
 INSERT
 
diff --git a/loginutils/add-remove-shell.c b/loginutils/add-remove-shell.c
index 54b62c773..750b44bd6 100644
--- a/loginutils/add-remove-shell.c
+++ b/loginutils/add-remove-shell.c
@@ -8,16 +8,16 @@
  * for details.
  */
 //config:config ADD_SHELL
-//config:       bool "add-shell"
-//config:       default y if DESKTOP
-//config:       help
-//config:         Add shells to /etc/shells.
+//config:       bool "add-shell (2.8 kb)"
+//config:       default y if DESKTOP
+//config:       help
+//config:       Add shells to /etc/shells.
 //config:
 //config:config REMOVE_SHELL
-//config:       bool "remove-shell"
-//config:       default y if DESKTOP
-//config:       help
-//config:         Remove shells from /etc/shells.
+//config:       bool "remove-shell (2.7 kb)"
+//config:       default y if DESKTOP
+//config:       help
+//config:       Remove shells from /etc/shells.
 
 //                       APPLET_ODDNAME:name          main              location         suid_type     help
 //applet:IF_ADD_SHELL(   APPLET_ODDNAME(add-shell   , add_remove_shell, BB_DIR_USR_SBIN, BB_SUID_DROP, add_shell   ))
diff --git a/loginutils/addgroup.c b/loginutils/addgroup.c
index 94da4efbb..b197fc149 100644
--- a/loginutils/addgroup.c
+++ b/loginutils/addgroup.c
@@ -10,10 +10,10 @@
  *
  */
 //config:config ADDGROUP
-//config:       bool "addgroup"
+//config:       bool "addgroup (8.2 kb)"
 //config:       default y
 //config:       help
-//config:         Utility for creating a new group account.
+//config:       Utility for creating a new group account.
 //config:
 //config:config FEATURE_ADDGROUP_LONG_OPTIONS
 //config:       bool "Enable long options"
@@ -25,9 +25,9 @@
 //config:       default y
 //config:       depends on ADDGROUP
 //config:       help
-//config:         If called with two non-option arguments,
-//config:         addgroup will add an existing user to an
-//config:         existing group.
+//config:       If called with two non-option arguments,
+//config:       addgroup will add an existing user to an
+//config:       existing group.
 
 //applet:IF_ADDGROUP(APPLET(addgroup, BB_DIR_USR_SBIN, BB_SUID_DROP))
 
diff --git a/loginutils/adduser.c b/loginutils/adduser.c
index 40bc816a1..ef18278ac 100644
--- a/loginutils/adduser.c
+++ b/loginutils/adduser.c
@@ -8,10 +8,10 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config ADDUSER
-//config:       bool "adduser"
+//config:       bool "adduser (15 kb)"
 //config:       default y
 //config:       help
-//config:         Utility for creating a new user account.
+//config:       Utility for creating a new user account.
 //config:
 //config:config FEATURE_ADDUSER_LONG_OPTIONS
 //config:       bool "Enable long options"
@@ -23,19 +23,19 @@
 //config:       default n
 //config:       depends on ADDUSER || ADDGROUP
 //config:       help
-//config:         Enable sanity check on user and group names in adduser and addgroup.
-//config:         To avoid problems, the user or group name should consist only of
-//config:         letters, digits, underscores, periods, at signs and dashes,
-//config:         and not start with a dash (as defined by IEEE Std 1003.1-2001).
-//config:         For compatibility with Samba machine accounts "$" is also supported
-//config:         at the end of the user or group name.
+//config:       Enable sanity check on user and group names in adduser and addgroup.
+//config:       To avoid problems, the user or group name should consist only of
+//config:       letters, digits, underscores, periods, at signs and dashes,
+//config:       and not start with a dash (as defined by IEEE Std 1003.1-2001).
+//config:       For compatibility with Samba machine accounts "$" is also supported
+//config:       at the end of the user or group name.
 //config:
 //config:config LAST_ID
 //config:       int "Last valid uid or gid for adduser and addgroup"
 //config:       depends on ADDUSER || ADDGROUP
 //config:       default 60000
 //config:       help
-//config:         Last valid uid or gid for adduser and addgroup
+//config:       Last valid uid or gid for adduser and addgroup
 //config:
 //config:config FIRST_SYSTEM_ID
 //config:       int "First valid system uid or gid for adduser and addgroup"
@@ -43,7 +43,7 @@
 //config:       range 0 LAST_ID
 //config:       default 100
 //config:       help
-//config:         First valid system uid or gid for adduser and addgroup
+//config:       First valid system uid or gid for adduser and addgroup
 //config:
 //config:config LAST_SYSTEM_ID
 //config:       int "Last valid system uid or gid for adduser and addgroup"
@@ -51,7 +51,7 @@
 //config:       range FIRST_SYSTEM_ID LAST_ID
 //config:       default 999
 //config:       help
-//config:         Last valid system uid or gid for adduser and addgroup
+//config:       Last valid system uid or gid for adduser and addgroup
 
 //applet:IF_ADDUSER(APPLET(adduser, BB_DIR_USR_SBIN, BB_SUID_DROP))
 
diff --git a/loginutils/chpasswd.c b/loginutils/chpasswd.c
index baafd35c8..e390da647 100644
--- a/loginutils/chpasswd.c
+++ b/loginutils/chpasswd.c
@@ -6,18 +6,18 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config CHPASSWD
-//config:       bool "chpasswd"
+//config:       bool "chpasswd (18 kb)"
 //config:       default y
 //config:       help
-//config:         Reads a file of user name and password pairs from standard input
-//config:         and uses this information to update a group of existing users.
+//config:       Reads a file of user name and password pairs from standard input
+//config:       and uses this information to update a group of existing users.
 //config:
 //config:config FEATURE_DEFAULT_PASSWD_ALGO
 //config:       string "Default encryption method (passwd -a, cryptpw -m, chpasswd -c ALG)"
 //config:       default "des"
 //config:       depends on PASSWD || CRYPTPW || CHPASSWD
 //config:       help
-//config:         Possible choices are "d[es]", "m[d5]", "s[ha256]" or "sha512".
+//config:       Possible choices are "d[es]", "m[d5]", "s[ha256]" or "sha512".
 
 //applet:IF_CHPASSWD(APPLET(chpasswd, BB_DIR_USR_SBIN, BB_SUID_DROP))
 
diff --git a/loginutils/cryptpw.c b/loginutils/cryptpw.c
index 3dc8232e0..f8906c59a 100644
--- a/loginutils/cryptpw.c
+++ b/loginutils/cryptpw.c
@@ -10,19 +10,19 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config CRYPTPW
-//config:       bool "cryptpw"
+//config:       bool "cryptpw (14 kb)"
 //config:       default y
 //config:       help
-//config:         Encrypts the given password with the crypt(3) libc function
-//config:         using the given salt.
+//config:       Encrypts the given password with the crypt(3) libc function
+//config:       using the given salt.
 //config:
 //config:config MKPASSWD
-//config:       bool "mkpasswd"
+//config:       bool "mkpasswd (15 kb)"
 //config:       default y
 //config:       help
-//config:         Encrypts the given password with the crypt(3) libc function
-//config:         using the given salt. Debian has this utility under mkpasswd
-//config:         name. Busybox provides mkpasswd as an alias for cryptpw.
+//config:       Encrypts the given password with the crypt(3) libc function
+//config:       using the given salt. Debian has this utility under mkpasswd
+//config:       name. Busybox provides mkpasswd as an alias for cryptpw.
 
 //applet:IF_CRYPTPW(APPLET(cryptpw, BB_DIR_USR_BIN, BB_SUID_DROP))
 //                   APPLET_ODDNAME:name      main     location        suid_type     help
diff --git a/loginutils/deluser.c b/loginutils/deluser.c
index fbb1614fb..3b6bd952d 100644
--- a/loginutils/deluser.c
+++ b/loginutils/deluser.c
@@ -9,24 +9,24 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config DELUSER
-//config:       bool "deluser"
+//config:       bool "deluser (8.4 kb)"
 //config:       default y
 //config:       help
-//config:         Utility for deleting a user account.
+//config:       Utility for deleting a user account.
 //config:
 //config:config DELGROUP
-//config:       bool "delgroup"
+//config:       bool "delgroup (5.6 kb)"
 //config:       default y
 //config:       help
-//config:         Utility for deleting a group account.
+//config:       Utility for deleting a group account.
 //config:
 //config:config FEATURE_DEL_USER_FROM_GROUP
 //config:       bool "Support removing users from groups"
 //config:       default y
 //config:       depends on DELGROUP
 //config:       help
-//config:         If called with two non-option arguments, deluser
-//config:         or delgroup will remove an user from a specified group.
+//config:       If called with two non-option arguments, deluser
+//config:       or delgroup will remove an user from a specified group.
 
 //applet:IF_DELUSER(APPLET(deluser, BB_DIR_USR_SBIN, BB_SUID_DROP))
 //applet:IF_DELGROUP(APPLET_ODDNAME(delgroup, deluser, BB_DIR_USR_SBIN, BB_SUID_DROP, delgroup))
diff --git a/loginutils/getty.c b/loginutils/getty.c
index ba6c784a3..fd5116d08 100644
--- a/loginutils/getty.c
+++ b/loginutils/getty.c
@@ -22,23 +22,23 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config GETTY
-//config:       bool "getty"
+//config:       bool "getty (10 kb)"
 //config:       default y
 //config:       select FEATURE_SYSLOG
 //config:       help
-//config:         getty lets you log in on a tty. It is normally invoked by init.
+//config:       getty lets you log in on a tty. It is normally invoked by init.
 //config:
-//config:         Note that you can save a few bytes by disabling it and
-//config:         using login applet directly.
-//config:         If you need to reset tty attributes before calling login,
-//config:         this script approximates getty:
+//config:       Note that you can save a few bytes by disabling it and
+//config:       using login applet directly.
+//config:       If you need to reset tty attributes before calling login,
+//config:       this script approximates getty:
 //config:
-//config:         exec </dev/$1 >/dev/$1 2>&1 || exit 1
-//config:         reset
-//config:         stty sane; stty ispeed 38400; stty ospeed 38400
-//config:         printf "%s login: " "`hostname`"
-//config:         read -r login
-//config:         exec /bin/login "$login"
+//config:       exec </dev/$1 >/dev/$1 2>&1 || exit 1
+//config:       reset
+//config:       stty sane; stty ispeed 38400; stty ospeed 38400
+//config:       printf "%s login: " "`hostname`"
+//config:       read -r login
+//config:       exec /bin/login "$login"
 
 //applet:IF_GETTY(APPLET(getty, BB_DIR_SBIN, BB_SUID_DROP))
 
diff --git a/loginutils/login.c b/loginutils/login.c
index be05def09..39f703f07 100644
--- a/loginutils/login.c
+++ b/loginutils/login.c
@@ -3,50 +3,50 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config LOGIN
-//config:       bool "login"
+//config:       bool "login (24 kb)"
 //config:       default y
 //config:       select FEATURE_SYSLOG
 //config:       help
-//config:         login is used when signing onto a system.
+//config:       login is used when signing onto a system.
 //config:
-//config:         Note that Busybox binary must be setuid root for this applet to
-//config:         work properly.
+//config:       Note that Busybox binary must be setuid root for this applet to
+//config:       work properly.
 //config:
 //config:config LOGIN_SESSION_AS_CHILD
 //config:       bool "Run logged in session in a child process"
 //config:       default y if PAM
 //config:       depends on LOGIN
 //config:       help
-//config:         Run the logged in session in a child process.  This allows
-//config:         login to clean up things such as utmp entries or PAM sessions
-//config:         when the login session is complete.  If you use PAM, you
-//config:         almost always would want this to be set to Y, else PAM session
-//config:         will not be cleaned up.
+//config:       Run the logged in session in a child process.  This allows
+//config:       login to clean up things such as utmp entries or PAM sessions
+//config:       when the login session is complete.  If you use PAM, you
+//config:       almost always would want this to be set to Y, else PAM session
+//config:       will not be cleaned up.
 //config:
 //config:config LOGIN_SCRIPTS
 //config:       bool "Support login scripts"
 //config:       depends on LOGIN
 //config:       default y
 //config:       help
-//config:         Enable this if you want login to execute $LOGIN_PRE_SUID_SCRIPT
-//config:         just prior to switching from root to logged-in user.
+//config:       Enable this if you want login to execute $LOGIN_PRE_SUID_SCRIPT
+//config:       just prior to switching from root to logged-in user.
 //config:
 //config:config FEATURE_NOLOGIN
 //config:       bool "Support /etc/nologin"
 //config:       default y
 //config:       depends on LOGIN
 //config:       help
-//config:         The file /etc/nologin is used by (some versions of) login(1).
-//config:         If it exists, non-root logins are prohibited.
+//config:       The file /etc/nologin is used by (some versions of) login(1).
+//config:       If it exists, non-root logins are prohibited.
 //config:
 //config:config FEATURE_SECURETTY
 //config:       bool "Support /etc/securetty"
 //config:       default y
 //config:       depends on LOGIN
 //config:       help
-//config:         The file /etc/securetty is used by (some versions of) login(1).
-//config:         The file contains the device names of tty lines (one per line,
-//config:         without leading /dev/) on which root is allowed to login.
+//config:       The file /etc/securetty is used by (some versions of) login(1).
+//config:       The file contains the device names of tty lines (one per line,
+//config:       without leading /dev/) on which root is allowed to login.
 
 //applet:/* Needs to be run by root or be suid root - needs to change uid and gid: */
 //applet:IF_LOGIN(APPLET(login, BB_DIR_BIN, BB_SUID_REQUIRE))
diff --git a/loginutils/passwd.c b/loginutils/passwd.c
index b7b7423fd..03f8ad0a4 100644
--- a/loginutils/passwd.c
+++ b/loginutils/passwd.c
@@ -3,24 +3,24 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config PASSWD
-//config:       bool "passwd"
+//config:       bool "passwd (21 kb)"
 //config:       default y
 //config:       select FEATURE_SYSLOG
 //config:       help
-//config:         passwd changes passwords for user and group accounts. A normal user
-//config:         may only change the password for his/her own account, the super user
-//config:         may change the password for any account. The administrator of a group
-//config:         may change the password for the group.
+//config:       passwd changes passwords for user and group accounts. A normal user
+//config:       may only change the password for his/her own account, the super user
+//config:       may change the password for any account. The administrator of a group
+//config:       may change the password for the group.
 //config:
-//config:         Note that Busybox binary must be setuid root for this applet to
-//config:         work properly.
+//config:       Note that Busybox binary must be setuid root for this applet to
+//config:       work properly.
 //config:
 //config:config FEATURE_PASSWD_WEAK_CHECK
 //config:       bool "Check new passwords for weakness"
 //config:       default y
 //config:       depends on PASSWD
 //config:       help
-//config:         With this option passwd will refuse new passwords which are "weak".
+//config:       With this option passwd will refuse new passwords which are "weak".
 
 //applet:/* Needs to be run by root or be suid root - needs to change /etc/{passwd,shadow}: */
 //applet:IF_PASSWD(APPLET(passwd, BB_DIR_USR_BIN, BB_SUID_REQUIRE))
diff --git a/loginutils/su.c b/loginutils/su.c
index 4cce82405..41291ea8f 100644
--- a/loginutils/su.c
+++ b/loginutils/su.c
@@ -5,14 +5,14 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config SU
-//config:       bool "su"
+//config:       bool "su (19 kb)"
 //config:       default y
 //config:       select FEATURE_SYSLOG
 //config:       help
-//config:         su is used to become another user during a login session.
-//config:         Invoked without a username, su defaults to becoming the super user.
-//config:         Note that busybox binary must be setuid root for this applet to
-//config:         work properly.
+//config:       su is used to become another user during a login session.
+//config:       Invoked without a username, su defaults to becoming the super user.
+//config:       Note that busybox binary must be setuid root for this applet to
+//config:       work properly.
 //config:
 //config:config FEATURE_SU_SYSLOG
 //config:       bool "Log to syslog all attempts to use su"
diff --git a/loginutils/sulogin.c b/loginutils/sulogin.c
index 2e32e2bbd..d5a463cac 100644
--- a/loginutils/sulogin.c
+++ b/loginutils/sulogin.c
@@ -5,12 +5,12 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config SULOGIN
-//config:       bool "sulogin"
+//config:       bool "sulogin (17 kb)"
 //config:       default y
 //config:       select FEATURE_SYSLOG
 //config:       help
-//config:         sulogin is invoked when the system goes into single user
-//config:         mode (this is done through an entry in inittab).
+//config:       sulogin is invoked when the system goes into single user
+//config:       mode (this is done through an entry in inittab).
 
 //applet:IF_SULOGIN(APPLET(sulogin, BB_DIR_SBIN, BB_SUID_DROP))
 
diff --git a/loginutils/vlock.c b/loginutils/vlock.c
index 5ba6a8780..f22abd3aa 100644
--- a/loginutils/vlock.c
+++ b/loginutils/vlock.c
@@ -16,13 +16,13 @@
  * It now works with md5, sha1, etc passwords.
  */
 //config:config VLOCK
-//config:       bool "vlock"
+//config:       bool "vlock (17 kb)"
 //config:       default y
 //config:       help
-//config:         Build the "vlock" applet which allows you to lock (virtual) terminals.
+//config:       Build the "vlock" applet which allows you to lock (virtual) terminals.
 //config:
-//config:         Note that Busybox binary must be setuid root for this applet to
-//config:         work properly.
+//config:       Note that Busybox binary must be setuid root for this applet to
+//config:       work properly.
 
 //applet:/* Needs to be run by root or be suid root - needs to change uid and gid: */
 //applet:IF_VLOCK(APPLET(vlock, BB_DIR_USR_BIN, BB_SUID_REQUIRE))
diff --git a/mailutils/Config.src b/mailutils/Config.src
index e45a0f8fb..6d47163e4 100644
--- a/mailutils/Config.src
+++ b/mailutils/Config.src
@@ -7,6 +7,6 @@ config FEATURE_MIME_CHARSET
         default "us-ascii"
         depends on MAKEMIME || REFORMIME || SENDMAIL
         help
-          Default charset of the message.
+        Default charset of the message.
 
 endmenu
diff --git a/mailutils/makemime.c b/mailutils/makemime.c
index 78f78bbcc..577bcde39 100644
--- a/mailutils/makemime.c
+++ b/mailutils/makemime.c
@@ -7,10 +7,10 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config MAKEMIME
-//config:       bool "makemime"
+//config:       bool "makemime (5.9 kb)"
 //config:       default y
 //config:       help
-//config:         Create MIME-formatted messages.
+//config:       Create MIME-formatted messages.
 
 //applet:IF_MAKEMIME(APPLET(makemime, BB_DIR_BIN, BB_SUID_DROP))
 
diff --git a/mailutils/popmaildir.c b/mailutils/popmaildir.c
index ffe373865..1695a9bb8 100644
--- a/mailutils/popmaildir.c
+++ b/mailutils/popmaildir.c
@@ -10,21 +10,21 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config POPMAILDIR
-//config:       bool "popmaildir"
+//config:       bool "popmaildir (10 kb)"
 //config:       default y
 //config:       help
-//config:         Simple yet powerful POP3 mail popper. Delivers content
-//config:         of remote mailboxes to local Maildir.
+//config:       Simple yet powerful POP3 mail popper. Delivers content
+//config:       of remote mailboxes to local Maildir.
 //config:
 //config:config FEATURE_POPMAILDIR_DELIVERY
 //config:       bool "Allow message filters and custom delivery program"
 //config:       default y
 //config:       depends on POPMAILDIR
 //config:       help
-//config:         Allow to use a custom program to filter the content
-//config:         of the message before actual delivery (-F "prog [args...]").
-//config:         Allow to use a custom program for message actual delivery
-//config:         (-M "prog [args...]").
+//config:       Allow to use a custom program to filter the content
+//config:       of the message before actual delivery (-F "prog [args...]").
+//config:       Allow to use a custom program for message actual delivery
+//config:       (-M "prog [args...]").
 
 //applet:IF_POPMAILDIR(APPLET(popmaildir, BB_DIR_USR_SBIN, BB_SUID_DROP))
 
diff --git a/mailutils/reformime.c b/mailutils/reformime.c
index e97bc0130..6a0254803 100644
--- a/mailutils/reformime.c
+++ b/mailutils/reformime.c
@@ -7,18 +7,18 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config REFORMIME
-//config:       bool "reformime"
+//config:       bool "reformime (7.5 kb)"
 //config:       default y
 //config:       help
-//config:         Parse MIME-formatted messages.
+//config:       Parse MIME-formatted messages.
 //config:
 //config:config FEATURE_REFORMIME_COMPAT
 //config:       bool "Accept and ignore options other than -x and -X"
 //config:       default y
 //config:       depends on REFORMIME
 //config:       help
-//config:         Accept (for compatibility only) and ignore options
-//config:         other than -x and -X.
+//config:       Accept (for compatibility only) and ignore options
+//config:       other than -x and -X.
 
 //applet:IF_REFORMIME(APPLET(reformime, BB_DIR_BIN, BB_SUID_DROP))
 
diff --git a/mailutils/sendmail.c b/mailutils/sendmail.c
index b542099fd..346de2712 100644
--- a/mailutils/sendmail.c
+++ b/mailutils/sendmail.c
@@ -7,10 +7,10 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config SENDMAIL
-//config:       bool "sendmail"
+//config:       bool "sendmail (14 kb)"
 //config:       default y
 //config:       help
-//config:         Barebones sendmail.
+//config:       Barebones sendmail.
 
 //applet:IF_SENDMAIL(APPLET(sendmail, BB_DIR_USR_SBIN, BB_SUID_DROP))
 
diff --git a/miscutils/adjtimex.c b/miscutils/adjtimex.c
index 6355cc1ef..04ba5636f 100644
--- a/miscutils/adjtimex.c
+++ b/miscutils/adjtimex.c
@@ -11,12 +11,12 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config ADJTIMEX
-//config:       bool "adjtimex"
+//config:       bool "adjtimex (4.5 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         Adjtimex reads and optionally sets adjustment parameters for
-//config:         the Linux clock adjustment algorithm.
+//config:       Adjtimex reads and optionally sets adjustment parameters for
+//config:       the Linux clock adjustment algorithm.
 
 //applet:IF_ADJTIMEX(APPLET(adjtimex, BB_DIR_SBIN, BB_SUID_DROP))
 
diff --git a/miscutils/bbconfig.c b/miscutils/bbconfig.c
index 5320c6966..bcc9caa7c 100644
--- a/miscutils/bbconfig.c
+++ b/miscutils/bbconfig.c
@@ -2,25 +2,25 @@
 /* This file was released into the public domain by Paul Fox.
  */
 //config:config BBCONFIG
-//config:       bool "bbconfig"
+//config:       bool "bbconfig (9.7 kb)"
 //config:       default n
 //config:       help
-//config:         The bbconfig applet will print the config file with which
-//config:         busybox was built.
+//config:       The bbconfig applet will print the config file with which
+//config:       busybox was built.
 //config:
 //config:config FEATURE_COMPRESS_BBCONFIG
 //config:       bool "Compress bbconfig data"
 //config:       default y
 //config:       depends on BBCONFIG
 //config:       help
-//config:         Store bbconfig data in compressed form, uncompress them on-the-fly
-//config:         before output.
+//config:       Store bbconfig data in compressed form, uncompress them on-the-fly
+//config:       before output.
 //config:
-//config:         If you have a really tiny busybox with few applets enabled (and
-//config:         bunzip2 isn't one of them), the overhead of the decompressor might
-//config:         be noticeable. Also, if you run executables directly from ROM
-//config:         and have very little memory, this might not be a win. Otherwise,
-//config:         you probably want this.
+//config:       If you have a really tiny busybox with few applets enabled (and
+//config:       bunzip2 isn't one of them), the overhead of the decompressor might
+//config:       be noticeable. Also, if you run executables directly from ROM
+//config:       and have very little memory, this might not be a win. Otherwise,
+//config:       you probably want this.
 
 //applet:IF_BBCONFIG(APPLET(bbconfig, BB_DIR_BIN, BB_SUID_DROP))
 
diff --git a/miscutils/beep.c b/miscutils/beep.c
index 216f69400..b9b62f79b 100644
--- a/miscutils/beep.c
+++ b/miscutils/beep.c
@@ -8,11 +8,11 @@
  *
  */
 //config:config BEEP
-//config:       bool "beep"
+//config:       bool "beep (3 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         The beep applets beeps in a given freq/Hz.
+//config:       The beep applets beeps in a given freq/Hz.
 //config:
 //config:config FEATURE_BEEP_FREQ
 //config:       int "default frequency"
@@ -20,7 +20,7 @@
 //config:       default 4000
 //config:       depends on BEEP
 //config:       help
-//config:         Frequency for default beep.
+//config:       Frequency for default beep.
 //config:
 //config:config FEATURE_BEEP_LENGTH_MS
 //config:       int "default length"
@@ -28,7 +28,7 @@
 //config:       default 30
 //config:       depends on BEEP
 //config:       help
-//config:         Length in ms for default beep.
+//config:       Length in ms for default beep.
 
 //applet:IF_BEEP(APPLET(beep, BB_DIR_USR_BIN, BB_SUID_DROP))
 
diff --git a/miscutils/chat.c b/miscutils/chat.c
index 8df194534..216a899a0 100644
--- a/miscutils/chat.c
+++ b/miscutils/chat.c
@@ -8,71 +8,71 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config CHAT
-//config:       bool "chat"
+//config:       bool "chat (6.6 kb)"
 //config:       default y
 //config:       help
-//config:         Simple chat utility.
+//config:       Simple chat utility.
 //config:
 //config:config FEATURE_CHAT_NOFAIL
 //config:       bool "Enable NOFAIL expect strings"
 //config:       depends on CHAT
 //config:       default y
 //config:       help
-//config:         When enabled expect strings which are started with a dash trigger
-//config:         no-fail mode. That is when expectation is not met within timeout
-//config:         the script is not terminated but sends next SEND string and waits
-//config:         for next EXPECT string. This allows to compose far more flexible
-//config:         scripts.
+//config:       When enabled expect strings which are started with a dash trigger
+//config:       no-fail mode. That is when expectation is not met within timeout
+//config:       the script is not terminated but sends next SEND string and waits
+//config:       for next EXPECT string. This allows to compose far more flexible
+//config:       scripts.
 //config:
 //config:config FEATURE_CHAT_TTY_HIFI
 //config:       bool "Force STDIN to be a TTY"
 //config:       depends on CHAT
 //config:       default n
 //config:       help
-//config:         Original chat always treats STDIN as a TTY device and sets for it
-//config:         so-called raw mode. This option turns on such behaviour.
+//config:       Original chat always treats STDIN as a TTY device and sets for it
+//config:       so-called raw mode. This option turns on such behaviour.
 //config:
 //config:config FEATURE_CHAT_IMPLICIT_CR
 //config:       bool "Enable implicit Carriage Return"
 //config:       depends on CHAT
 //config:       default y
 //config:       help
-//config:         When enabled make chat to terminate all SEND strings with a "\r"
-//config:         unless "\c" is met anywhere in the string.
+//config:       When enabled make chat to terminate all SEND strings with a "\r"
+//config:       unless "\c" is met anywhere in the string.
 //config:
 //config:config FEATURE_CHAT_SWALLOW_OPTS
 //config:       bool "Swallow options"
 //config:       depends on CHAT
 //config:       default y
 //config:       help
-//config:         Busybox chat require no options. To make it not fail when used
-//config:         in place of original chat (which has a bunch of options) turn
-//config:         this on.
+//config:       Busybox chat require no options. To make it not fail when used
+//config:       in place of original chat (which has a bunch of options) turn
+//config:       this on.
 //config:
 //config:config FEATURE_CHAT_SEND_ESCAPES
 //config:       bool "Support weird SEND escapes"
 //config:       depends on CHAT
 //config:       default y
 //config:       help
-//config:         Original chat uses some escape sequences in SEND arguments which
-//config:         are not sent to device but rather performs special actions.
-//config:         E.g. "\K" means to send a break sequence to device.
-//config:         "\d" delays execution for a second, "\p" -- for a 1/100 of second.
-//config:         Before turning this option on think twice: do you really need them?
+//config:       Original chat uses some escape sequences in SEND arguments which
+//config:       are not sent to device but rather performs special actions.
+//config:       E.g. "\K" means to send a break sequence to device.
+//config:       "\d" delays execution for a second, "\p" -- for a 1/100 of second.
+//config:       Before turning this option on think twice: do you really need them?
 //config:
 //config:config FEATURE_CHAT_VAR_ABORT_LEN
 //config:       bool "Support variable-length ABORT conditions"
 //config:       depends on CHAT
 //config:       default y
 //config:       help
-//config:         Original chat uses fixed 50-bytes length ABORT conditions. Say N here.
+//config:       Original chat uses fixed 50-bytes length ABORT conditions. Say N here.
 //config:
 //config:config FEATURE_CHAT_CLR_ABORT
 //config:       bool "Support revoking of ABORT conditions"
 //config:       depends on CHAT
 //config:       default y
 //config:       help
-//config:         Support CLR_ABORT directive.
+//config:       Support CLR_ABORT directive.
 
 //applet:IF_CHAT(APPLET(chat, BB_DIR_USR_SBIN, BB_SUID_DROP))
 
diff --git a/miscutils/conspy.c b/miscutils/conspy.c
index 1f0278b47..47b9e7207 100644
--- a/miscutils/conspy.c
+++ b/miscutils/conspy.c
@@ -10,14 +10,14 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config CONSPY
-//config:       bool "conspy"
+//config:       bool "conspy (10 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         A text-mode VNC like program for Linux virtual terminals.
-//config:         example:  conspy NUM      shared access to console num
-//config:         or        conspy -nd NUM  screenshot of console num
-//config:         or        conspy -cs NUM  poor man's GNU screen like
+//config:       A text-mode VNC like program for Linux virtual terminals.
+//config:       example:  conspy NUM      shared access to console num
+//config:       or        conspy -nd NUM  screenshot of console num
+//config:       or        conspy -cs NUM  poor man's GNU screen like
 
 //applet:IF_CONSPY(APPLET(conspy, BB_DIR_BIN, BB_SUID_DROP))
 
diff --git a/miscutils/crond.c b/miscutils/crond.c
index c0c8bef11..5ae0ff084 100644
--- a/miscutils/crond.c
+++ b/miscutils/crond.c
@@ -9,54 +9,54 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config CROND
-//config:       bool "crond"
+//config:       bool "crond (13 kb)"
 //config:       default y
 //config:       select FEATURE_SYSLOG
 //config:       help
-//config:         Crond is a background daemon that parses individual crontab
-//config:         files and executes commands on behalf of the users in question.
-//config:         This is a port of dcron from slackware. It uses files of the
-//config:         format /var/spool/cron/crontabs/<username> files, for example:
-//config:             $ cat /var/spool/cron/crontabs/root
-//config:             # Run daily cron jobs at 4:40 every day:
-//config:             40 4 * * * /etc/cron/daily > /dev/null 2>&1
+//config:       Crond is a background daemon that parses individual crontab
+//config:       files and executes commands on behalf of the users in question.
+//config:       This is a port of dcron from slackware. It uses files of the
+//config:       format /var/spool/cron/crontabs/<username> files, for example:
+//config:               $ cat /var/spool/cron/crontabs/root
+//config:               # Run daily cron jobs at 4:40 every day:
+//config:               40 4 * * * /etc/cron/daily > /dev/null 2>&1
 //config:
 //config:config FEATURE_CROND_D
 //config:       bool "Support option -d to redirect output to stderr"
 //config:       depends on CROND
 //config:       default y
 //config:       help
-//config:         -d N sets loglevel (0:most verbose) and directs all output to stderr.
+//config:       -d N sets loglevel (0:most verbose) and directs all output to stderr.
 //config:
 //config:config FEATURE_CROND_CALL_SENDMAIL
 //config:       bool "Report command output via email (using sendmail)"
 //config:       default y
 //config:       depends on CROND
 //config:       help
-//config:         Command output will be sent to corresponding user via email.
+//config:       Command output will be sent to corresponding user via email.
 //config:
 //config:config FEATURE_CROND_SPECIAL_TIMES
 //config:       bool "Support special times (@reboot, @daily, etc) in crontabs"
 //config:       default y
 //config:       depends on CROND
 //config:       help
-//config:         string        meaning
-//config:         ------        -------
-//config:         @reboot       Run once, at startup
-//config:         @yearly       Run once a year:  "0 0 1 1 *"
-//config:         @annually     Same as @yearly:  "0 0 1 1 *"
-//config:         @monthly      Run once a month: "0 0 1 * *"
-//config:         @weekly       Run once a week:  "0 0 * * 0"
-//config:         @daily        Run once a day:   "0 0 * * *"
-//config:         @midnight     Same as @daily:   "0 0 * * *"
-//config:         @hourly       Run once an hour: "0 * * * *"
+//config:       string        meaning
+//config:       ------        -------
+//config:       @reboot       Run once, at startup
+//config:       @yearly       Run once a year:  "0 0 1 1 *"
+//config:       @annually     Same as @yearly:  "0 0 1 1 *"
+//config:       @monthly      Run once a month: "0 0 1 * *"
+//config:       @weekly       Run once a week:  "0 0 * * 0"
+//config:       @daily        Run once a day:   "0 0 * * *"
+//config:       @midnight     Same as @daily:   "0 0 * * *"
+//config:       @hourly       Run once an hour: "0 * * * *"
 //config:
 //config:config FEATURE_CROND_DIR
 //config:       string "crond spool directory"
 //config:       default "/var/spool/cron"
 //config:       depends on CROND || CRONTAB
 //config:       help
-//config:         Location of crond spool.
+//config:       Location of crond spool.
 
 //applet:IF_CROND(APPLET(crond, BB_DIR_USR_SBIN, BB_SUID_DROP))
 
@@ -79,9 +79,9 @@
 #include "common_bufsiz.h"
 #include <syslog.h>
 
-/* glibc frees previous setenv'ed value when we do next setenv()
- * of the same variable. uclibc does not do this! */
-#if (defined(__GLIBC__) && !defined(__UCLIBC__)) /* || OTHER_SAFE_LIBC... */
+#if 0
+/* If libc tracks and reuses setenv()-allocated memory, ok to set this to 0 */
+/* Neither glibc nor uclibc do that! */
 # define SETENV_LEAKS 0
 #else
 # define SETENV_LEAKS 1
@@ -153,6 +153,7 @@ struct globals {
         const char *log_filename;
         const char *crontab_dir_name; /* = CRONTABS; */
         CronFile *cron_files;
+        char *default_shell;
 #if SETENV_LEAKS
         char *env_var_user;
         char *env_var_home;
@@ -700,7 +701,7 @@ fork_job(const char *user, int mailFd, CronLine *line, bool run_sendmail)
                 goto err;
         }
 
-        shell = line->cl_shell ? line->cl_shell : DEFAULT_SHELL;
+        shell = line->cl_shell ? line->cl_shell : G.default_shell;
         prog = run_sendmail ? SENDMAIL : shell;
 
         set_env_vars(pas, shell);
@@ -846,7 +847,7 @@ static pid_t start_one_job(const char *user, CronLine *line)
         }
 
         /* Prepare things before vfork */
-        shell = line->cl_shell ? line->cl_shell : DEFAULT_SHELL;
+        shell = line->cl_shell ? line->cl_shell : G.default_shell;
         set_env_vars(pas, shell);
 
         /* Fork as the user in question and run program */
@@ -1045,6 +1046,10 @@ int crond_main(int argc UNUSED_PARAM, char **argv)
 
         reopen_logfile_to_stderr();
         xchdir(G.crontab_dir_name);
+        /* $SHELL, or current UID's shell, or DEFAULT_SHELL */
+        /* Useful on Android where DEFAULT_SHELL /bin/sh may not exist */
+        G.default_shell = xstrdup(get_shell_name());
+
         log8("crond (busybox "BB_VER") started, log level %d", G.log_level);
         rescan_crontab_dir();
         write_pidfile(CONFIG_PID_FILE_PATH "/crond.pid");
diff --git a/miscutils/crontab.c b/miscutils/crontab.c
index bcd424578..23cb54887 100644
--- a/miscutils/crontab.c
+++ b/miscutils/crontab.c
@@ -10,13 +10,13 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config CRONTAB
-//config:       bool "crontab"
+//config:       bool "crontab (9.7 kb)"
 //config:       default y
 //config:       help
-//config:         Crontab manipulates the crontab for a particular user. Only
-//config:         the superuser may specify a different user and/or crontab directory.
-//config:         Note that Busybox binary must be setuid root for this applet to
-//config:         work properly.
+//config:       Crontab manipulates the crontab for a particular user. Only
+//config:       the superuser may specify a different user and/or crontab directory.
+//config:       Note that Busybox binary must be setuid root for this applet to
+//config:       work properly.
 
 /* Needs to be run by root or be suid root - needs to change /var/spool/cron* files: */
 //applet:IF_CRONTAB(APPLET(crontab, BB_DIR_USR_BIN, BB_SUID_REQUIRE))
diff --git a/miscutils/dc.c b/miscutils/dc.c
index 6b8364dd9..f752a1377 100644
--- a/miscutils/dc.c
+++ b/miscutils/dc.c
@@ -3,19 +3,19 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config DC
-//config:       bool "dc"
+//config:       bool "dc (4.2 kb)"
 //config:       default y
 //config:       help
-//config:         Dc is a reverse-polish desk calculator which supports unlimited
-//config:         precision arithmetic.
+//config:       Dc is a reverse-polish desk calculator which supports unlimited
+//config:       precision arithmetic.
 //config:
 //config:config FEATURE_DC_LIBM
 //config:       bool "Enable power and exp functions (requires libm)"
 //config:       default y
 //config:       depends on DC
 //config:       help
-//config:         Enable power and exp functions.
-//config:         NOTE: This will require libm to be present for linking.
+//config:       Enable power and exp functions.
+//config:       NOTE: This will require libm to be present for linking.
 
 //applet:IF_DC(APPLET(dc, BB_DIR_USR_BIN, BB_SUID_DROP))
 
diff --git a/miscutils/devfsd.c b/miscutils/devfsd.c
index 334f1071b..814714f53 100644
--- a/miscutils/devfsd.c
+++ b/miscutils/devfsd.c
@@ -59,56 +59,55 @@
 //config:       select PLATFORM_LINUX
 //config:       select FEATURE_SYSLOG
 //config:       help
-//config:         This is deprecated and should NOT be used anymore.
-//config:         Use linux >= 2.6 (optionally with hotplug) and mdev instead!
-//config:         See docs/mdev.txt for detailed instructions on how to use mdev
-//config:         instead.
+//config:       This is deprecated and should NOT be used anymore.
+//config:       Use linux >= 2.6 (optionally with hotplug) and mdev instead!
+//config:       See docs/mdev.txt for detailed instructions on how to use mdev
+//config:       instead.
 //config:
-//config:         Provides compatibility with old device names on a devfs systems.
-//config:         You should set it to true if you have devfs enabled.
-//config:         The following keywords in devsfd.conf are supported:
-//config:         "CLEAR_CONFIG", "INCLUDE", "OPTIONAL_INCLUDE", "RESTORE",
-//config:         "PERMISSIONS", "EXECUTE", "COPY", "IGNORE",
-//config:         "MKOLDCOMPAT", "MKNEWCOMPAT","RMOLDCOMPAT", "RMNEWCOMPAT".
+//config:       Provides compatibility with old device names on a devfs systems.
+//config:       You should set it to true if you have devfs enabled.
+//config:       The following keywords in devsfd.conf are supported:
+//config:       "CLEAR_CONFIG", "INCLUDE", "OPTIONAL_INCLUDE", "RESTORE",
+//config:       "PERMISSIONS", "EXECUTE", "COPY", "IGNORE",
+//config:       "MKOLDCOMPAT", "MKNEWCOMPAT","RMOLDCOMPAT", "RMNEWCOMPAT".
 //config:
-//config:         But only if they are written UPPERCASE!!!!!!!!
+//config:       But only if they are written UPPERCASE!!!!!!!!
 //config:
 //config:config DEVFSD_MODLOAD
 //config:       bool "Adds support for MODLOAD keyword in devsfd.conf"
 //config:       default y
 //config:       depends on DEVFSD
 //config:       help
-//config:         This actually doesn't work with busybox modutils but needs
-//config:         the external modutils.
+//config:       This actually doesn't work with busybox modutils but needs
+//config:       the external modutils.
 //config:
 //config:config DEVFSD_FG_NP
 //config:       bool "Enable the -fg and -np options"
 //config:       default y
 //config:       depends on DEVFSD
 //config:       help
-//config:         -fg  Run the daemon in the foreground.
-//config:         -np  Exit after parsing the configuration file.
-//config:              Do not poll for events.
+//config:       -fg  Run the daemon in the foreground.
+//config:       -np  Exit after parsing config. Do not poll for events.
 //config:
 //config:config DEVFSD_VERBOSE
 //config:       bool "Increases logging (and size)"
 //config:       default y
 //config:       depends on DEVFSD
 //config:       help
-//config:         Increases logging to stderr or syslog.
+//config:       Increases logging to stderr or syslog.
 //config:
 //config:config FEATURE_DEVFS
 //config:       bool "Use devfs names for all devices (obsolete)"
 //config:       default n
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         This is obsolete and should NOT be used anymore.
-//config:         Use linux >= 2.6 (optionally with hotplug) and mdev instead!
+//config:       This is obsolete and should NOT be used anymore.
+//config:       Use linux >= 2.6 (optionally with hotplug) and mdev instead!
 //config:
-//config:         For legacy systems -- if there is no way around devfsd -- this
-//config:         tells busybox to look for names like /dev/loop/0 instead of
-//config:         /dev/loop0. If your /dev directory has normal names instead of
-//config:         devfs names, you don't want this.
+//config:       For legacy systems -- if there is no way around devfsd -- this
+//config:       tells busybox to look for names like /dev/loop/0 instead of
+//config:       /dev/loop0. If your /dev directory has normal names instead of
+//config:       devfs names, you don't want this.
 
 //applet:IF_DEVFSD(APPLET(devfsd, BB_DIR_SBIN, BB_SUID_DROP))
 
diff --git a/miscutils/devmem.c b/miscutils/devmem.c
index aeb32b13a..624054770 100644
--- a/miscutils/devmem.c
+++ b/miscutils/devmem.c
@@ -4,11 +4,11 @@
  *  Copyright (C) 2008, BusyBox Team. -solar 4/26/08
  */
 //config:config DEVMEM
-//config:       bool "devmem"
+//config:       bool "devmem (2.5 kb)"
 //config:       default y
 //config:       help
-//config:         devmem is a small program that reads and writes from physical
-//config:         memory using /dev/mem.
+//config:       devmem is a small program that reads and writes from physical
+//config:       memory using /dev/mem.
 
 //applet:IF_DEVMEM(APPLET(devmem, BB_DIR_SBIN, BB_SUID_DROP))
 
diff --git a/miscutils/fbsplash.c b/miscutils/fbsplash.c
index fc6c9b953..9ac91e01e 100644
--- a/miscutils/fbsplash.c
+++ b/miscutils/fbsplash.c
@@ -21,24 +21,24 @@
  *   "exit" (or just close fifo) - well you guessed it.
  */
 //config:config FBSPLASH
-//config:       bool "fbsplash"
+//config:       bool "fbsplash (27 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         Shows splash image and progress bar on framebuffer device.
-//config:         Can be used during boot phase of an embedded device. ~2kb.
-//config:         Usage:
-//config:         - use kernel option 'vga=xxx' or otherwise enable fb device.
-//config:         - put somewhere fbsplash.cfg file and an image in .ppm format.
-//config:         - $ setsid fbsplash [params] &
+//config:       Shows splash image and progress bar on framebuffer device.
+//config:       Can be used during boot phase of an embedded device.
+//config:       Usage:
+//config:       - use kernel option 'vga=xxx' or otherwise enable fb device.
+//config:       - put somewhere fbsplash.cfg file and an image in .ppm format.
+//config:       - $ setsid fbsplash [params] &
 //config:           -c: hide cursor
 //config:           -d /dev/fbN: framebuffer device (if not /dev/fb0)
 //config:           -s path_to_image_file (can be "-" for stdin)
 //config:           -i path_to_cfg_file (can be "-" for stdin)
 //config:           -f path_to_fifo (can be "-" for stdin)
-//config:         - if you want to run it only in presence of kernel parameter:
+//config:       - if you want to run it only in presence of kernel parameter:
 //config:           grep -q "fbsplash=on" </proc/cmdline && setsid fbsplash [params] &
-//config:         - commands for fifo:
+//config:       - commands for fifo:
 //config:           "NN" (ASCII decimal number) - percentage to show on progress bar
 //config:           "exit" - well you guessed it
 
diff --git a/miscutils/flash_eraseall.c b/miscutils/flash_eraseall.c
index 2a9bd6cfe..af9ebea24 100644
--- a/miscutils/flash_eraseall.c
+++ b/miscutils/flash_eraseall.c
@@ -10,11 +10,11 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config FLASH_ERASEALL
-//config:       bool "flash_eraseall"
+//config:       bool "flash_eraseall (5.5 kb)"
 //config:       default n  # doesn't build on Ubuntu 8.04
 //config:       help
-//config:         The flash_eraseall binary from mtd-utils as of git head c4c6a59eb.
-//config:         This utility is used to erase the whole MTD device.
+//config:       The flash_eraseall binary from mtd-utils as of git head c4c6a59eb.
+//config:       This utility is used to erase the whole MTD device.
 
 //applet:IF_FLASH_ERASEALL(APPLET(flash_eraseall, BB_DIR_USR_SBIN, BB_SUID_DROP))
 
diff --git a/miscutils/flash_lock_unlock.c b/miscutils/flash_lock_unlock.c
index 003496d5b..374eed5f6 100644
--- a/miscutils/flash_lock_unlock.c
+++ b/miscutils/flash_lock_unlock.c
@@ -4,18 +4,18 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config FLASH_LOCK
-//config:       bool "flash_lock"
+//config:       bool "flash_lock (2.1 kb)"
 //config:       default n  # doesn't build on Ubuntu 8.04
 //config:       help
-//config:         The flash_lock binary from mtd-utils as of git head 5ec0c10d0. This
-//config:         utility locks part or all of the flash device.
+//config:       The flash_lock binary from mtd-utils as of git head 5ec0c10d0. This
+//config:       utility locks part or all of the flash device.
 //config:
 //config:config FLASH_UNLOCK
-//config:       bool "flash_unlock"
+//config:       bool "flash_unlock (1.3 kb)"
 //config:       default n  # doesn't build on Ubuntu 8.04
 //config:       help
-//config:         The flash_unlock binary from mtd-utils as of git head 5ec0c10d0. This
-//config:         utility unlocks part or all of the flash device.
+//config:       The flash_unlock binary from mtd-utils as of git head 5ec0c10d0. This
+//config:       utility unlocks part or all of the flash device.
 
 //                       APPLET_ODDNAME:name          main               location         suid_type     help
 //applet:IF_FLASH_LOCK(  APPLET_ODDNAME(flash_lock,   flash_lock_unlock, BB_DIR_USR_SBIN, BB_SUID_DROP, flash_lock))
diff --git a/miscutils/flashcp.c b/miscutils/flashcp.c
index 4bbc67727..d4ac62df4 100644
--- a/miscutils/flashcp.c
+++ b/miscutils/flashcp.c
@@ -7,11 +7,11 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config FLASHCP
-//config:       bool "flashcp"
+//config:       bool "flashcp (5.4 kb)"
 //config:       default n  # doesn't build on Ubuntu 8.04
 //config:       help
-//config:         The flashcp binary, inspired by mtd-utils as of git head 5eceb74f7.
-//config:         This utility is used to copy images into a MTD device.
+//config:       The flashcp binary, inspired by mtd-utils as of git head 5eceb74f7.
+//config:       This utility is used to copy images into a MTD device.
 
 //applet:IF_FLASHCP(APPLET(flashcp, BB_DIR_USR_SBIN, BB_SUID_DROP))
 
diff --git a/miscutils/hdparm.c b/miscutils/hdparm.c
index 84675285a..0bbe6ca10 100644
--- a/miscutils/hdparm.c
+++ b/miscutils/hdparm.c
@@ -12,63 +12,62 @@
  *          - by Mark Lord (C) 1994-2002 -- freely distributable
  */
 //config:config HDPARM
-//config:       bool "hdparm"
+//config:       bool "hdparm (23 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         Get/Set hard drive parameters. Primarily intended for ATA
-//config:         drives. Adds about 13k (or around 30k if you enable the
-//config:         FEATURE_HDPARM_GET_IDENTITY option)....
+//config:       Get/Set hard drive parameters. Primarily intended for ATA
+//config:       drives.
 //config:
 //config:config FEATURE_HDPARM_GET_IDENTITY
 //config:       bool "Support obtaining detailed information directly from drives"
 //config:       default y
 //config:       depends on HDPARM
 //config:       help
-//config:         Enable the -I and -i options to obtain detailed information
-//config:         directly from drives about their capabilities and supported ATA
-//config:         feature set. If no device name is specified, hdparm will read
-//config:         identify data from stdin. Enabling this option will add about 16k...
+//config:       Enable the -I and -i options to obtain detailed information
+//config:       directly from drives about their capabilities and supported ATA
+//config:       feature set. If no device name is specified, hdparm will read
+//config:       identify data from stdin. Enabling this option will add about 16k...
 //config:
 //config:config FEATURE_HDPARM_HDIO_SCAN_HWIF
 //config:       bool "Register an IDE interface (DANGEROUS)"
 //config:       default y
 //config:       depends on HDPARM
 //config:       help
-//config:         Enable the 'hdparm -R' option to register an IDE interface.
-//config:         This is dangerous stuff, so you should probably say N.
+//config:       Enable the 'hdparm -R' option to register an IDE interface.
+//config:       This is dangerous stuff, so you should probably say N.
 //config:
 //config:config FEATURE_HDPARM_HDIO_UNREGISTER_HWIF
 //config:       bool "Un-register an IDE interface (DANGEROUS)"
 //config:       default y
 //config:       depends on HDPARM
 //config:       help
-//config:         Enable the 'hdparm -U' option to un-register an IDE interface.
-//config:         This is dangerous stuff, so you should probably say N.
+//config:       Enable the 'hdparm -U' option to un-register an IDE interface.
+//config:       This is dangerous stuff, so you should probably say N.
 //config:
 //config:config FEATURE_HDPARM_HDIO_DRIVE_RESET
 //config:       bool "Perform device reset (DANGEROUS)"
 //config:       default y
 //config:       depends on HDPARM
 //config:       help
-//config:         Enable the 'hdparm -w' option to perform a device reset.
-//config:         This is dangerous stuff, so you should probably say N.
+//config:       Enable the 'hdparm -w' option to perform a device reset.
+//config:       This is dangerous stuff, so you should probably say N.
 //config:
 //config:config FEATURE_HDPARM_HDIO_TRISTATE_HWIF
 //config:       bool "Tristate device for hotswap (DANGEROUS)"
 //config:       default y
 //config:       depends on HDPARM
 //config:       help
-//config:         Enable the 'hdparm -x' option to tristate device for hotswap,
-//config:         and the '-b' option to get/set bus state. This is dangerous
-//config:         stuff, so you should probably say N.
+//config:       Enable the 'hdparm -x' option to tristate device for hotswap,
+//config:       and the '-b' option to get/set bus state. This is dangerous
+//config:       stuff, so you should probably say N.
 //config:
 //config:config FEATURE_HDPARM_HDIO_GETSET_DMA
 //config:       bool "Get/set using_dma flag"
 //config:       default y
 //config:       depends on HDPARM
 //config:       help
-//config:         Enable the 'hdparm -d' option to get/set using_dma flag.
+//config:       Enable the 'hdparm -d' option to get/set using_dma flag.
 
 //applet:IF_HDPARM(APPLET(hdparm, BB_DIR_SBIN, BB_SUID_DROP))
 
diff --git a/miscutils/i2c_tools.c b/miscutils/i2c_tools.c
index 7731466f7..ca2580e92 100644
--- a/miscutils/i2c_tools.c
+++ b/miscutils/i2c_tools.c
@@ -10,32 +10,32 @@
  */
 
 //config:config I2CGET
-//config:       bool "i2cget"
+//config:       bool "i2cget (5.6 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         Read from I2C/SMBus chip registers.
+//config:       Read from I2C/SMBus chip registers.
 //config:
 //config:config I2CSET
-//config:       bool "i2cset"
+//config:       bool "i2cset (6.9 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         Set I2C registers.
+//config:       Set I2C registers.
 //config:
 //config:config I2CDUMP
-//config:       bool "i2cdump"
+//config:       bool "i2cdump (7.2 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         Examine I2C registers.
+//config:       Examine I2C registers.
 //config:
 //config:config I2CDETECT
-//config:       bool "i2cdetect"
+//config:       bool "i2cdetect (7.2 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         Detect I2C chips.
+//config:       Detect I2C chips.
 //config:
 
 //applet:IF_I2CGET(APPLET(i2cget, BB_DIR_USR_SBIN, BB_SUID_DROP))
diff --git a/miscutils/inotifyd.c b/miscutils/inotifyd.c
index db8ddce92..0060797ed 100644
--- a/miscutils/inotifyd.c
+++ b/miscutils/inotifyd.c
@@ -27,11 +27,11 @@
  * See below for mask names explanation.
  */
 //config:config INOTIFYD
-//config:       bool "inotifyd"
+//config:       bool "inotifyd (3.5 kb)"
 //config:       default n  # doesn't build on Knoppix 5
 //config:       help
-//config:         Simple inotify daemon. Reports filesystem changes. Requires
-//config:         kernel >= 2.6.13
+//config:       Simple inotify daemon. Reports filesystem changes. Requires
+//config:       kernel >= 2.6.13
 
 //applet:IF_INOTIFYD(APPLET(inotifyd, BB_DIR_SBIN, BB_SUID_DROP))
 
diff --git a/miscutils/less.c b/miscutils/less.c
index 16be1447e..75ded97cf 100644
--- a/miscutils/less.c
+++ b/miscutils/less.c
@@ -22,11 +22,11 @@
  */
 
 //config:config LESS
-//config:       bool "less"
+//config:       bool "less (15 kb)"
 //config:       default y
 //config:       help
-//config:         'less' is a pager, meaning that it displays text files. It possesses
-//config:         a wide array of features, and is an improvement over 'more'.
+//config:       'less' is a pager, meaning that it displays text files. It possesses
+//config:       a wide array of features, and is an improvement over 'more'.
 //config:
 //config:config FEATURE_LESS_MAXLINES
 //config:       int "Max number of input lines less will try to eat"
@@ -38,64 +38,64 @@
 //config:       default y
 //config:       depends on LESS
 //config:       help
-//config:         This option adds the capability to search for matching left and right
-//config:         brackets, facilitating programming.
+//config:       This option adds the capability to search for matching left and right
+//config:       brackets, facilitating programming.
 //config:
 //config:config FEATURE_LESS_FLAGS
 //config:       bool "Enable -m/-M"
 //config:       default y
 //config:       depends on LESS
 //config:       help
-//config:         The -M/-m flag enables a more sophisticated status line.
+//config:       The -M/-m flag enables a more sophisticated status line.
 //config:
 //config:config FEATURE_LESS_TRUNCATE
 //config:       bool "Enable -S"
 //config:       default y
 //config:       depends on LESS
 //config:       help
-//config:         The -S flag causes long lines to be truncated rather than
-//config:         wrapped.
+//config:       The -S flag causes long lines to be truncated rather than
+//config:       wrapped.
 //config:
 //config:config FEATURE_LESS_MARKS
 //config:       bool "Enable marks"
 //config:       default y
 //config:       depends on LESS
 //config:       help
-//config:         Marks enable positions in a file to be stored for easy reference.
+//config:       Marks enable positions in a file to be stored for easy reference.
 //config:
 //config:config FEATURE_LESS_REGEXP
 //config:       bool "Enable regular expressions"
 //config:       default y
 //config:       depends on LESS
 //config:       help
-//config:         Enable regular expressions, allowing complex file searches.
+//config:       Enable regular expressions, allowing complex file searches.
 //config:
 //config:config FEATURE_LESS_WINCH
 //config:       bool "Enable automatic resizing on window size changes"
 //config:       default y
 //config:       depends on LESS
 //config:       help
-//config:         Makes less track window size changes.
+//config:       Makes less track window size changes.
 //config:
 //config:config FEATURE_LESS_ASK_TERMINAL
 //config:       bool "Use 'tell me cursor position' ESC sequence to measure window"
 //config:       default y
 //config:       depends on FEATURE_LESS_WINCH
 //config:       help
-//config:         Makes less track window size changes.
-//config:         If terminal size can't be retrieved and $LINES/$COLUMNS are not set,
-//config:         this option makes less perform a last-ditch effort to find it:
-//config:         position cursor to 999,999 and ask terminal to report real
-//config:         cursor position using "ESC [ 6 n" escape sequence, then read stdin.
-//config:         This is not clean but helps a lot on serial lines and such.
+//config:       Makes less track window size changes.
+//config:       If terminal size can't be retrieved and $LINES/$COLUMNS are not set,
+//config:       this option makes less perform a last-ditch effort to find it:
+//config:       position cursor to 999,999 and ask terminal to report real
+//config:       cursor position using "ESC [ 6 n" escape sequence, then read stdin.
+//config:       This is not clean but helps a lot on serial lines and such.
 //config:
 //config:config FEATURE_LESS_DASHCMD
 //config:       bool "Enable flag changes ('-' command)"
 //config:       default y
 //config:       depends on LESS
 //config:       help
-//config:         This enables the ability to change command-line flags within
-//config:         less itself ('-' keyboard command).
+//config:       This enables the ability to change command-line flags within
+//config:       less itself ('-' keyboard command).
 //config:
 //config:config FEATURE_LESS_LINENUMS
 //config:       bool "Enable -N (dynamic switching of line numbers)"
diff --git a/miscutils/lsscsi.c b/miscutils/lsscsi.c
index 1521680ac..b69ff1eef 100644
--- a/miscutils/lsscsi.c
+++ b/miscutils/lsscsi.c
@@ -7,14 +7,14 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config LSSCSI
-//config:       bool "lsscsi"
+//config:       bool "lsscsi (2.4 kb)"
 //config:       default y
 //config:       #select PLATFORM_LINUX
 //config:       help
-//config:         lsscsi is a utility for displaying information about SCSI buses in the
-//config:         system and devices connected to them.
+//config:       lsscsi is a utility for displaying information about SCSI buses in the
+//config:       system and devices connected to them.
 //config:
-//config:         This version uses sysfs (/sys/bus/scsi/devices) only.
+//config:       This version uses sysfs (/sys/bus/scsi/devices) only.
 
 //applet:IF_LSSCSI(APPLET(lsscsi, BB_DIR_USR_BIN, BB_SUID_DROP))
 
diff --git a/miscutils/makedevs.c b/miscutils/makedevs.c
index f436b08f8..c2f86df01 100644
--- a/miscutils/makedevs.c
+++ b/miscutils/makedevs.c
@@ -7,23 +7,23 @@
  * known bugs: can't deal with alpha ranges
  */
 //config:config MAKEDEVS
-//config:       bool "makedevs"
+//config:       bool "makedevs (9.3 kb)"
 //config:       default y
 //config:       help
-//config:         'makedevs' is a utility used to create a batch of devices with
-//config:         one command.
+//config:       'makedevs' is a utility used to create a batch of devices with
+//config:       one command.
 //config:
-//config:         There are two choices for command line behaviour, the interface
-//config:         as used by LEAF/Linux Router Project, or a device table file.
+//config:       There are two choices for command line behaviour, the interface
+//config:       as used by LEAF/Linux Router Project, or a device table file.
 //config:
-//config:         'leaf' is traditionally what busybox follows, it allows multiple
-//config:         devices of a particluar type to be created per command.
-//config:         e.g. /dev/hda[0-9]
-//config:         Device properties are passed as command line arguments.
+//config:       'leaf' is traditionally what busybox follows, it allows multiple
+//config:       devices of a particluar type to be created per command.
+//config:       e.g. /dev/hda[0-9]
+//config:       Device properties are passed as command line arguments.
 //config:
-//config:         'table' reads device properties from a file or stdin, allowing
-//config:         a batch of unrelated devices to be made with one command.
-//config:         User/group names are allowed as an alternative to uid/gid.
+//config:       'table' reads device properties from a file or stdin, allowing
+//config:       a batch of unrelated devices to be made with one command.
+//config:       User/group names are allowed as an alternative to uid/gid.
 //config:
 //config:choice
 //config:       prompt "Choose makedevs behaviour"
diff --git a/miscutils/man.c b/miscutils/man.c
index 741980961..f68784767 100644
--- a/miscutils/man.c
+++ b/miscutils/man.c
@@ -3,10 +3,10 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config MAN
-//config:       bool "man"
+//config:       bool "man (27 kb)"
 //config:       default y
 //config:       help
-//config:         Format and display manual pages.
+//config:       Format and display manual pages.
 
 //applet:IF_MAN(APPLET(man, BB_DIR_USR_BIN, BB_SUID_DROP))
 
diff --git a/miscutils/microcom.c b/miscutils/microcom.c
index 5a4bbefa9..14b9f3baf 100644
--- a/miscutils/microcom.c
+++ b/miscutils/microcom.c
@@ -8,10 +8,10 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config MICROCOM
-//config:       bool "microcom"
+//config:       bool "microcom (5.6 kb)"
 //config:       default y
 //config:       help
-//config:         The poor man's minicom utility for chatting with serial port devices.
+//config:       The poor man's minicom utility for chatting with serial port devices.
 
 //applet:IF_MICROCOM(APPLET(microcom, BB_DIR_USR_BIN, BB_SUID_DROP))
 
diff --git a/miscutils/mt.c b/miscutils/mt.c
index 6b3169675..fad656e95 100644
--- a/miscutils/mt.c
+++ b/miscutils/mt.c
@@ -3,12 +3,12 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config MT
-//config:       bool "mt"
+//config:       bool "mt (2.6 kb)"
 //config:       default y
 //config:       help
-//config:         mt is used to control tape devices. You can use the mt utility
-//config:         to advance or rewind a tape past a specified number of archive
-//config:         files on the tape.
+//config:       mt is used to control tape devices. You can use the mt utility
+//config:       to advance or rewind a tape past a specified number of archive
+//config:       files on the tape.
 
 //applet:IF_MT(APPLET(mt, BB_DIR_BIN, BB_SUID_DROP))
 
diff --git a/miscutils/nandwrite.c b/miscutils/nandwrite.c
index dbe9043f4..14b1ed056 100644
--- a/miscutils/nandwrite.c
+++ b/miscutils/nandwrite.c
@@ -9,18 +9,18 @@
  */
 
 //config:config NANDWRITE
-//config:       bool "nandwrite"
+//config:       bool "nandwrite (5.9 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         Write to the specified MTD device, with bad blocks awareness
+//config:       Write to the specified MTD device, with bad blocks awareness
 //config:
 //config:config NANDDUMP
-//config:       bool "nanddump"
+//config:       bool "nanddump (6.3 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         Dump the content of raw NAND chip
+//config:       Dump the content of raw NAND chip
 
 //applet:IF_NANDWRITE(APPLET(nandwrite, BB_DIR_USR_SBIN, BB_SUID_DROP))
 //applet:IF_NANDDUMP(APPLET_ODDNAME(nanddump, nandwrite, BB_DIR_USR_SBIN, BB_SUID_DROP, nanddump))
diff --git a/miscutils/partprobe.c b/miscutils/partprobe.c
index 38831598d..2c12a7d20 100644
--- a/miscutils/partprobe.c
+++ b/miscutils/partprobe.c
@@ -5,11 +5,11 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config PARTPROBE
-//config:       bool "partprobe"
+//config:       bool "partprobe (3.6 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         Ask kernel to rescan partition table.
+//config:       Ask kernel to rescan partition table.
 
 //applet:IF_PARTPROBE(APPLET(partprobe, BB_DIR_USR_SBIN, BB_SUID_DROP))
 
diff --git a/miscutils/raidautorun.c b/miscutils/raidautorun.c
index c6d8e6235..ecedf9ce2 100644
--- a/miscutils/raidautorun.c
+++ b/miscutils/raidautorun.c
@@ -8,12 +8,12 @@
  *
  */
 //config:config RAIDAUTORUN
-//config:       bool "raidautorun"
+//config:       bool "raidautorun (1.4 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         raidautorun tells the kernel md driver to
-//config:         search and start RAID arrays.
+//config:       raidautorun tells the kernel md driver to
+//config:       search and start RAID arrays.
 
 //applet:IF_RAIDAUTORUN(APPLET(raidautorun, BB_DIR_SBIN, BB_SUID_DROP))
 
diff --git a/miscutils/readahead.c b/miscutils/readahead.c
index b8e9b257f..972302a18 100644
--- a/miscutils/readahead.c
+++ b/miscutils/readahead.c
@@ -10,22 +10,22 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config READAHEAD
-//config:       bool "readahead"
+//config:       bool "readahead (2 kb)"
 //config:       default y
 //config:       depends on LFS
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         Preload the files listed on the command line into RAM cache so that
-//config:         subsequent reads on these files will not block on disk I/O.
+//config:       Preload the files listed on the command line into RAM cache so that
+//config:       subsequent reads on these files will not block on disk I/O.
 //config:
-//config:         This applet just calls the readahead(2) system call on each file.
-//config:         It is mainly useful in system startup scripts to preload files
-//config:         or executables before they are used. When used at the right time
-//config:         (in particular when a CPU bound process is running) it can
-//config:         significantly speed up system startup.
+//config:       This applet just calls the readahead(2) system call on each file.
+//config:       It is mainly useful in system startup scripts to preload files
+//config:       or executables before they are used. When used at the right time
+//config:       (in particular when a CPU bound process is running) it can
+//config:       significantly speed up system startup.
 //config:
-//config:         As readahead(2) blocks until each file has been read, it is best to
-//config:         run this applet as a background job.
+//config:       As readahead(2) blocks until each file has been read, it is best to
+//config:       run this applet as a background job.
 
 //applet:IF_READAHEAD(APPLET(readahead, BB_DIR_USR_SBIN, BB_SUID_DROP))
 
diff --git a/miscutils/rfkill.c b/miscutils/rfkill.c
index 7411b6fc3..546928402 100644
--- a/miscutils/rfkill.c
+++ b/miscutils/rfkill.c
@@ -8,16 +8,16 @@
 */
 
 //config:config RFKILL
-//config:       bool "rfkill"
+//config:       bool "rfkill (5.3 kb)"
 //config:       default n # doesn't build on Ubuntu 9.04
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         Enable/disable wireless devices.
+//config:       Enable/disable wireless devices.
 //config:
-//config:         rfkill list : list all wireless devices
-//config:         rfkill list bluetooth : list all bluetooth devices
-//config:         rfkill list 1 : list device corresponding to the given index
-//config:         rfkill block|unblock wlan : block/unblock all wlan(wifi) devices
+//config:       rfkill list : list all wireless devices
+//config:       rfkill list bluetooth : list all bluetooth devices
+//config:       rfkill list 1 : list device corresponding to the given index
+//config:       rfkill block|unblock wlan : block/unblock all wlan(wifi) devices
 //config:
 
 //applet:IF_RFKILL(APPLET(rfkill, BB_DIR_USR_SBIN, BB_SUID_DROP))
diff --git a/miscutils/runlevel.c b/miscutils/runlevel.c
index b6412a6ea..6b4742255 100644
--- a/miscutils/runlevel.c
+++ b/miscutils/runlevel.c
@@ -12,14 +12,14 @@
  * initially busyboxified by Bernhard Reutner-Fischer
  */
 //config:config RUNLEVEL
-//config:       bool "runlevel"
+//config:       bool "runlevel (518 bytes)"
 //config:       default y
 //config:       depends on FEATURE_UTMP
 //config:       help
-//config:         find the current and previous system runlevel.
+//config:       find the current and previous system runlevel.
 //config:
-//config:         This applet uses utmp but does not rely on busybox supporing
-//config:         utmp on purpose. It is used by e.g. emdebian via /etc/init.d/rc.
+//config:       This applet uses utmp but does not rely on busybox supporing
+//config:       utmp on purpose. It is used by e.g. emdebian via /etc/init.d/rc.
 
 //applet:IF_RUNLEVEL(APPLET(runlevel, BB_DIR_SBIN, BB_SUID_DROP))
 
diff --git a/miscutils/rx.c b/miscutils/rx.c
index 1f6f2825c..874a3f0a3 100644
--- a/miscutils/rx.c
+++ b/miscutils/rx.c
@@ -15,11 +15,11 @@
  * This was originally written for blob and then adapted for busybox.
  */
 //config:config RX
-//config:       bool "rx"
+//config:       bool "rx (2.9 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         Receive files using the Xmodem protocol.
+//config:       Receive files using the Xmodem protocol.
 
 //applet:IF_RX(APPLET(rx, BB_DIR_USR_BIN, BB_SUID_DROP))
 
diff --git a/miscutils/setserial.c b/miscutils/setserial.c
index 8b5c4a9c7..28a1bef18 100644
--- a/miscutils/setserial.c
+++ b/miscutils/setserial.c
@@ -9,11 +9,11 @@
  */
 
 //config:config SETSERIAL
-//config:       bool "setserial"
+//config:       bool "setserial (6.6 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         Retrieve or set Linux serial port.
+//config:       Retrieve or set Linux serial port.
 
 //applet:IF_SETSERIAL(APPLET(setserial, BB_DIR_BIN, BB_SUID_DROP))
 
diff --git a/miscutils/strings.c b/miscutils/strings.c
index 4d9bfe690..ccb05f6d4 100644
--- a/miscutils/strings.c
+++ b/miscutils/strings.c
@@ -7,11 +7,11 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config STRINGS
-//config:       bool "strings"
+//config:       bool "strings (4.3 kb)"
 //config:       default y
 //config:       help
-//config:         strings prints the printable character sequences for each file
-//config:         specified.
+//config:       strings prints the printable character sequences for each file
+//config:       specified.
 
 //applet:IF_STRINGS(APPLET(strings, BB_DIR_USR_BIN, BB_SUID_DROP))
 
diff --git a/miscutils/time.c b/miscutils/time.c
index e377bb6b7..60fc11f6e 100644
--- a/miscutils/time.c
+++ b/miscutils/time.c
@@ -9,12 +9,12 @@
    Heavily modified for busybox by Erik Andersen <andersen@codepoet.org>
 */
 //config:config TIME
-//config:       bool "time"
+//config:       bool "time (7 kb)"
 //config:       default y
 //config:       help
-//config:         The time command runs the specified program with the given arguments.
-//config:         When the command finishes, time writes a message to standard output
-//config:         giving timing statistics about this program run.
+//config:       The time command runs the specified program with the given arguments.
+//config:       When the command finishes, time writes a message to standard output
+//config:       giving timing statistics about this program run.
 
 //applet:IF_TIME(APPLET(time, BB_DIR_USR_BIN, BB_SUID_DROP))
 
diff --git a/miscutils/ttysize.c b/miscutils/ttysize.c
index cba65b148..7f6a84308 100644
--- a/miscutils/ttysize.c
+++ b/miscutils/ttysize.c
@@ -10,13 +10,13 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config TTYSIZE
-//config:       bool "ttysize"
+//config:       bool "ttysize (372 bytes)"
 //config:       default y
 //config:       help
-//config:         A replacement for "stty size". Unlike stty, can report only width,
-//config:         only height, or both, in any order. It also does not complain on
-//config:         error, but returns default 80x24.
-//config:         Usage in shell scripts: width=`ttysize w`.
+//config:       A replacement for "stty size". Unlike stty, can report only width,
+//config:       only height, or both, in any order. It also does not complain on
+//config:       error, but returns default 80x24.
+//config:       Usage in shell scripts: width=`ttysize w`.
 
 //applet:IF_TTYSIZE(APPLET(ttysize, BB_DIR_USR_BIN, BB_SUID_DROP))
 
diff --git a/miscutils/ubi_tools.c b/miscutils/ubi_tools.c
index 982e3e52a..c6ba22adf 100644
--- a/miscutils/ubi_tools.c
+++ b/miscutils/ubi_tools.c
@@ -4,46 +4,46 @@
  */
 
 //config:config UBIATTACH
-//config:       bool "ubiattach"
+//config:       bool "ubiattach (4.7 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         Attach MTD device to an UBI device.
+//config:       Attach MTD device to an UBI device.
 //config:
 //config:config UBIDETACH
-//config:       bool "ubidetach"
+//config:       bool "ubidetach (4.6 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         Detach MTD device from an UBI device.
+//config:       Detach MTD device from an UBI device.
 //config:
 //config:config UBIMKVOL
-//config:       bool "ubimkvol"
+//config:       bool "ubimkvol (5.8 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         Create a UBI volume.
+//config:       Create a UBI volume.
 //config:
 //config:config UBIRMVOL
-//config:       bool "ubirmvol"
+//config:       bool "ubirmvol (5.2 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         Delete a UBI volume.
+//config:       Delete a UBI volume.
 //config:
 //config:config UBIRSVOL
-//config:       bool "ubirsvol"
+//config:       bool "ubirsvol (4.6 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         Resize a UBI volume.
+//config:       Resize a UBI volume.
 //config:
 //config:config UBIUPDATEVOL
-//config:       bool "ubiupdatevol"
+//config:       bool "ubiupdatevol (5.6 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         Update a UBI volume.
+//config:       Update a UBI volume.
 
 //                       APPLET_ODDNAME:name       main       location         suid_type     help
 //applet:IF_UBIATTACH(   APPLET_ODDNAME(ubiattach, ubi_tools, BB_DIR_USR_SBIN, BB_SUID_DROP, ubiattach))
diff --git a/miscutils/ubirename.c b/miscutils/ubirename.c
index 8b1c3785a..786c4b9fa 100644
--- a/miscutils/ubirename.c
+++ b/miscutils/ubirename.c
@@ -7,11 +7,11 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config UBIRENAME
-//config:       bool "ubirename"
+//config:       bool "ubirename (2.2 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         Utility to rename UBI volumes
+//config:       Utility to rename UBI volumes
 
 //applet:IF_UBIRENAME(APPLET(ubirename, BB_DIR_USR_SBIN, BB_SUID_DROP))
 
diff --git a/miscutils/volname.c b/miscutils/volname.c
index 6d1addbb5..6e6bbaa44 100644
--- a/miscutils/volname.c
+++ b/miscutils/volname.c
@@ -28,10 +28,10 @@
  * Matthew Stoltenberg <d3matt@gmail.com>
  */
 //config:config VOLNAME
-//config:       bool "volname"
+//config:       bool "volname (1.7 kb)"
 //config:       default y
 //config:       help
-//config:         Prints a CD-ROM volume name.
+//config:       Prints a CD-ROM volume name.
 
 //applet:IF_VOLNAME(APPLET(volname, BB_DIR_USR_BIN, BB_SUID_DROP))
 
diff --git a/miscutils/watchdog.c b/miscutils/watchdog.c
index d379a97f4..ec06bcb51 100644
--- a/miscutils/watchdog.c
+++ b/miscutils/watchdog.c
@@ -9,16 +9,16 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config WATCHDOG
-//config:       bool "watchdog"
+//config:       bool "watchdog (5.1 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         The watchdog utility is used with hardware or software watchdog
-//config:         device drivers. It opens the specified watchdog device special file
-//config:         and periodically writes a magic character to the device. If the
-//config:         watchdog applet ever fails to write the magic character within a
-//config:         certain amount of time, the watchdog device assumes the system has
-//config:         hung, and will cause the hardware to reboot.
+//config:       The watchdog utility is used with hardware or software watchdog
+//config:       device drivers. It opens the specified watchdog device special file
+//config:       and periodically writes a magic character to the device. If the
+//config:       watchdog applet ever fails to write the magic character within a
+//config:       certain amount of time, the watchdog device assumes the system has
+//config:       hung, and will cause the hardware to reboot.
 
 //applet:IF_WATCHDOG(APPLET(watchdog, BB_DIR_SBIN, BB_SUID_DROP))
 
diff --git a/modutils/Config.src b/modutils/Config.src
index 9b76c83d2..e413702bb 100644
--- a/modutils/Config.src
+++ b/modutils/Config.src
@@ -9,29 +9,29 @@ config MODPROBE_SMALL
         bool "Simplified modutils"
         default y
         help
-          Build smaller (~1.5 kbytes), simplified module tools.
+        Build smaller (~1.5 kbytes), simplified module tools.
 
-          This option by itself does not enable any applets -
-          you need to select applets individually below.
+        This option by itself does not enable any applets -
+        you need to select applets individually below.
 
-          With this option modprobe does not require modules.dep file
-          and does not use /etc/modules.conf file.
-          It scans module files in /lib/modules/`uname -r` and
-          determines dependencies and module alias names on the fly.
-          This may make module loading slower, most notably
-          when one needs to load module by alias (this requires
-          scanning through module _bodies_).
+        With this option modprobe does not require modules.dep file
+        and does not use /etc/modules.conf file.
+        It scans module files in /lib/modules/`uname -r` and
+        determines dependencies and module alias names on the fly.
+        This may make module loading slower, most notably
+        when one needs to load module by alias (this requires
+        scanning through module _bodies_).
 
-          At the first attempt to load a module by alias modprobe
-          will try to generate modules.dep.bb file in order to speed up
-          future loads by alias. Failure to do so (read-only /lib/modules,
-          etc) is not reported, and future modprobes will be slow too.
+        At the first attempt to load a module by alias modprobe
+        will try to generate modules.dep.bb file in order to speed up
+        future loads by alias. Failure to do so (read-only /lib/modules,
+        etc) is not reported, and future modprobes will be slow too.
 
-          NB: modules.dep.bb file format is not compatible
-          with modules.dep file as created/used by standard module tools.
+        NB: modules.dep.bb file format is not compatible
+        with modules.dep file as created/used by standard module tools.
 
-          Additional module parameters can be stored in
-          /etc/modules/$module_name files.
+        Additional module parameters can be stored in
+        /etc/modules/$module_name files.
 
 INSERT
 
@@ -42,145 +42,145 @@ config FEATURE_CMDLINE_MODULE_OPTIONS
         default y
         depends on INSMOD || MODPROBE
         help
-          Allow insmod and modprobe take module options from the applets'
-          command line.
+        Allow insmod and modprobe take module options from the applets'
+        command line.
 
 config FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED
         bool "Skip loading of already loaded modules"
         default y
         depends on MODPROBE_SMALL && (DEPMOD || INSMOD || MODPROBE)
         help
-          Check if the module is already loaded.
+        Check if the module is already loaded.
 
 config FEATURE_2_4_MODULES
         bool "Support version 2.2/2.4 Linux kernels"
         default n
         depends on (INSMOD || LSMOD || MODPROBE || RMMOD) && !MODPROBE_SMALL
         help
-          Support module loading for 2.2.x and 2.4.x Linux kernels.
-          This increases size considerably. Say N unless you plan
-          to run ancient kernels.
+        Support module loading for 2.2.x and 2.4.x Linux kernels.
+        This increases size considerably. Say N unless you plan
+        to run ancient kernels.
 
 config FEATURE_INSMOD_VERSION_CHECKING
         bool "Enable module version checking"
         default n
         depends on FEATURE_2_4_MODULES && (INSMOD || MODPROBE)
         help
-          Support checking of versions for modules. This is used to
-          ensure that the kernel and module are made for each other.
+        Support checking of versions for modules. This is used to
+        ensure that the kernel and module are made for each other.
 
 config FEATURE_INSMOD_KSYMOOPS_SYMBOLS
         bool "Add module symbols to kernel symbol table"
         default n
         depends on FEATURE_2_4_MODULES && (INSMOD || MODPROBE)
         help
-          By adding module symbols to the kernel symbol table, Oops messages
-          occurring within kernel modules can be properly debugged. By enabling
-          this feature, module symbols will always be added to the kernel symbol
-          table for proper debugging support. If you are not interested in
-          Oops messages from kernel modules, say N.
+        By adding module symbols to the kernel symbol table, Oops messages
+        occurring within kernel modules can be properly debugged. By enabling
+        this feature, module symbols will always be added to the kernel symbol
+        table for proper debugging support. If you are not interested in
+        Oops messages from kernel modules, say N.
 
 config FEATURE_INSMOD_LOADINKMEM
         bool "In kernel memory optimization (uClinux only)"
         default n
         depends on FEATURE_2_4_MODULES && (INSMOD || MODPROBE)
         help
-          This is a special uClinux only memory optimization that lets insmod
-          load the specified kernel module directly into kernel space, reducing
-          memory usage by preventing the need for two copies of the module
-          being loaded into memory.
+        This is a special uClinux only memory optimization that lets insmod
+        load the specified kernel module directly into kernel space, reducing
+        memory usage by preventing the need for two copies of the module
+        being loaded into memory.
 
 config FEATURE_INSMOD_LOAD_MAP
         bool "Enable insmod load map (-m) option"
         default n
         depends on FEATURE_2_4_MODULES && INSMOD
         help
-          Enabling this, one would be able to get a load map
-          output on stdout. This makes kernel module debugging
-          easier.
-          If you don't plan to debug kernel modules, you
-          don't need this option.
+        Enabling this, one would be able to get a load map
+        output on stdout. This makes kernel module debugging
+        easier.
+        If you don't plan to debug kernel modules, you
+        don't need this option.
 
 config FEATURE_INSMOD_LOAD_MAP_FULL
         bool "Symbols in load map"
         default y
         depends on FEATURE_INSMOD_LOAD_MAP
         help
-          Without this option, -m will only output section
-          load map. With this option, -m will also output
-          symbols load map.
+        Without this option, -m will only output section
+        load map. With this option, -m will also output
+        symbols load map.
 
 config FEATURE_CHECK_TAINTED_MODULE
         bool "Support tainted module checking with new kernels"
         default y
         depends on (LSMOD || FEATURE_2_4_MODULES) && !MODPROBE_SMALL
         help
-          Support checking for tainted modules. These are usually binary
-          only modules that will make the linux-kernel list ignore your
-          support request.
-          This option is required to support GPLONLY modules.
+        Support checking for tainted modules. These are usually binary
+        only modules that will make the linux-kernel list ignore your
+        support request.
+        This option is required to support GPLONLY modules.
 
 config FEATURE_INSMOD_TRY_MMAP
         bool "Try to load module from a mmap'ed area"
         default n
         depends on (INSMOD || MODPROBE) && !MODPROBE_SMALL
         help
-          This option causes module loading code to try to mmap
-          module first. If it does not work (for example,
-          it does not work for compressed modules), module will be read
-          (and unpacked if needed) into a memory block allocated by malloc.
+        This option causes module loading code to try to mmap
+        module first. If it does not work (for example,
+        it does not work for compressed modules), module will be read
+        (and unpacked if needed) into a memory block allocated by malloc.
 
-          The only case when mmap works but malloc does not is when
-          you are trying to load a big module on a very memory-constrained
-          machine. Malloc will momentarily need 2x as much memory as mmap.
+        The only case when mmap works but malloc does not is when
+        you are trying to load a big module on a very memory-constrained
+        machine. Malloc will momentarily need 2x as much memory as mmap.
 
-          Choosing N saves about 250 bytes of code (on 32-bit x86).
+        Choosing N saves about 250 bytes of code (on 32-bit x86).
 
 config FEATURE_MODUTILS_ALIAS
         bool "Support module.aliases file"
         default y
         depends on (DEPMOD || MODPROBE) && !MODPROBE_SMALL
         help
-          Generate and parse modules.alias containing aliases for bus
-          identifiers:
-            alias pcmcia:m*c*f03fn*pfn*pa*pb*pc*pd* parport_cs
+        Generate and parse modules.alias containing aliases for bus
+        identifiers:
+                alias pcmcia:m*c*f03fn*pfn*pa*pb*pc*pd* parport_cs
 
-          and aliases for logical modules names e.g.:
-            alias padlock_aes aes
-            alias aes_i586 aes
-            alias aes_generic aes
+        and aliases for logical modules names e.g.:
+                alias padlock_aes aes
+                alias aes_i586 aes
+                alias aes_generic aes
 
-          Say Y if unsure.
+        Say Y if unsure.
 
 config FEATURE_MODUTILS_SYMBOLS
         bool "Support module.symbols file"
         default y
         depends on (DEPMOD || MODPROBE) && !MODPROBE_SMALL
         help
-          Generate and parse modules.symbols containing aliases for
-          symbol_request() kernel calls, such as:
-            alias symbol:usb_sg_init usbcore
+        Generate and parse modules.symbols containing aliases for
+        symbol_request() kernel calls, such as:
+                alias symbol:usb_sg_init usbcore
 
-          Say Y if unsure.
+        Say Y if unsure.
 
 config DEFAULT_MODULES_DIR
         string "Default directory containing modules"
         default "/lib/modules"
         depends on DEPMOD || MODPROBE || MODINFO
         help
-          Directory that contains kernel modules.
-          Defaults to "/lib/modules"
+        Directory that contains kernel modules.
+        Defaults to "/lib/modules"
 
 config DEFAULT_DEPMOD_FILE
         string "Default name of modules.dep"
         default "modules.dep"
         depends on DEPMOD || MODPROBE || MODINFO
         help
-          Filename that contains kernel modules dependencies.
-          Defaults to "modules.dep".
-          If you configured the "simplified modutils" (MODPROBE_SMALL), a
-          ".bb" suffix will be added after this name. Do not specify ".bb"
-          here unless you intend your depmod or modprobe to work on
-          "modules.dep.bb.bb" or such.
+        Filename that contains kernel modules dependencies.
+        Defaults to "modules.dep".
+        If you configured the "simplified modutils" (MODPROBE_SMALL), a
+        ".bb" suffix will be added after this name. Do not specify ".bb"
+        here unless you intend your depmod or modprobe to work on
+        "modules.dep.bb.bb" or such.
 
 endmenu
diff --git a/modutils/depmod.c b/modutils/depmod.c
index b7965ebd2..004c67a11 100644
--- a/modutils/depmod.c
+++ b/modutils/depmod.c
@@ -8,13 +8,13 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config DEPMOD
-//config:       bool "depmod"
+//config:       bool "depmod (26 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         depmod generates modules.dep (and potentially modules.alias
-//config:         and modules.symbols) that contain dependency information
-//config:         for modprobe.
+//config:       depmod generates modules.dep (and potentially modules.alias
+//config:       and modules.symbols) that contain dependency information
+//config:       for modprobe.
 
 //applet:IF_DEPMOD(IF_NOT_MODPROBE_SMALL(APPLET(depmod, BB_DIR_SBIN, BB_SUID_DROP)))
 
diff --git a/modutils/insmod.c b/modutils/insmod.c
index 8526979eb..b8ede8a81 100644
--- a/modutils/insmod.c
+++ b/modutils/insmod.c
@@ -7,11 +7,11 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config INSMOD
-//config:       bool "insmod"
+//config:       bool "insmod (22 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         insmod is used to load specified modules in the running kernel.
+//config:       insmod is used to load specified modules in the running kernel.
 
 //applet:IF_INSMOD(IF_NOT_MODPROBE_SMALL(APPLET(insmod, BB_DIR_SBIN, BB_SUID_DROP)))
 
diff --git a/modutils/lsmod.c b/modutils/lsmod.c
index 24e5d35b9..4bf8f8481 100644
--- a/modutils/lsmod.c
+++ b/modutils/lsmod.c
@@ -8,20 +8,20 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config LSMOD
-//config:       bool "lsmod"
+//config:       bool "lsmod (4.3 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         lsmod is used to display a list of loaded modules.
+//config:       lsmod is used to display a list of loaded modules.
 //config:
 //config:config FEATURE_LSMOD_PRETTY_2_6_OUTPUT
 //config:       bool "Pretty output"
 //config:       default y
 //config:       depends on LSMOD && !MODPROBE_SMALL
 //config:       help
-//config:         This option makes output format of lsmod adjusted to
-//config:         the format of module-init-tools for Linux kernel 2.6.
-//config:         Increases size somewhat.
+//config:       This option makes output format of lsmod adjusted to
+//config:       the format of module-init-tools for Linux kernel 2.6.
+//config:       Increases size somewhat.
 
 //applet:IF_LSMOD(IF_NOT_MODPROBE_SMALL(APPLET(lsmod, BB_DIR_SBIN, BB_SUID_DROP)))
 
diff --git a/modutils/modinfo.c b/modutils/modinfo.c
index ead2cf16f..371c93991 100644
--- a/modutils/modinfo.c
+++ b/modutils/modinfo.c
@@ -6,11 +6,11 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config MODINFO
-//config:       bool "modinfo"
+//config:       bool "modinfo (25 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         Show information about a Linux Kernel module
+//config:       Show information about a Linux Kernel module
 
 //applet:IF_MODINFO(APPLET(modinfo, BB_DIR_SBIN, BB_SUID_DROP))
 
diff --git a/modutils/modprobe.c b/modutils/modprobe.c
index 51ede9204..1a7db09f2 100644
--- a/modutils/modprobe.c
+++ b/modutils/modprobe.c
@@ -8,23 +8,23 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config MODPROBE
-//config:       bool "modprobe"
+//config:       bool "modprobe (29 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         Handle the loading of modules, and their dependencies on a high
-//config:         level.
+//config:       Handle the loading of modules, and their dependencies on a high
+//config:       level.
 //config:
 //config:config FEATURE_MODPROBE_BLACKLIST
 //config:       bool "Blacklist support"
 //config:       default y
 //config:       depends on MODPROBE && !MODPROBE_SMALL
 //config:       help
-//config:         Say 'y' here to enable support for the 'blacklist' command in
-//config:         modprobe.conf. This prevents the alias resolver to resolve
-//config:         blacklisted modules. This is useful if you want to prevent your
-//config:         hardware autodetection scripts to load modules like evdev, frame
-//config:         buffer drivers etc.
+//config:       Say 'y' here to enable support for the 'blacklist' command in
+//config:       modprobe.conf. This prevents the alias resolver to resolve
+//config:       blacklisted modules. This is useful if you want to prevent your
+//config:       hardware autodetection scripts to load modules like evdev, frame
+//config:       buffer drivers etc.
 
 //applet:IF_MODPROBE(IF_NOT_MODPROBE_SMALL(APPLET(modprobe, BB_DIR_SBIN, BB_SUID_DROP)))
 
diff --git a/modutils/rmmod.c b/modutils/rmmod.c
index 527696f63..d60e49413 100644
--- a/modutils/rmmod.c
+++ b/modutils/rmmod.c
@@ -8,11 +8,11 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config RMMOD
-//config:       bool "rmmod"
+//config:       bool "rmmod (3.6 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         rmmod is used to unload specified modules from the kernel.
+//config:       rmmod is used to unload specified modules from the kernel.
 
 //applet:IF_RMMOD(IF_NOT_MODPROBE_SMALL(APPLET(rmmod, BB_DIR_SBIN, BB_SUID_DROP)))
 
diff --git a/networking/Config.src b/networking/Config.src
index 0adb1e2f9..492c60da4 100644
--- a/networking/Config.src
+++ b/networking/Config.src
@@ -9,42 +9,42 @@ config FEATURE_IPV6
         bool "Enable IPv6 support"
         default y
         help
-          Enable IPv6 support in busybox.
-          This adds IPv6 support in the networking applets.
+        Enable IPv6 support in busybox.
+        This adds IPv6 support in the networking applets.
 
 config 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 FEATURE_PREFER_IPV4_ADDRESS
         bool "Prefer IPv4 addresses from DNS queries"
         default y
         depends on 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 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.
 
 INSERT
 
@@ -55,8 +55,8 @@ config IFUPDOWN_UDHCPC_CMD_OPTIONS
         default "-R -n"
         depends on IFUP || IFDOWN
         help
-          Command line options to pass to udhcpc from ifup.
-          Intended to alter options not available in /etc/network/interfaces.
-          (IE: --syslog --background etc...)
+        Command line options to pass to udhcpc from ifup.
+        Intended to alter options not available in /etc/network/interfaces.
+        (IE: --syslog --background etc...)
 
 endmenu
diff --git a/networking/arp.c b/networking/arp.c
index a62a3761c..177ab1571 100644
--- a/networking/arp.c
+++ b/networking/arp.c
@@ -13,11 +13,11 @@
  * modified for getopt32 by Arne Bernin <arne [at] alamut.de>
  */
 //config:config ARP
-//config:       bool "arp"
+//config:       bool "arp (11 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         Manipulate the system ARP cache.
+//config:       Manipulate the system ARP cache.
 
 //applet:IF_ARP(APPLET(arp, BB_DIR_SBIN, BB_SUID_DROP))
 
diff --git a/networking/arping.c b/networking/arping.c
index 5bfeb1b45..71672957e 100644
--- a/networking/arping.c
+++ b/networking/arping.c
@@ -6,11 +6,11 @@
  * Busybox port: Nick Fedchik <nick@fedchik.org.ua>
  */
 //config:config ARPING
-//config:       bool "arping"
+//config:       bool "arping (9.3 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         Ping hosts by ARP packets.
+//config:       Ping hosts by ARP packets.
 //config:
 
 //applet:IF_ARPING(APPLET(arping, BB_DIR_USR_SBIN, BB_SUID_DROP))
diff --git a/networking/brctl.c b/networking/brctl.c
index 35876896e..690791e4c 100644
--- a/networking/brctl.c
+++ b/networking/brctl.c
@@ -13,31 +13,31 @@
  * At the time of this writing this was considered a feature.
  */
 //config:config BRCTL
-//config:       bool "brctl"
+//config:       bool "brctl (4.7 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         Manage ethernet bridges.
-//config:         Supports addbr/delbr and addif/delif.
+//config:       Manage ethernet bridges.
+//config:       Supports addbr/delbr and addif/delif.
 //config:
 //config:config FEATURE_BRCTL_FANCY
 //config:       bool "Fancy options"
 //config:       default y
 //config:       depends on BRCTL
 //config:       help
-//config:         Add support for extended option like:
-//config:           setageing, setfd, sethello, setmaxage,
-//config:           setpathcost, setportprio, setbridgeprio,
-//config:           stp
-//config:         This adds about 600 bytes.
+//config:       Add support for extended option like:
+//config:               setageing, setfd, sethello, setmaxage,
+//config:               setpathcost, setportprio, setbridgeprio,
+//config:               stp
+//config:       This adds about 600 bytes.
 //config:
 //config:config FEATURE_BRCTL_SHOW
 //config:       bool "Support show"
 //config:       default y
 //config:       depends on BRCTL && FEATURE_BRCTL_FANCY
 //config:       help
-//config:         Add support for option which prints the current config:
-//config:           show
+//config:       Add support for option which prints the current config:
+//config:               show
 
 //applet:IF_BRCTL(APPLET(brctl, BB_DIR_USR_SBIN, BB_SUID_DROP))
 
diff --git a/networking/dnsd.c b/networking/dnsd.c
index 1b85618c6..37a80309d 100644
--- a/networking/dnsd.c
+++ b/networking/dnsd.c
@@ -17,10 +17,10 @@
  * the first porting of oao' scdns to busybox also.
  */
 //config:config DNSD
-//config:       bool "dnsd"
+//config:       bool "dnsd (9.8 kb)"
 //config:       default y
 //config:       help
-//config:         Small and static DNS server daemon.
+//config:       Small and static DNS server daemon.
 
 //applet:IF_DNSD(APPLET(dnsd, BB_DIR_USR_SBIN, BB_SUID_DROP))
 
diff --git a/networking/ether-wake.c b/networking/ether-wake.c
index d7d691772..52522e76d 100644
--- a/networking/ether-wake.c
+++ b/networking/ether-wake.c
@@ -64,11 +64,11 @@
  *   filter.  That configuration consumes more power.
  */
 //config:config ETHER_WAKE
-//config:       bool "ether-wake"
+//config:       bool "ether-wake (6.6 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         Send a magic packet to wake up sleeping machines.
+//config:       Send a magic packet to wake up sleeping machines.
 
 //applet:IF_ETHER_WAKE(APPLET_ODDNAME(ether-wake, ether_wake, BB_DIR_USR_SBIN, BB_SUID_DROP, ether_wake))
 
diff --git a/networking/ftpd.c b/networking/ftpd.c
index 439608ce6..aee00e1c3 100644
--- a/networking/ftpd.c
+++ b/networking/ftpd.c
@@ -12,35 +12,35 @@
  * You have to run this daemon via inetd.
  */
 //config:config FTPD
-//config:       bool "ftpd"
+//config:       bool "ftpd (30 kb)"
 //config:       default y
 //config:       help
-//config:         Simple FTP daemon. You have to run it via inetd.
+//config:       Simple FTP daemon. You have to run it via inetd.
 //config:
 //config:config FEATURE_FTPD_WRITE
 //config:       bool "Enable upload commands"
 //config:       default y
 //config:       depends on FTPD
 //config:       help
-//config:         Enable all kinds of FTP upload commands (-w option)
+//config:       Enable all kinds of FTP upload commands (-w option)
 //config:
 //config:config FEATURE_FTPD_ACCEPT_BROKEN_LIST
 //config:       bool "Enable workaround for RFC-violating clients"
 //config:       default y
 //config:       depends on FTPD
 //config:       help
-//config:         Some ftp clients (among them KDE's Konqueror) issue illegal
-//config:         "LIST -l" requests. This option works around such problems.
-//config:         It might prevent you from listing files starting with "-" and
-//config:         it increases the code size by ~40 bytes.
-//config:         Most other ftp servers seem to behave similar to this.
+//config:       Some ftp clients (among them KDE's Konqueror) issue illegal
+//config:       "LIST -l" requests. This option works around such problems.
+//config:       It might prevent you from listing files starting with "-" and
+//config:       it increases the code size by ~40 bytes.
+//config:       Most other ftp servers seem to behave similar to this.
 //config:
 //config:config FEATURE_FTPD_AUTHENTICATION
 //config:       bool "Enable authentication"
 //config:       default y
 //config:       depends on FTPD
 //config:       help
-//config:         Enable basic system login as seen in telnet etc.
+//config:       Enable basic system login as seen in telnet etc.
 
 //applet:IF_FTPD(APPLET(ftpd, BB_DIR_USR_SBIN, BB_SUID_DROP))
 
diff --git a/networking/ftpgetput.c b/networking/ftpgetput.c
index 3eadd752d..cb0a96b59 100644
--- a/networking/ftpgetput.c
+++ b/networking/ftpgetput.c
@@ -13,16 +13,16 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config FTPGET
-//config:       bool "ftpget"
+//config:       bool "ftpget (8 kb)"
 //config:       default y
 //config:       help
-//config:         Retrieve a remote file via FTP.
+//config:       Retrieve a remote file via FTP.
 //config:
 //config:config FTPPUT
-//config:       bool "ftpput"
+//config:       bool "ftpput (7.7 kb)"
 //config:       default y
 //config:       help
-//config:         Store a remote file via FTP.
+//config:       Store a remote file via FTP.
 //config:
 //config:config FEATURE_FTPGETPUT_LONG_OPTIONS
 //config:       bool "Enable long options in ftpget/ftpput"
diff --git a/networking/hostname.c b/networking/hostname.c
index 9f2418422..4b305d2b6 100644
--- a/networking/hostname.c
+++ b/networking/hostname.c
@@ -11,16 +11,16 @@
  */
 
 //config:config HOSTNAME
-//config:       bool "hostname"
+//config:       bool "hostname (5.6 kb)"
 //config:       default y
 //config:       help
-//config:         Show or set the system's host name.
+//config:       Show or set the system's host name.
 //config:
 //config:config DNSDOMAINNAME
-//config:       bool "dnsdomainname"
+//config:       bool "dnsdomainname (3.6 kb)"
 //config:       default y
 //config:       help
-//config:         Alias to "hostname -d".
+//config:       Alias to "hostname -d".
 
 //                        APPLET_ODDNAME:name           main      location    suid_type     help
 //applet:IF_DNSDOMAINNAME(APPLET_ODDNAME(dnsdomainname, hostname, BB_DIR_BIN, BB_SUID_DROP, dnsdomainname))
diff --git a/networking/httpd.c b/networking/httpd.c
index e072f23c7..cfc07075b 100644
--- a/networking/httpd.c
+++ b/networking/httpd.c
@@ -99,123 +99,123 @@
  */
  /* TODO: use TCP_CORK, parse_config() */
 //config:config HTTPD
-//config:       bool "httpd"
+//config:       bool "httpd (32 kb)"
 //config:       default y
 //config:       help
-//config:         HTTP server.
+//config:       HTTP server.
 //config:
 //config:config FEATURE_HTTPD_RANGES
 //config:       bool "Support 'Ranges:' header"
 //config:       default y
 //config:       depends on HTTPD
 //config:       help
-//config:         Makes httpd emit "Accept-Ranges: bytes" header and understand
-//config:         "Range: bytes=NNN-[MMM]" header. Allows for resuming interrupted
-//config:         downloads, seeking in multimedia players etc.
+//config:       Makes httpd emit "Accept-Ranges: bytes" header and understand
+//config:       "Range: bytes=NNN-[MMM]" header. Allows for resuming interrupted
+//config:       downloads, seeking in multimedia players etc.
 //config:
 //config:config FEATURE_HTTPD_SETUID
 //config:       bool "Enable -u <user> option"
 //config:       default y
 //config:       depends on HTTPD
 //config:       help
-//config:         This option allows the server to run as a specific user
-//config:         rather than defaulting to the user that starts the server.
-//config:         Use of this option requires special privileges to change to a
-//config:         different user.
+//config:       This option allows the server to run as a specific user
+//config:       rather than defaulting to the user that starts the server.
+//config:       Use of this option requires special privileges to change to a
+//config:       different user.
 //config:
 //config:config FEATURE_HTTPD_BASIC_AUTH
 //config:       bool "Enable Basic http Authentication"
 //config:       default y
 //config:       depends on HTTPD
 //config:       help
-//config:         Utilizes password settings from /etc/httpd.conf for basic
-//config:         authentication on a per url basis.
-//config:         Example for httpd.conf file:
-//config:         /adm:toor:PaSsWd
+//config:       Utilizes password settings from /etc/httpd.conf for basic
+//config:       authentication on a per url basis.
+//config:       Example for httpd.conf file:
+//config:       /adm:toor:PaSsWd
 //config:
 //config:config FEATURE_HTTPD_AUTH_MD5
 //config:       bool "Support MD5 crypted passwords for http Authentication"
 //config:       default y
 //config:       depends on FEATURE_HTTPD_BASIC_AUTH
 //config:       help
-//config:         Enables encrypted passwords, and wildcard user/passwords
-//config:         in httpd.conf file.
-//config:         User '*' means 'any system user name is ok',
-//config:         password of '*' means 'use system password for this user'
-//config:         Examples:
-//config:         /adm:toor:$1$P/eKnWXS$aI1aPGxT.dJD5SzqAKWrF0
-//config:         /adm:root:*
-//config:         /wiki:*:*
+//config:       Enables encrypted passwords, and wildcard user/passwords
+//config:       in httpd.conf file.
+//config:       User '*' means 'any system user name is ok',
+//config:       password of '*' means 'use system password for this user'
+//config:       Examples:
+//config:       /adm:toor:$1$P/eKnWXS$aI1aPGxT.dJD5SzqAKWrF0
+//config:       /adm:root:*
+//config:       /wiki:*:*
 //config:
 //config:config FEATURE_HTTPD_CGI
 //config:       bool "Support Common Gateway Interface (CGI)"
 //config:       default y
 //config:       depends on HTTPD
 //config:       help
-//config:         This option allows scripts and executables to be invoked
-//config:         when specific URLs are requested.
+//config:       This option allows scripts and executables to be invoked
+//config:       when specific URLs are requested.
 //config:
 //config:config FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR
 //config:       bool "Support running scripts through an interpreter"
 //config:       default y
 //config:       depends on FEATURE_HTTPD_CGI
 //config:       help
-//config:         This option enables support for running scripts through an
-//config:         interpreter. Turn this on if you want PHP scripts to work
-//config:         properly. You need to supply an additional line in your
-//config:         httpd.conf file:
-//config:         *.php:/path/to/your/php
+//config:       This option enables support for running scripts through an
+//config:       interpreter. Turn this on if you want PHP scripts to work
+//config:       properly. You need to supply an additional line in your
+//config:       httpd.conf file:
+//config:       *.php:/path/to/your/php
 //config:
 //config:config FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV
 //config:       bool "Set REMOTE_PORT environment variable for CGI"
 //config:       default y
 //config:       depends on FEATURE_HTTPD_CGI
 //config:       help
-//config:         Use of this option can assist scripts in generating
-//config:         references that contain a unique port number.
+//config:       Use of this option can assist scripts in generating
+//config:       references that contain a unique port number.
 //config:
 //config:config FEATURE_HTTPD_ENCODE_URL_STR
 //config:       bool "Enable -e option (useful for CGIs written as shell scripts)"
 //config:       default y
 //config:       depends on HTTPD
 //config:       help
-//config:         This option allows html encoding of arbitrary strings for display
-//config:         by the browser. Output goes to stdout.
-//config:         For example, httpd -e "<Hello World>" produces
-//config:         "&#60Hello&#32World&#62".
+//config:       This option allows html encoding of arbitrary strings for display
+//config:       by the browser. Output goes to stdout.
+//config:       For example, httpd -e "<Hello World>" produces
+//config:       "&#60Hello&#32World&#62".
 //config:
 //config:config FEATURE_HTTPD_ERROR_PAGES
 //config:       bool "Support custom error pages"
 //config:       default y
 //config:       depends on HTTPD
 //config:       help
-//config:         This option allows you to define custom error pages in
-//config:         the configuration file instead of the default HTTP status
-//config:         error pages. For instance, if you add the line:
-//config:               E404:/path/e404.html
-//config:         in the config file, the server will respond the specified
-//config:         '/path/e404.html' file instead of the terse '404 NOT FOUND'
-//config:         message.
+//config:       This option allows you to define custom error pages in
+//config:       the configuration file instead of the default HTTP status
+//config:       error pages. For instance, if you add the line:
+//config:               E404:/path/e404.html
+//config:       in the config file, the server will respond the specified
+//config:       '/path/e404.html' file instead of the terse '404 NOT FOUND'
+//config:       message.
 //config:
 //config:config FEATURE_HTTPD_PROXY
 //config:       bool "Support reverse proxy"
 //config:       default y
 //config:       depends on HTTPD
 //config:       help
-//config:         This option allows you to define URLs that will be forwarded
-//config:         to another HTTP server. To setup add the following line to the
-//config:         configuration file
-//config:               P:/url/:http://hostname[:port]/new/path/
-//config:         Then a request to /url/myfile will be forwarded to
-//config:         http://hostname[:port]/new/path/myfile.
+//config:       This option allows you to define URLs that will be forwarded
+//config:       to another HTTP server. To setup add the following line to the
+//config:       configuration file
+//config:               P:/url/:http://hostname[:port]/new/path/
+//config:       Then a request to /url/myfile will be forwarded to
+//config:       http://hostname[:port]/new/path/myfile.
 //config:
 //config:config FEATURE_HTTPD_GZIP
 //config:       bool "Support GZIP content encoding"
 //config:       default y
 //config:       depends on HTTPD
 //config:       help
-//config:         Makes httpd send files using GZIP content encoding if the
-//config:         client supports it and a pre-compressed <file>.gz exists.
+//config:       Makes httpd send files using GZIP content encoding if the
+//config:       client supports it and a pre-compressed <file>.gz exists.
 
 //applet:IF_HTTPD(APPLET(httpd, BB_DIR_USR_SBIN, BB_SUID_DROP))
 
diff --git a/networking/ifconfig.c b/networking/ifconfig.c
index 9e16936d8..d1e9c58dc 100644
--- a/networking/ifconfig.c
+++ b/networking/ifconfig.c
@@ -26,52 +26,52 @@
  * IPV6 support added by Bart Visscher <magick@linux-fan.com>
  */
 //config:config IFCONFIG
-//config:       bool "ifconfig"
+//config:       bool "ifconfig (12 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         Ifconfig is used to configure the kernel-resident network interfaces.
+//config:       Ifconfig is used to configure the kernel-resident network interfaces.
 //config:
 //config:config FEATURE_IFCONFIG_STATUS
 //config:       bool "Enable status reporting output (+7k)"
 //config:       default y
 //config:       depends on IFCONFIG
 //config:       help
-//config:         If ifconfig is called with no arguments it will display the status
-//config:         of the currently active interfaces.
+//config:       If ifconfig is called with no arguments it will display the status
+//config:       of the currently active interfaces.
 //config:
 //config:config FEATURE_IFCONFIG_SLIP
 //config:       bool "Enable slip-specific options \"keepalive\" and \"outfill\""
 //config:       default y
 //config:       depends on IFCONFIG
 //config:       help
-//config:         Allow "keepalive" and "outfill" support for SLIP. If you're not
-//config:         planning on using serial lines, leave this unchecked.
+//config:       Allow "keepalive" and "outfill" support for SLIP. If you're not
+//config:       planning on using serial lines, leave this unchecked.
 //config:
 //config:config FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ
 //config:       bool "Enable options \"mem_start\", \"io_addr\", and \"irq\""
 //config:       default y
 //config:       depends on IFCONFIG
 //config:       help
-//config:         Allow the start address for shared memory, start address for I/O,
-//config:         and/or the interrupt line used by the specified device.
+//config:       Allow the start address for shared memory, start address for I/O,
+//config:       and/or the interrupt line used by the specified device.
 //config:
 //config:config FEATURE_IFCONFIG_HW
 //config:       bool "Enable option \"hw\" (ether only)"
 //config:       default y
 //config:       depends on IFCONFIG
 //config:       help
-//config:         Set the hardware address of this interface, if the device driver
-//config:         supports  this  operation. Currently, we only support the 'ether'
-//config:         class.
+//config:       Set the hardware address of this interface, if the device driver
+//config:       supports  this  operation. Currently, we only support the 'ether'
+//config:       class.
 //config:
 //config:config FEATURE_IFCONFIG_BROADCAST_PLUS
 //config:       bool "Set the broadcast automatically"
 //config:       default y
 //config:       depends on IFCONFIG
 //config:       help
-//config:         Setting this will make ifconfig attempt to find the broadcast
-//config:         automatically if the value '+' is used.
+//config:       Setting this will make ifconfig attempt to find the broadcast
+//config:       automatically if the value '+' is used.
 
 //applet:IF_IFCONFIG(APPLET(ifconfig, BB_DIR_SBIN, BB_SUID_DROP))
 
diff --git a/networking/ifenslave.c b/networking/ifenslave.c
index 070931209..26e5e8cf3 100644
--- a/networking/ifenslave.c
+++ b/networking/ifenslave.c
@@ -98,12 +98,12 @@
  *         set version to 1.1.0
  */
 //config:config IFENSLAVE
-//config:       bool "ifenslave"
+//config:       bool "ifenslave (13 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         Userspace application to bind several interfaces
-//config:         to a logical interface (use with kernel bonding driver).
+//config:       Userspace application to bind several interfaces
+//config:       to a logical interface (use with kernel bonding driver).
 
 //applet:IF_IFENSLAVE(APPLET(ifenslave, BB_DIR_SBIN, BB_SUID_DROP))
 
diff --git a/networking/ifplugd.c b/networking/ifplugd.c
index 4f8a274b0..9bc1a075f 100644
--- a/networking/ifplugd.c
+++ b/networking/ifplugd.c
@@ -7,11 +7,11 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config IFPLUGD
-//config:       bool "ifplugd"
+//config:       bool "ifplugd (9.9 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         Network interface plug detection daemon.
+//config:       Network interface plug detection daemon.
 
 //applet:IF_IFPLUGD(APPLET(ifplugd, BB_DIR_USR_SBIN, BB_SUID_DROP))
 
@@ -342,10 +342,8 @@ static int run_script(const char *action)
         /* r < 0 - can't exec, 0 <= r < 0x180 - exited, >=0x180 - killed by sig (r-0x180) */
         r = spawn_and_wait(argv);
 
-        unsetenv(IFPLUGD_ENV_PREVIOUS);
-        unsetenv(IFPLUGD_ENV_CURRENT);
-        free(env_PREVIOUS);
-        free(env_CURRENT);
+        bb_unsetenv_and_free(env_PREVIOUS);
+        bb_unsetenv_and_free(env_CURRENT);
 
         bb_error_msg("exit code: %d", r & 0xff);
         return (option_mask32 & FLAG_IGNORE_RETVAL) ? 0 : r;
diff --git a/networking/ifupdown.c b/networking/ifupdown.c
index a76fe1021..f8c29ab00 100644
--- a/networking/ifupdown.c
+++ b/networking/ifupdown.c
@@ -18,66 +18,66 @@
  */
 
 //config:config IFUP
-//config:       bool "ifup"
+//config:       bool "ifup (17 kb)"
 //config:       default y
 //config:       help
-//config:         Activate the specified interfaces. This applet makes use
-//config:         of either "ifconfig" and "route" or the "ip" command to actually
-//config:         configure network interfaces. Therefore, you will probably also want
-//config:         to enable either IFCONFIG and ROUTE, or enable
-//config:         FEATURE_IFUPDOWN_IP and the various IP options. Of
-//config:         course you could use non-busybox versions of these programs, so
-//config:         against my better judgement (since this will surely result in plenty
-//config:         of support questions on the mailing list), I do not force you to
-//config:         enable these additional options. It is up to you to supply either
-//config:         "ifconfig", "route" and "run-parts" or the "ip" command, either
-//config:         via busybox or via standalone utilities.
+//config:       Activate the specified interfaces. This applet makes use
+//config:       of either "ifconfig" and "route" or the "ip" command to actually
+//config:       configure network interfaces. Therefore, you will probably also want
+//config:       to enable either IFCONFIG and ROUTE, or enable
+//config:       FEATURE_IFUPDOWN_IP and the various IP options. Of
+//config:       course you could use non-busybox versions of these programs, so
+//config:       against my better judgement (since this will surely result in plenty
+//config:       of support questions on the mailing list), I do not force you to
+//config:       enable these additional options. It is up to you to supply either
+//config:       "ifconfig", "route" and "run-parts" or the "ip" command, either
+//config:       via busybox or via standalone utilities.
 //config:
 //config:config IFDOWN
-//config:       bool "ifdown"
+//config:       bool "ifdown (15 kb)"
 //config:       default y
 //config:       help
-//config:         Deactivate the specified interfaces.
+//config:       Deactivate the specified interfaces.
 //config:
 //config:config IFUPDOWN_IFSTATE_PATH
 //config:       string "Absolute path to ifstate file"
 //config:       default "/var/run/ifstate"
 //config:       depends on IFUP || IFDOWN
 //config:       help
-//config:         ifupdown keeps state information in a file called ifstate.
-//config:         Typically it is located in /var/run/ifstate, however
-//config:         some distributions tend to put it in other places
-//config:         (debian, for example, uses /etc/network/run/ifstate).
-//config:         This config option defines location of ifstate.
+//config:       ifupdown keeps state information in a file called ifstate.
+//config:       Typically it is located in /var/run/ifstate, however
+//config:       some distributions tend to put it in other places
+//config:       (debian, for example, uses /etc/network/run/ifstate).
+//config:       This config option defines location of ifstate.
 //config:
 //config:config FEATURE_IFUPDOWN_IP
 //config:       bool "Use ip tool (else ifconfig/route is used)"
 //config:       default y
 //config:       depends on IFUP || IFDOWN
 //config:       help
-//config:         Use the iproute "ip" command to implement "ifup" and "ifdown", rather
-//config:         than the default of using the older "ifconfig" and "route" utilities.
+//config:       Use the iproute "ip" command to implement "ifup" and "ifdown", rather
+//config:       than the default of using the older "ifconfig" and "route" utilities.
 //config:
-//config:         If Y: you must install either the full-blown iproute2 package
-//config:         or enable "ip" applet in Busybox, or the "ifup" and "ifdown" applets
-//config:         will not work.
+//config:       If Y: you must install either the full-blown iproute2 package
+//config:       or enable "ip" applet in Busybox, or the "ifup" and "ifdown" applets
+//config:       will not work.
 //config:
-//config:         If N: you must install either the full-blown ifconfig and route
-//config:         utilities, or enable these applets in Busybox.
+//config:       If N: you must install either the full-blown ifconfig and route
+//config:       utilities, or enable these applets in Busybox.
 //config:
 //config:config FEATURE_IFUPDOWN_IPV4
 //config:       bool "Support IPv4"
 //config:       default y
 //config:       depends on IFUP || IFDOWN
 //config:       help
-//config:         If you want ifup/ifdown to talk IPv4, leave this on.
+//config:       If you want ifup/ifdown to talk IPv4, leave this on.
 //config:
 //config:config FEATURE_IFUPDOWN_IPV6
 //config:       bool "Support IPv6"
 //config:       default y
 //config:       depends on (IFUP || IFDOWN) && FEATURE_IPV6
 //config:       help
-//config:         If you need support for IPv6, turn this option on.
+//config:       If you need support for IPv6, turn this option on.
 //config:
 //UNUSED:
 ////////:config FEATURE_IFUPDOWN_IPX
@@ -93,18 +93,18 @@
 //config:       default y
 //config:       depends on IFUP || IFDOWN
 //config:       help
-//config:         This enables support for the "mapping" stanza, unless you have
-//config:         a weird network setup you don't need it.
+//config:       This enables support for the "mapping" stanza, unless you have
+//config:       a weird network setup you don't need it.
 //config:
 //config:config FEATURE_IFUPDOWN_EXTERNAL_DHCP
 //config:       bool "Support external DHCP clients"
 //config:       default n
 //config:       depends on IFUP || IFDOWN
 //config:       help
-//config:         This enables support for the external dhcp clients. Clients are
-//config:         tried in the following order: dhcpcd, dhclient, pump and udhcpc.
-//config:         Otherwise, if udhcpc applet is enabled, it is used.
-//config:         Otherwise, ifup/ifdown will have no support for DHCP.
+//config:       This enables support for the external dhcp clients. Clients are
+//config:       tried in the following order: dhcpcd, dhclient, pump and udhcpc.
+//config:       Otherwise, if udhcpc applet is enabled, it is used.
+//config:       Otherwise, ifup/ifdown will have no support for DHCP.
 
 //                 APPLET_ODDNAME:name    main      location     suid_type     help
 //applet:IF_IFUP(  APPLET_ODDNAME(ifup,   ifupdown, BB_DIR_SBIN, BB_SUID_DROP, ifup))
diff --git a/networking/inetd.c b/networking/inetd.c
index 3bf157b70..2991edc09 100644
--- a/networking/inetd.c
+++ b/networking/inetd.c
@@ -154,46 +154,46 @@
  *                      setuid()
  */
 //config:config INETD
-//config:       bool "inetd"
+//config:       bool "inetd (18 kb)"
 //config:       default y
 //config:       select FEATURE_SYSLOG
 //config:       help
-//config:         Internet superserver daemon
+//config:       Internet superserver daemon
 //config:
 //config:config FEATURE_INETD_SUPPORT_BUILTIN_ECHO
 //config:       bool "Support echo service"
 //config:       default y
 //config:       depends on INETD
 //config:       help
-//config:         Echo received data internal inetd service
+//config:       Echo received data internal inetd service
 //config:
 //config:config FEATURE_INETD_SUPPORT_BUILTIN_DISCARD
 //config:       bool "Support discard service"
 //config:       default y
 //config:       depends on INETD
 //config:       help
-//config:         Internet /dev/null internal inetd service
+//config:       Internet /dev/null internal inetd service
 //config:
 //config:config FEATURE_INETD_SUPPORT_BUILTIN_TIME
 //config:       bool "Support time service"
 //config:       default y
 //config:       depends on INETD
 //config:       help
-//config:         Return 32 bit time since 1900 internal inetd service
+//config:       Return 32 bit time since 1900 internal inetd service
 //config:
 //config:config FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME
 //config:       bool "Support daytime service"
 //config:       default y
 //config:       depends on INETD
 //config:       help
-//config:         Return human-readable time internal inetd service
+//config:       Return human-readable time internal inetd service
 //config:
 //config:config FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN
 //config:       bool "Support chargen service"
 //config:       default y
 //config:       depends on INETD
 //config:       help
-//config:         Familiar character generator internal inetd service
+//config:       Familiar character generator internal inetd service
 //config:
 //config:config FEATURE_INETD_RPC
 //config:       bool "Support RPC services"
@@ -201,7 +201,7 @@
 //config:       depends on INETD
 //config:       select FEATURE_HAVE_RPC
 //config:       help
-//config:         Support Sun-RPC based services
+//config:       Support Sun-RPC based services
 
 //applet:IF_INETD(APPLET(inetd, BB_DIR_USR_SBIN, BB_SUID_DROP))
 
diff --git a/networking/ip.c b/networking/ip.c
index 3cf52cdd7..cca7cbe12 100644
--- a/networking/ip.c
+++ b/networking/ip.c
@@ -9,120 +9,120 @@
  * Bernhard Reutner-Fischer rewrote to use index_in_substr_array
  */
 //config:config IP
-//config:       bool "ip"
+//config:       bool "ip (34 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         The "ip" applet is a TCP/IP interface configuration and routing
-//config:         utility. You generally don't need "ip" to use busybox with
-//config:         TCP/IP.
+//config:       The "ip" applet is a TCP/IP interface configuration and routing
+//config:       utility. You generally don't need "ip" to use busybox with
+//config:       TCP/IP.
 //config:
 //config:config IPADDR
-//config:       bool "ipaddr"
+//config:       bool "ipaddr (14 kb)"
 //config:       default y
 //config:       select FEATURE_IP_ADDRESS
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         Support short form of ip addr: ipaddr
+//config:       Support short form of ip addr: ipaddr
 //config:
 //config:config IPLINK
-//config:       bool "iplink"
+//config:       bool "iplink (16 kb)"
 //config:       default y
 //config:       select FEATURE_IP_LINK
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         Support short form of ip link: iplink
+//config:       Support short form of ip link: iplink
 //config:
 //config:config IPROUTE
-//config:       bool "iproute"
+//config:       bool "iproute (15 kb)"
 //config:       default y
 //config:       select FEATURE_IP_ROUTE
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         Support short form of ip route: iproute
+//config:       Support short form of ip route: iproute
 //config:
 //config:config IPTUNNEL
-//config:       bool "iptunnel"
+//config:       bool "iptunnel (9.6 kb)"
 //config:       default y
 //config:       select FEATURE_IP_TUNNEL
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         Support short form of ip tunnel: iptunnel
+//config:       Support short form of ip tunnel: iptunnel
 //config:
 //config:config IPRULE
-//config:       bool "iprule"
+//config:       bool "iprule (10 kb)"
 //config:       default y
 //config:       select FEATURE_IP_RULE
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         Support short form of ip rule: iprule
+//config:       Support short form of ip rule: iprule
 //config:
 //config:config IPNEIGH
-//config:       bool "ipneigh"
+//config:       bool "ipneigh (8.3 kb)"
 //config:       default y
 //config:       select FEATURE_IP_NEIGH
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         Support short form of ip neigh: ipneigh
+//config:       Support short form of ip neigh: ipneigh
 //config:
 //config:config FEATURE_IP_ADDRESS
 //config:       bool "ip address"
 //config:       default y
 //config:       depends on IP || IPADDR
 //config:       help
-//config:         Address manipulation support for the "ip" applet.
+//config:       Address manipulation support for the "ip" applet.
 //config:
 //config:config FEATURE_IP_LINK
 //config:       bool "ip link"
 //config:       default y
 //config:       depends on IP || IPLINK
 //config:       help
-//config:         Configure network devices with "ip".
+//config:       Configure network devices with "ip".
 //config:
 //config:config FEATURE_IP_ROUTE
 //config:       bool "ip route"
 //config:       default y
 //config:       depends on IP || IPROUTE
 //config:       help
-//config:         Add support for routing table management to "ip".
+//config:       Add support for routing table management to "ip".
 //config:
 //config:config FEATURE_IP_ROUTE_DIR
 //config:       string "ip route configuration directory"
 //config:       default "/etc/iproute2"
 //config:       depends on FEATURE_IP_ROUTE
 //config:       help
-//config:         Location of the "ip" applet routing configuration.
+//config:       Location of the "ip" applet routing configuration.
 //config:
 //config:config FEATURE_IP_TUNNEL
 //config:       bool "ip tunnel"
 //config:       default y
 //config:       depends on IP || IPTUNNEL
 //config:       help
-//config:         Add support for tunneling commands to "ip".
+//config:       Add support for tunneling commands to "ip".
 //config:
 //config:config FEATURE_IP_RULE
 //config:       bool "ip rule"
 //config:       default y
 //config:       depends on IP || IPRULE
 //config:       help
-//config:         Add support for rule commands to "ip".
+//config:       Add support for rule commands to "ip".
 //config:
 //config:config FEATURE_IP_NEIGH
 //config:       bool "ip neighbor"
 //config:       default y
 //config:       depends on IP || IPNEIGH
 //config:       help
-//config:         Add support for neighbor commands to "ip".
+//config:       Add support for neighbor commands to "ip".
 //config:
 //config:config FEATURE_IP_RARE_PROTOCOLS
 //config:       bool "Support displaying rarely used link types"
 //config:       default n
 //config:       depends on IP || IPADDR || IPLINK || IPROUTE || IPTUNNEL || IPRULE || IPNEIGH
 //config:       help
-//config:         If you are not going to use links of type "frad", "econet",
-//config:         "bif" etc, you probably don't need to enable this.
-//config:         Ethernet, wireless, infrared, ppp/slip, ip tunnelling
-//config:         link types are supported without this option selected.
+//config:       If you are not going to use links of type "frad", "econet",
+//config:       "bif" etc, you probably don't need to enable this.
+//config:       Ethernet, wireless, infrared, ppp/slip, ip tunnelling
+//config:       link types are supported without this option selected.
 
 //applet:IF_IP(APPLET(ip, BB_DIR_SBIN, BB_SUID_DROP))
 //applet:IF_IPADDR(APPLET(ipaddr, BB_DIR_SBIN, BB_SUID_DROP))
diff --git a/networking/ipcalc.c b/networking/ipcalc.c
index 9359f9016..9888a6ff2 100644
--- a/networking/ipcalc.c
+++ b/networking/ipcalc.c
@@ -12,11 +12,11 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config IPCALC
-//config:       bool "ipcalc"
+//config:       bool "ipcalc (4.3 kb)"
 //config:       default y
 //config:       help
-//config:         ipcalc takes an IP address and netmask and calculates the
-//config:         resulting broadcast, network, and host range.
+//config:       ipcalc takes an IP address and netmask and calculates the
+//config:       resulting broadcast, network, and host range.
 //config:
 //config:config FEATURE_IPCALC_LONG_OPTIONS
 //config:       bool "Enable long options"
@@ -28,8 +28,8 @@
 //config:       default y
 //config:       depends on IPCALC
 //config:       help
-//config:         Adds the options hostname, prefix and silent to the output of
-//config:         "ipcalc".
+//config:       Adds the options hostname, prefix and silent to the output of
+//config:       "ipcalc".
 
 //applet:IF_IPCALC(APPLET(ipcalc, BB_DIR_BIN, BB_SUID_DROP))
 
diff --git a/networking/isrv_identd.c b/networking/isrv_identd.c
index 219c64b66..133d62a65 100644
--- a/networking/isrv_identd.c
+++ b/networking/isrv_identd.c
@@ -7,12 +7,12 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config FAKEIDENTD
-//config:       bool "fakeidentd"
+//config:       bool "fakeidentd (8.9 kb)"
 //config:       default y
 //config:       select FEATURE_SYSLOG
 //config:       help
-//config:         fakeidentd listens on the ident port and returns a predefined
-//config:         fake value on any query.
+//config:       fakeidentd listens on the ident port and returns a predefined
+//config:       fake value on any query.
 
 //applet:IF_FAKEIDENTD(APPLET(fakeidentd, BB_DIR_USR_SBIN, BB_SUID_DROP))
 
diff --git a/networking/nameif.c b/networking/nameif.c
index cffd5bfde..31ee98a39 100644
--- a/networking/nameif.c
+++ b/networking/nameif.c
@@ -11,34 +11,34 @@
  */
 
 //config:config NAMEIF
-//config:       bool "nameif"
+//config:       bool "nameif (6.6 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       select FEATURE_SYSLOG
 //config:       help
-//config:         nameif is used to rename network interface by its MAC address.
-//config:         Renamed interfaces MUST be in the down state.
-//config:         It is possible to use a file (default: /etc/mactab)
-//config:         with list of new interface names and MACs.
-//config:         Maximum interface name length: IFNAMSIZ = 16
-//config:         File fields are separated by space or tab.
-//config:         File format:
-//config:         # Comment
-//config:         new_interface_name    XX:XX:XX:XX:XX:XX
+//config:       nameif is used to rename network interface by its MAC address.
+//config:       Renamed interfaces MUST be in the down state.
+//config:       It is possible to use a file (default: /etc/mactab)
+//config:       with list of new interface names and MACs.
+//config:       Maximum interface name length: IFNAMSIZ = 16
+//config:       File fields are separated by space or tab.
+//config:       File format:
+//config:               # Comment
+//config:               new_interface_name  XX:XX:XX:XX:XX:XX
 //config:
 //config:config FEATURE_NAMEIF_EXTENDED
 //config:       bool "Extended nameif"
 //config:       default y
 //config:       depends on NAMEIF
 //config:       help
-//config:         This extends the nameif syntax to support the bus_info, driver,
-//config:         phyaddr selectors. The syntax is compatible to the normal nameif.
-//config:         File format:
-//config:           new_interface_name  driver=asix bus=usb-0000:00:08.2-3
-//config:           new_interface_name  bus=usb-0000:00:08.2-3 00:80:C8:38:91:B5
-//config:           new_interface_name  phy_address=2 00:80:C8:38:91:B5
-//config:           new_interface_name  mac=00:80:C8:38:91:B5
-//config:           new_interface_name  00:80:C8:38:91:B5
+//config:       This extends the nameif syntax to support the bus_info, driver,
+//config:       phyaddr selectors. The syntax is compatible to the normal nameif.
+//config:       File format:
+//config:               new_interface_name  driver=asix bus=usb-0000:00:08.2-3
+//config:               new_interface_name  bus=usb-0000:00:08.2-3 00:80:C8:38:91:B5
+//config:               new_interface_name  phy_address=2 00:80:C8:38:91:B5
+//config:               new_interface_name  mac=00:80:C8:38:91:B5
+//config:               new_interface_name  00:80:C8:38:91:B5
 
 //applet:IF_NAMEIF(APPLET(nameif, BB_DIR_SBIN, BB_SUID_DROP))
 
diff --git a/networking/nbd-client.c b/networking/nbd-client.c
index 70869d651..a5e25e6aa 100644
--- a/networking/nbd-client.c
+++ b/networking/nbd-client.c
@@ -12,10 +12,10 @@
 //kbuild:lib-$(CONFIG_NBDCLIENT) += nbd-client.o
 
 //config:config NBDCLIENT
-//config:       bool "nbd-client"
+//config:       bool "nbd-client (4.6 kb)"
 //config:       default y
 //config:       help
-//config:         Network block device client
+//config:       Network block device client
 
 #define NBD_SET_SOCK          _IO(0xab, 0)
 #define NBD_SET_BLKSIZE       _IO(0xab, 1)
diff --git a/networking/nc.c b/networking/nc.c
index 1b70434ac..df073d7df 100644
--- a/networking/nc.c
+++ b/networking/nc.c
@@ -7,37 +7,37 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config NC
-//config:       bool "nc"
+//config:       bool "nc (11 kb)"
 //config:       default y
 //config:       help
-//config:         A simple Unix utility which reads and writes data across network
-//config:         connections.
+//config:       A simple Unix utility which reads and writes data across network
+//config:       connections.
 //config:
 //config:config NC_SERVER
 //config:       bool "Netcat server options (-l)"
 //config:       default y
 //config:       depends on NC
 //config:       help
-//config:         Allow netcat to act as a server.
+//config:       Allow netcat to act as a server.
 //config:
 //config:config NC_EXTRA
 //config:       bool "Netcat extensions (-eiw and -f FILE)"
 //config:       default y
 //config:       depends on NC
 //config:       help
-//config:         Add -e (support for executing the rest of the command line after
-//config:         making or receiving a successful connection), -i (delay interval for
-//config:         lines sent), -w (timeout for initial connection).
+//config:       Add -e (support for executing the rest of the command line after
+//config:       making or receiving a successful connection), -i (delay interval for
+//config:       lines sent), -w (timeout for initial connection).
 //config:
 //config:config NC_110_COMPAT
 //config:       bool "Netcat 1.10 compatibility (+2.5k)"
 //config:       default n  # off specially for Rob
 //config:       depends on NC
 //config:       help
-//config:         This option makes nc closely follow original nc-1.10.
-//config:         The code is about 2.5k bigger. It enables
-//config:         -s ADDR, -n, -u, -v, -o FILE, -z options, but loses
-//config:         busybox-specific extensions: -f FILE.
+//config:       This option makes nc closely follow original nc-1.10.
+//config:       The code is about 2.5k bigger. It enables
+//config:       -s ADDR, -n, -u, -v, -o FILE, -z options, but loses
+//config:       busybox-specific extensions: -f FILE.
 
 //applet:IF_NC(APPLET(nc, BB_DIR_USR_BIN, BB_SUID_DROP))
 
diff --git a/networking/netstat.c b/networking/netstat.c
index 68e0c1a04..33281e333 100644
--- a/networking/netstat.c
+++ b/networking/netstat.c
@@ -14,27 +14,27 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config NETSTAT
-//config:       bool "netstat"
+//config:       bool "netstat (10 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         netstat prints information about the Linux networking subsystem.
+//config:       netstat prints information about the Linux networking subsystem.
 //config:
 //config:config FEATURE_NETSTAT_WIDE
 //config:       bool "Enable wide output"
 //config:       default y
 //config:       depends on NETSTAT
 //config:       help
-//config:         Add support for wide columns. Useful when displaying IPv6 addresses
-//config:         (-W option).
+//config:       Add support for wide columns. Useful when displaying IPv6 addresses
+//config:       (-W option).
 //config:
 //config:config FEATURE_NETSTAT_PRG
 //config:       bool "Enable PID/Program name output"
 //config:       default y
 //config:       depends on NETSTAT
 //config:       help
-//config:         Add support for -p flag to print out PID and program name.
-//config:         +700 bytes of code.
+//config:       Add support for -p flag to print out PID and program name.
+//config:       +700 bytes of code.
 
 //applet:IF_NETSTAT(APPLET(netstat, BB_DIR_BIN, BB_SUID_DROP))
 
diff --git a/networking/nslookup.c b/networking/nslookup.c
index 8e3c8fed9..45c218e6c 100644
--- a/networking/nslookup.c
+++ b/networking/nslookup.c
@@ -11,10 +11,10 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config NSLOOKUP
-//config:       bool "nslookup"
+//config:       bool "nslookup (4.5 kb)"
 //config:       default y
 //config:       help
-//config:         nslookup is a tool to query Internet name servers.
+//config:       nslookup is a tool to query Internet name servers.
 
 //applet:IF_NSLOOKUP(APPLET(nslookup, BB_DIR_USR_BIN, BB_SUID_DROP))
 
diff --git a/networking/ntpd.c b/networking/ntpd.c
index 73d27ac20..f21f9513d 100644
--- a/networking/ntpd.c
+++ b/networking/ntpd.c
@@ -41,27 +41,27 @@
  ***********************************************************************
  */
 //config:config NTPD
-//config:       bool "ntpd"
+//config:       bool "ntpd (17 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         The NTP client/server daemon.
+//config:       The NTP client/server daemon.
 //config:
 //config:config FEATURE_NTPD_SERVER
 //config:       bool "Make ntpd usable as a NTP server"
 //config:       default y
 //config:       depends on NTPD
 //config:       help
-//config:         Make ntpd usable as a NTP server. If you disable this option
-//config:         ntpd will be usable only as a NTP client.
+//config:       Make ntpd usable as a NTP server. If you disable this option
+//config:       ntpd will be usable only as a NTP client.
 //config:
 //config:config FEATURE_NTPD_CONF
 //config:       bool "Make ntpd understand /etc/ntp.conf"
 //config:       default y
 //config:       depends on NTPD
 //config:       help
-//config:         Make ntpd look in /etc/ntp.conf for peers. Only "server address"
-//config:         is supported.
+//config:       Make ntpd look in /etc/ntp.conf for peers. Only "server address"
+//config:       is supported.
 
 //applet:IF_NTPD(APPLET(ntpd, BB_DIR_USR_SBIN, BB_SUID_DROP))
 
diff --git a/networking/ping.c b/networking/ping.c
index 94fb007f5..506e7b11b 100644
--- a/networking/ping.c
+++ b/networking/ping.c
@@ -47,27 +47,28 @@
 #endif
 
 //config:config PING
-//config:       bool "ping"
+//config:       bool "ping (9.5 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         ping uses the ICMP protocol's mandatory ECHO_REQUEST datagram to
-//config:         elicit an ICMP ECHO_RESPONSE from a host or gateway.
+//config:       ping uses the ICMP protocol's mandatory ECHO_REQUEST datagram to
+//config:       elicit an ICMP ECHO_RESPONSE from a host or gateway.
 //config:
 //config:config PING6
-//config:       bool "ping6"
+//config:       bool "ping6 (10 kb)"
 //config:       default y
 //config:       depends on FEATURE_IPV6
 //config:       help
-//config:         This will give you a ping that can talk IPv6.
+//config:       Alias to "ping -6".
 //config:
 //config:config FEATURE_FANCY_PING
 //config:       bool "Enable fancy ping output"
 //config:       default y
 //config:       depends on PING || PING6
 //config:       help
-//config:         Make the output from the ping applet include statistics, and at the
-//config:         same time provide full support for ICMP packets.
+//config:       With this option off, ping will say "HOST is alive!"
+//config:       or terminate with SIGALRM in 5 seconds otherwise.
+//config:       No command-line options will be recognized.
 
 /* Needs socket(AF_INET, SOCK_RAW, IPPROTO_ICMP), therefore BB_SUID_MAYBE: */
 //applet:IF_PING(APPLET(ping, BB_DIR_BIN, BB_SUID_MAYBE))
@@ -103,7 +104,7 @@
 //usage:     "\n                        (can exit earlier with -c CNT)"
 //usage:     "\n        -q              Quiet, only display output at start"
 //usage:     "\n                        and when finished"
-//usage:     "\n        -p              Pattern to use for payload"
+//usage:     "\n        -p HEXBYTE      Pattern to use for payload"
 //usage:
 //usage:# define ping6_trivial_usage
 //usage:       "[OPTIONS] HOST"
@@ -114,7 +115,7 @@
 //usage:     "\n        -I IFACE/IP     Source interface or IP address"
 //usage:     "\n        -q              Quiet, only display output at start"
 //usage:     "\n                        and when finished"
-//usage:     "\n        -p              Pattern to use for payload"
+//usage:     "\n        -p HEXBYTE      Pattern to use for payload"
 //usage:
 //usage:#endif
 //usage:
@@ -236,8 +237,6 @@ static void ping4(len_and_sockaddr *lsa)
                                 break;
                 }
         }
-        if (ENABLE_FEATURE_CLEAN_UP)
-                close(pingsock);
 }
 
 #if ENABLE_PING6
@@ -280,8 +279,6 @@ static void ping6(len_and_sockaddr *lsa)
                                 break;
                 }
         }
-        if (ENABLE_FEATURE_CLEAN_UP)
-                close(pingsock);
 }
 #endif
 
@@ -331,6 +328,8 @@ static int common_ping_main(sa_family_t af, char **argv)
         else
 #endif
                 ping4(lsa);
+        if (ENABLE_FEATURE_CLEAN_UP)
+                close(pingsock);
         printf("%s is alive!\n", G.hostname);
         return EXIT_SUCCESS;
 }
diff --git a/networking/pscan.c b/networking/pscan.c
index 0893c3577..17985d2c8 100644
--- a/networking/pscan.c
+++ b/networking/pscan.c
@@ -6,10 +6,10 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config PSCAN
-//config:       bool "pscan"
+//config:       bool "pscan (6.6 kb)"
 //config:       default y
 //config:       help
-//config:         Simple network port scanner.
+//config:       Simple network port scanner.
 
 //applet:IF_PSCAN(APPLET(pscan, BB_DIR_USR_BIN, BB_SUID_DROP))
 
diff --git a/networking/route.c b/networking/route.c
index 7dc2b5a3d..32789eecc 100644
--- a/networking/route.c
+++ b/networking/route.c
@@ -25,11 +25,11 @@
  * remove ridiculous amounts of bloat.
  */
 //config:config ROUTE
-//config:       bool "route"
+//config:       bool "route (8.9 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         Route displays or manipulates the kernel's IP routing tables.
+//config:       Route displays or manipulates the kernel's IP routing tables.
 
 //applet:IF_ROUTE(APPLET(route, BB_DIR_SBIN, BB_SUID_DROP))
 
diff --git a/networking/slattach.c b/networking/slattach.c
index 9267eb1d0..71b5bf427 100644
--- a/networking/slattach.c
+++ b/networking/slattach.c
@@ -13,12 +13,12 @@
  * - The -F options allows disabling of RTS/CTS flow control.
  */
 //config:config SLATTACH
-//config:       bool "slattach"
+//config:       bool "slattach (6.1 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         slattach is a small utility to attach network interfaces to serial
-//config:         lines.
+//config:       slattach is a small utility to attach network interfaces to serial
+//config:       lines.
 
 //applet:IF_SLATTACH(APPLET(slattach, BB_DIR_SBIN, BB_SUID_DROP))
 
diff --git a/networking/ssl_client.c b/networking/ssl_client.c
index cfeae1587..d479846d7 100644
--- a/networking/ssl_client.c
+++ b/networking/ssl_client.c
@@ -4,11 +4,11 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config SSL_CLIENT
-//config:       bool "ssl_client"
+//config:       bool "ssl_client (23 kb)"
 //config:       default y
 //config:       select TLS
 //config:       help
-//config:         This tool pipes data to/from a socket, TLS-encrypting it.
+//config:       This tool pipes data to/from a socket, TLS-encrypting it.
 
 //applet:IF_SSL_CLIENT(APPLET(ssl_client, BB_DIR_USR_BIN, BB_SUID_DROP))
 
diff --git a/networking/tcpudp.c b/networking/tcpudp.c
index 3ebe7d5fc..270325164 100644
--- a/networking/tcpudp.c
+++ b/networking/tcpudp.c
@@ -29,18 +29,18 @@
  * - don't know how to retrieve ORIGDST for udp.
  */
 //config:config TCPSVD
-//config:       bool "tcpsvd"
+//config:       bool "tcpsvd (13 kb)"
 //config:       default y
 //config:       help
-//config:         tcpsvd listens on a TCP port and runs a program for each new
-//config:         connection.
+//config:       tcpsvd listens on a TCP port and runs a program for each new
+//config:       connection.
 //config:
 //config:config UDPSVD
-//config:       bool "udpsvd"
+//config:       bool "udpsvd (13 kb)"
 //config:       default y
 //config:       help
-//config:         udpsvd listens on an UDP port and runs a program for each new
-//config:         connection.
+//config:       udpsvd listens on an UDP port and runs a program for each new
+//config:       connection.
 
 //applet:IF_TCPSVD(APPLET_ODDNAME(tcpsvd, tcpudpsvd, BB_DIR_USR_BIN, BB_SUID_DROP, tcpsvd))
 //applet:IF_UDPSVD(APPLET_ODDNAME(udpsvd, tcpudpsvd, BB_DIR_USR_BIN, BB_SUID_DROP, udpsvd))
diff --git a/networking/telnet.c b/networking/telnet.c
index a70f74762..9f191f7ad 100644
--- a/networking/telnet.c
+++ b/networking/telnet.c
@@ -21,30 +21,30 @@
  *
  */
 //config:config TELNET
-//config:       bool "telnet"
+//config:       bool "telnet (8.7 kb)"
 //config:       default y
 //config:       help
-//config:         Telnet is an interface to the TELNET protocol, but is also commonly
-//config:         used to test other simple protocols.
+//config:       Telnet is an interface to the TELNET protocol, but is also commonly
+//config:       used to test other simple protocols.
 //config:
 //config:config FEATURE_TELNET_TTYPE
 //config:       bool "Pass TERM type to remote host"
 //config:       default y
 //config:       depends on TELNET
 //config:       help
-//config:         Setting this option will forward the TERM environment variable to the
-//config:         remote host you are connecting to. This is useful to make sure that
-//config:         things like ANSI colors and other control sequences behave.
+//config:       Setting this option will forward the TERM environment variable to the
+//config:       remote host you are connecting to. This is useful to make sure that
+//config:       things like ANSI colors and other control sequences behave.
 //config:
 //config:config FEATURE_TELNET_AUTOLOGIN
 //config:       bool "Pass USER type to remote host"
 //config:       default y
 //config:       depends on TELNET
 //config:       help
-//config:         Setting this option will forward the USER environment variable to the
-//config:         remote host you are connecting to. This is useful when you need to
-//config:         log into a machine without telling the username (autologin). This
-//config:         option enables `-a' and `-l USER' arguments.
+//config:       Setting this option will forward the USER environment variable to the
+//config:       remote host you are connecting to. This is useful when you need to
+//config:       log into a machine without telling the username (autologin). This
+//config:       option enables `-a' and `-l USER' arguments.
 //config:
 //config:config FEATURE_TELNET_WIDTH
 //config:       bool "Enable window size autodetection"
diff --git a/networking/telnetd.c b/networking/telnetd.c
index f06e9583e..6e12de07a 100644
--- a/networking/telnetd.c
+++ b/networking/telnetd.c
@@ -21,73 +21,73 @@
  * Set process group corrections, initial busybox port
  */
 //config:config TELNETD
-//config:       bool "telnetd"
+//config:       bool "telnetd (12 kb)"
 //config:       default y
 //config:       select FEATURE_SYSLOG
 //config:       help
-//config:         A daemon for the TELNET protocol, allowing you to log onto the host
-//config:         running the daemon. Please keep in mind that the TELNET protocol
-//config:         sends passwords in plain text. If you can't afford the space for an
-//config:         SSH daemon and you trust your network, you may say 'y' here. As a
-//config:         more secure alternative, you should seriously consider installing the
-//config:         very small Dropbear SSH daemon instead:
+//config:       A daemon for the TELNET protocol, allowing you to log onto the host
+//config:       running the daemon. Please keep in mind that the TELNET protocol
+//config:       sends passwords in plain text. If you can't afford the space for an
+//config:       SSH daemon and you trust your network, you may say 'y' here. As a
+//config:       more secure alternative, you should seriously consider installing the
+//config:       very small Dropbear SSH daemon instead:
 //config:               http://matt.ucc.asn.au/dropbear/dropbear.html
 //config:
-//config:         Note that for busybox telnetd to work you need several things:
-//config:         First of all, your kernel needs:
+//config:       Note that for busybox telnetd to work you need several things:
+//config:       First of all, your kernel needs:
 //config:                 CONFIG_UNIX98_PTYS=y
 //config:
-//config:         Next, you need a /dev/pts directory on your root filesystem:
+//config:       Next, you need a /dev/pts directory on your root filesystem:
 //config:
 //config:                 $ ls -ld /dev/pts
 //config:                 drwxr-xr-x  2 root root 0 Sep 23 13:21 /dev/pts/
 //config:
-//config:         Next you need the pseudo terminal master multiplexer /dev/ptmx:
+//config:       Next you need the pseudo terminal master multiplexer /dev/ptmx:
 //config:
 //config:                 $ ls -la /dev/ptmx
 //config:                 crw-rw-rw-  1 root tty 5, 2 Sep 23 13:55 /dev/ptmx
 //config:
-//config:         Any /dev/ttyp[0-9]* files you may have can be removed.
-//config:         Next, you need to mount the devpts filesystem on /dev/pts using:
+//config:       Any /dev/ttyp[0-9]* files you may have can be removed.
+//config:       Next, you need to mount the devpts filesystem on /dev/pts using:
 //config:
 //config:                 mount -t devpts devpts /dev/pts
 //config:
-//config:         You need to be sure that busybox has LOGIN and
-//config:         FEATURE_SUID enabled. And finally, you should make
-//config:         certain that Busybox has been installed setuid root:
+//config:       You need to be sure that busybox has LOGIN and
+//config:       FEATURE_SUID enabled. And finally, you should make
+//config:       certain that Busybox has been installed setuid root:
 //config:
 //config:               chown root.root /bin/busybox
 //config:               chmod 4755 /bin/busybox
 //config:
-//config:         with all that done, telnetd _should_ work....
+//config:       with all that done, telnetd _should_ work....
 //config:
 //config:config FEATURE_TELNETD_STANDALONE
 //config:       bool "Support standalone telnetd (not inetd only)"
 //config:       default y
 //config:       depends on TELNETD
 //config:       help
-//config:         Selecting this will make telnetd able to run standalone.
+//config:       Selecting this will make telnetd able to run standalone.
 //config:
 //config:config FEATURE_TELNETD_INETD_WAIT
 //config:       bool "Support -w SEC option (inetd wait mode)"
 //config:       default y
 //config:       depends on FEATURE_TELNETD_STANDALONE
 //config:       help
-//config:         This option allows you to run telnetd in "inet wait" mode.
-//config:         Example inetd.conf line (note "wait", not usual "nowait"):
+//config:       This option allows you to run telnetd in "inet wait" mode.
+//config:       Example inetd.conf line (note "wait", not usual "nowait"):
 //config:
-//config:         telnet stream tcp wait root /bin/telnetd telnetd -w10
+//config:       telnet stream tcp wait root /bin/telnetd telnetd -w10
 //config:
-//config:         In this example, inetd passes _listening_ socket_ as fd 0
-//config:         to telnetd when connection appears.
-//config:         telnetd will wait for connections until all existing
-//config:         connections are closed, and no new connections
-//config:         appear during 10 seconds. Then it exits, and inetd continues
-//config:         to listen for new connections.
+//config:       In this example, inetd passes _listening_ socket_ as fd 0
+//config:       to telnetd when connection appears.
+//config:       telnetd will wait for connections until all existing
+//config:       connections are closed, and no new connections
+//config:       appear during 10 seconds. Then it exits, and inetd continues
+//config:       to listen for new connections.
 //config:
-//config:         This option is rarely used. "tcp nowait" is much more usual
-//config:         way of running tcp services, including telnetd.
-//config:         You most probably want to say N here.
+//config:       This option is rarely used. "tcp nowait" is much more usual
+//config:       way of running tcp services, including telnetd.
+//config:       You most probably want to say N here.
 
 //applet:IF_TELNETD(APPLET(telnetd, BB_DIR_USR_SBIN, BB_SUID_DROP))
 
diff --git a/networking/tftp.c b/networking/tftp.c
index 189364f0c..947e65169 100644
--- a/networking/tftp.c
+++ b/networking/tftp.c
@@ -19,22 +19,22 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config TFTP
-//config:       bool "tftp"
+//config:       bool "tftp (12 kb)"
 //config:       default y
 //config:       help
-//config:         This enables the Trivial File Transfer Protocol client program. TFTP
-//config:         is usually used for simple, small transfers such as a root image
-//config:         for a network-enabled bootloader.
+//config:       This enables the Trivial File Transfer Protocol client program. TFTP
+//config:       is usually used for simple, small transfers such as a root image
+//config:       for a network-enabled bootloader.
 //config:
 //config:config TFTPD
-//config:       bool "tftpd"
+//config:       bool "tftpd (10 kb)"
 //config:       default y
 //config:       help
-//config:         This enables the Trivial File Transfer Protocol server program.
-//config:         It expects that stdin is a datagram socket and a packet
-//config:         is already pending on it. It will exit after one transfer.
-//config:         In other words: it should be run from inetd in nowait mode,
-//config:         or from udpsvd. Example: "udpsvd -E 0 69 tftpd DIR"
+//config:       This enables the Trivial File Transfer Protocol server program.
+//config:       It expects that stdin is a datagram socket and a packet
+//config:       is already pending on it. It will exit after one transfer.
+//config:       In other words: it should be run from inetd in nowait mode,
+//config:       or from udpsvd. Example: "udpsvd -E 0 69 tftpd DIR"
 //config:
 //config:comment "Common options for tftp/tftpd"
 //config:       depends on TFTP || TFTPD
@@ -44,29 +44,29 @@
 //config:       default y
 //config:       depends on TFTP || TFTPD
 //config:       help
-//config:         Add support for the GET command within the TFTP client. This allows
-//config:         a client to retrieve a file from a TFTP server.
-//config:         Also enable upload support in tftpd, if tftpd is selected.
+//config:       Add support for the GET command within the TFTP client. This allows
+//config:       a client to retrieve a file from a TFTP server.
+//config:       Also enable upload support in tftpd, if tftpd is selected.
 //config:
-//config:         Note: this option does _not_ make tftpd capable of download
-//config:         (the usual operation people need from it)!
+//config:       Note: this option does _not_ make tftpd capable of download
+//config:       (the usual operation people need from it)!
 //config:
 //config:config FEATURE_TFTP_PUT
 //config:       bool "Enable 'tftp put' and/or tftpd download code"
 //config:       default y
 //config:       depends on TFTP || TFTPD
 //config:       help
-//config:         Add support for the PUT command within the TFTP client. This allows
-//config:         a client to transfer a file to a TFTP server.
-//config:         Also enable download support in tftpd, if tftpd is selected.
+//config:       Add support for the PUT command within the TFTP client. This allows
+//config:       a client to transfer a file to a TFTP server.
+//config:       Also enable download support in tftpd, if tftpd is selected.
 //config:
 //config:config FEATURE_TFTP_BLOCKSIZE
 //config:       bool "Enable 'blksize' and 'tsize' protocol options"
 //config:       default y
 //config:       depends on TFTP || TFTPD
 //config:       help
-//config:         Allow tftp to specify block size, and tftpd to understand
-//config:         "blksize" and "tsize" options.
+//config:       Allow tftp to specify block size, and tftpd to understand
+//config:       "blksize" and "tsize" options.
 //config:
 //config:config FEATURE_TFTP_PROGRESS_BAR
 //config:       bool "Enable progress bar"
@@ -78,8 +78,8 @@
 //config:       default n
 //config:       depends on TFTP || TFTPD
 //config:       help
-//config:         Make tftp[d] print debugging messages on stderr.
-//config:         This is useful if you are diagnosing a bug in tftp[d].
+//config:       Make tftp[d] print debugging messages on stderr.
+//config:       This is useful if you are diagnosing a bug in tftp[d].
 
 //applet:#if ENABLE_FEATURE_TFTP_GET || ENABLE_FEATURE_TFTP_PUT
 //applet:IF_TFTP(APPLET(tftp, BB_DIR_USR_BIN, BB_SUID_DROP))
diff --git a/networking/traceroute.c b/networking/traceroute.c
index 6817861ef..a958a2c6c 100644
--- a/networking/traceroute.c
+++ b/networking/traceroute.c
@@ -210,26 +210,26 @@
  *     Tue Dec 20 03:50:13 PST 1988
  */
 //config:config TRACEROUTE
-//config:       bool "traceroute"
+//config:       bool "traceroute (11 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         Utility to trace the route of IP packets.
+//config:       Utility to trace the route of IP packets.
 //config:
 //config:config TRACEROUTE6
-//config:       bool "traceroute6"
+//config:       bool "traceroute6 (12 kb)"
 //config:       default y
 //config:       depends on FEATURE_IPV6
 //config:       help
-//config:         Utility to trace the route of IPv6 packets.
+//config:       Utility to trace the route of IPv6 packets.
 //config:
 //config:config FEATURE_TRACEROUTE_VERBOSE
 //config:       bool "Enable verbose output"
 //config:       default y
 //config:       depends on TRACEROUTE || TRACEROUTE6
 //config:       help
-//config:         Add some verbosity to traceroute. This includes among other things
-//config:         hostnames and ICMP response types.
+//config:       Add some verbosity to traceroute. This includes among other things
+//config:       hostnames and ICMP response types.
 //config:
 //config:config FEATURE_TRACEROUTE_USE_ICMP
 //config:       bool "Enable -I option (use ICMP instead of UDP)"
diff --git a/networking/tunctl.c b/networking/tunctl.c
index fa904c2a9..0a26ff7fb 100644
--- a/networking/tunctl.c
+++ b/networking/tunctl.c
@@ -10,19 +10,19 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config TUNCTL
-//config:       bool "tunctl"
+//config:       bool "tunctl (6.4 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         tunctl creates or deletes tun devices.
+//config:       tunctl creates or deletes tun devices.
 //config:
 //config:config FEATURE_TUNCTL_UG
 //config:       bool "Support owner:group assignment"
 //config:       default y
 //config:       depends on TUNCTL
 //config:       help
-//config:         Allow to specify owner and group of newly created interface.
-//config:         340 bytes of pure bloat. Say no here.
+//config:       Allow to specify owner and group of newly created interface.
+//config:       340 bytes of pure bloat. Say no here.
 
 //applet:IF_TUNCTL(APPLET(tunctl, BB_DIR_SBIN, BB_SUID_DROP))
 
diff --git a/networking/udhcp/Config.src b/networking/udhcp/Config.src
index 5c068441a..af2fe1835 100644
--- a/networking/udhcp/Config.src
+++ b/networking/udhcp/Config.src
@@ -10,105 +10,105 @@ config UDHCPD
         default y
         select 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 FEATURE_UDHCPD_WRITE_LEASES_EARLY
         bool "Rewrite the lease file at every new acknowledge"
         default y
         depends on 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.
+        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 FEATURE_UDHCPD_BASE_IP_ON_MAC
         bool "Select IP address based on client MAC"
         default n
         depends on UDHCPD
         help
-          If selected, udhcpd will base its selection of IP address to offer
-          on the client's hardware address. Otherwise udhcpd uses the next
-          consecutive free address.
+        If selected, udhcpd will base its selection of IP address to offer
+        on the client's hardware address. Otherwise udhcpd uses the next
+        consecutive free address.
 
-          This reduces the frequency of IP address changes for clients
-          which let their lease expire, and makes consecutive DHCPOFFERS
-          for the same client to (almost always) contain the same
-          IP address.
+        This reduces the frequency of IP address changes for clients
+        which let their lease expire, and makes consecutive DHCPOFFERS
+        for the same client to (almost always) contain the same
+        IP address.
 
 config DHCPD_LEASES_FILE
         string "Absolute path to lease file"
         default "/var/lib/misc/udhcpd.leases"
         depends on 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 DUMPLEASES
-        bool "dumpleases"
+        bool "dumpleases (6.4 kb)"
         default y
         help
-          dumpleases displays the leases written out by the udhcpd.
-          Lease times are stored in the file by time remaining in lease, or
-          by the absolute time that it expires in seconds from epoch.
+        dumpleases displays the leases written out by the udhcpd.
+        Lease times are stored in the file by time remaining in lease, or
+        by the absolute time that it expires in seconds from epoch.
 
 config DHCPRELAY
-        bool "dhcprelay"
+        bool "dhcprelay (5.8 kb)"
         default y
         help
-          dhcprelay listens for dhcp requests on one or more interfaces
-          and forwards these requests to a different interface or dhcp
-          server.
+        dhcprelay listens for dhcp requests on one or more interfaces
+        and forwards these requests to a different interface or dhcp
+        server.
 
 config UDHCPC
         bool "udhcpc (DHCP client)"
         default y
         select 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 FEATURE_UDHCPC_ARPING
         bool "Verify that the offered address is free, using ARP ping"
         default y
         depends on UDHCPC
         help
-          If selected, udhcpc will send ARP probes and make sure
-          the offered address is really not in use by anyone. The client
-          will DHCPDECLINE the offer if the address is in use,
-          and restart the discover process.
+        If selected, udhcpc will send ARP probes and make sure
+        the offered address is really not in use by anyone. The client
+        will DHCPDECLINE the offer if the address is in use,
+        and restart the discover process.
 
 config FEATURE_UDHCPC_SANITIZEOPT
         bool "Do not pass malformed host and domain names"
         default y
         depends on 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 UDHCPC_DEFAULT_SCRIPT
         string "Absolute path to config script"
         default "/usr/share/udhcpc/default.script"
         depends on UDHCPC
         help
-          This script is called after udhcpc receives an answer. See
-          examples/udhcp for a working example. Normally it is safe
-          to leave this untouched.
+        This script is called after udhcpc receives an answer. See
+        examples/udhcp for a working example. Normally it is safe
+        to leave this untouched.
 
 config FEATURE_UDHCP_PORT
         bool "Enable '-P port' option for udhcpd and udhcpc"
         default n
         depends on UDHCPD || UDHCPC
         help
-          At the cost of ~300 bytes, enables -P port option.
-          This feature is typically not needed.
+        At the cost of ~300 bytes, enables -P port option.
+        This feature is typically not needed.
 
 config UDHCP_DEBUG
         int "Maximum verbosity level for udhcp applets (0..9)"
@@ -116,28 +116,28 @@ config UDHCP_DEBUG
         range 0 9
         depends on UDHCPD || UDHCPC || DHCPRELAY
         help
-          Verbosity can be increased with multiple -v options.
-          This option controls how high it can be cranked up.
+        Verbosity can be increased with multiple -v options.
+        This option controls how high it can be cranked up.
 
-          Bigger values result in bigger code. Levels above 1
-          are very verbose and useful for debugging only.
+        Bigger values result in bigger code. Levels above 1
+        are very verbose and useful for debugging only.
 
 config FEATURE_UDHCP_RFC3397
         bool "Support RFC3397 domain search (experimental)"
         default y
         depends on UDHCPD || 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.
+        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 FEATURE_UDHCP_8021Q
         bool "Support 802.1Q VLAN parameters"
         default y
         depends on UDHCPD || UDHCPC
         help
-          If selected, both client and server will support passing of VLAN
-          ID and priority via options 132 and 133 as per 802.1Q.
+        If selected, both client and server will support passing of VLAN
+        ID and priority via options 132 and 133 as per 802.1Q.
 
 config UDHCPC_SLACK_FOR_BUGGY_SERVERS
         int "DHCP options slack buffer size"
@@ -145,19 +145,19 @@ config UDHCPC_SLACK_FOR_BUGGY_SERVERS
         range 0 924
         depends on UDHCPD || 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 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.
diff --git a/networking/udhcp/d6_dhcpc.c b/networking/udhcp/d6_dhcpc.c
index f6d3fb98b..5ebd05d01 100644
--- a/networking/udhcp/d6_dhcpc.c
+++ b/networking/udhcp/d6_dhcpc.c
@@ -14,31 +14,31 @@
 //config:       default n  # not yet ready
 //config:       depends on FEATURE_IPV6
 //config:       help
-//config:         udhcpc6 is a DHCPv6 client
+//config:       udhcpc6 is a DHCPv6 client
 //config:
 //config:config FEATURE_UDHCPC6_RFC3646
 //config:       bool "Support RFC 3646 (DNS server and search list)"
 //config:       default y
 //config:       depends on UDHCPC6
 //config:       help
-//config:         List of DNS servers and domain search list can be requested with
-//config:         "-O dns" and "-O search". If server gives these values,
-//config:         they will be set in environment variables "dns" and "search".
+//config:       List of DNS servers and domain search list can be requested with
+//config:       "-O dns" and "-O search". If server gives these values,
+//config:       they will be set in environment variables "dns" and "search".
 //config:
 //config:config FEATURE_UDHCPC6_RFC4704
 //config:       bool "Support RFC 4704 (Client FQDN)"
 //config:       default y
 //config:       depends on UDHCPC6
 //config:       help
-//config:         You can request FQDN to be given by server using "-O fqdn".
+//config:       You can request FQDN to be given by server using "-O fqdn".
 //config:
 //config:config FEATURE_UDHCPC6_RFC4833
 //config:       bool "Support RFC 4833 (Timezones)"
 //config:       default y
 //config:       depends on UDHCPC6
 //config:       help
-//config:         You can request POSIX timezone with "-O tz" and timezone name
-//config:         with "-O timezone".
+//config:       You can request POSIX timezone with "-O tz" and timezone name
+//config:       with "-O timezone".
 
 //applet:IF_UDHCPC6(APPLET(udhcpc6, BB_DIR_USR_BIN, BB_SUID_DROP))
 
@@ -877,10 +877,10 @@ static int d6_raw_socket(int ifindex)
         };
 #endif
 
-        log1("opening raw socket on ifindex %d", ifindex); //log2?
+        log2("opening raw socket on ifindex %d", ifindex);
 
         fd = xsocket(PF_PACKET, SOCK_DGRAM, htons(ETH_P_IPV6));
-        log1("got raw socket fd %d", fd); //log2?
+        log2("got raw socket fd %d", fd);
 
         sock.sll_family = AF_PACKET;
         sock.sll_protocol = htons(ETH_P_IPV6);
@@ -1238,7 +1238,7 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv)
                 retval = 0;
                 /* If we already timed out, fall through with retval = 0, else... */
                 if (tv > 0) {
-                        log1("waiting on select %u seconds", tv);
+                        log1("waiting %u seconds", tv);
                         timestamp_before_wait = (unsigned)monotonic_sec();
                         retval = poll(pfds, 2, tv < INT_MAX/1000 ? tv * 1000 : INT_MAX);
                         if (retval < 0) {
@@ -1248,7 +1248,7 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv)
                                         continue;
                                 }
                                 /* Else: an error occured, panic! */
-                                bb_perror_msg_and_die("select");
+                                bb_perror_msg_and_die("poll");
                         }
                 }
 
diff --git a/networking/udhcp/d6_socket.c b/networking/udhcp/d6_socket.c
index 930e5e4f5..d00c217d6 100644
--- a/networking/udhcp/d6_socket.c
+++ b/networking/udhcp/d6_socket.c
@@ -28,8 +28,8 @@ int FAST_FUNC d6_read_interface(const char *interface, int *ifindex, struct in6_
                 if (ifa->ifa_addr->sa_family == AF_PACKET) {
                         struct sockaddr_ll *sll = (struct sockaddr_ll*)(ifa->ifa_addr);
                         memcpy(mac, sll->sll_addr, 6);
-                        log1("MAC %02x:%02x:%02x:%02x:%02x:%02x", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
-                        log1("adapter index %d", sll->sll_ifindex);
+                        log2("MAC %02x:%02x:%02x:%02x:%02x:%02x", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
+                        log2("ifindex %d", sll->sll_ifindex);
                         *ifindex = sll->sll_ifindex;
                         retval &= (0xf - (1<<0));
                 }
diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c
index 1a66c610e..ccf04993d 100644
--- a/networking/udhcp/dhcpc.c
+++ b/networking/udhcp/dhcpc.c
@@ -1001,14 +1001,14 @@ static int udhcp_raw_socket(int ifindex)
         int fd;
         struct sockaddr_ll sock;
 
-        log1("opening raw socket on ifindex %d", ifindex); //log2?
+        log2("opening raw socket on ifindex %d", ifindex);
 
         fd = xsocket(PF_PACKET, SOCK_DGRAM, htons(ETH_P_IP));
         /* ^^^^^
          * SOCK_DGRAM: remove link-layer headers on input (SOCK_RAW keeps them)
          * ETH_P_IP: want to receive only packets with IPv4 eth type
          */
-        log1("got raw socket fd"); //log2?
+        log2("got raw socket fd");
 
         sock.sll_family = AF_PACKET;
         sock.sll_protocol = htons(ETH_P_IP);
@@ -1455,7 +1455,7 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
                 retval = 0;
                 /* If we already timed out, fall through with retval = 0, else... */
                 if (tv > 0) {
-                        log1("waiting on select %u seconds", tv);
+                        log1("waiting %u seconds", tv);
                         timestamp_before_wait = (unsigned)monotonic_sec();
                         retval = poll(pfds, 2, tv < INT_MAX/1000 ? tv * 1000 : INT_MAX);
                         if (retval < 0) {
@@ -1465,7 +1465,7 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
                                         continue;
                                 }
                                 /* Else: an error occurred, panic! */
-                                bb_perror_msg_and_die("select");
+                                bb_perror_msg_and_die("poll");
                         }
                 }
 
diff --git a/networking/udhcp/socket.c b/networking/udhcp/socket.c
index 4fd79f423..ec6a1dc0f 100644
--- a/networking/udhcp/socket.c
+++ b/networking/udhcp/socket.c
@@ -56,7 +56,7 @@ int FAST_FUNC udhcp_read_interface(const char *interface, int *ifindex, uint32_t
                         close(fd);
                         return -1;
                 }
-                log1("adapter index %d", ifr->ifr_ifindex);
+                log2("ifindex %d", ifr->ifr_ifindex);
                 *ifindex = ifr->ifr_ifindex;
         }
 
diff --git a/networking/vconfig.c b/networking/vconfig.c
index 854eca0a1..e6e2872bf 100644
--- a/networking/vconfig.c
+++ b/networking/vconfig.c
@@ -10,11 +10,11 @@
 /* BB_AUDIT SUSv3 N/A */
 
 //config:config VCONFIG
-//config:       bool "vconfig"
+//config:       bool "vconfig (2.5 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         Creates, removes, and configures VLAN interfaces
+//config:       Creates, removes, and configures VLAN interfaces
 
 //applet:IF_VCONFIG(APPLET(vconfig, BB_DIR_SBIN, BB_SUID_DROP))
 
diff --git a/networking/wget.c b/networking/wget.c
index b9d840328..ab9bc1836 100644
--- a/networking/wget.c
+++ b/networking/wget.c
@@ -10,11 +10,11 @@
  */
 
 //config:config WGET
-//config:       bool "wget"
+//config:       bool "wget (35 kb)"
 //config:       default y
 //config:       help
-//config:         wget is a utility for non-interactive download of files from HTTP
-//config:         and FTP servers.
+//config:       wget is a utility for non-interactive download of files from HTTP
+//config:       and FTP servers.
 //config:
 //config:config FEATURE_WGET_LONG_OPTIONS
 //config:       bool "Enable long options"
@@ -31,21 +31,21 @@
 //config:       default y
 //config:       depends on WGET
 //config:       help
-//config:         Support authenticated HTTP transfers.
+//config:       Support authenticated HTTP transfers.
 //config:
 //config:config FEATURE_WGET_TIMEOUT
 //config:       bool "Enable timeout option -T SEC"
 //config:       default y
 //config:       depends on WGET
 //config:       help
-//config:         Supports network read and connect timeouts for wget,
-//config:         so that wget will give up and timeout, through the -T
-//config:         command line option.
+//config:       Supports network read and connect timeouts for wget,
+//config:       so that wget will give up and timeout, through the -T
+//config:       command line option.
 //config:
-//config:         Currently only connect and network data read timeout are
-//config:         supported (i.e., timeout is not applied to the DNS query). When
-//config:         FEATURE_WGET_LONG_OPTIONS is also enabled, the --timeout option
-//config:         will work in addition to -T.
+//config:       Currently only connect and network data read timeout are
+//config:       supported (i.e., timeout is not applied to the DNS query). When
+//config:       FEATURE_WGET_LONG_OPTIONS is also enabled, the --timeout option
+//config:       will work in addition to -T.
 //config:
 //config:config FEATURE_WGET_HTTPS
 //config:       bool "Support HTTPS using internal TLS code"
@@ -53,68 +53,68 @@
 //config:       depends on WGET
 //config:       select TLS
 //config:       help
-//config:         wget will use internal TLS code to connect to https:// URLs.
-//config:         Note:
-//config:         On NOMMU machines, ssl_helper applet should be available
-//config:         in the $PATH for this to work. Make sure to select that applet.
+//config:       wget will use internal TLS code to connect to https:// URLs.
+//config:       Note:
+//config:       On NOMMU machines, ssl_helper applet should be available
+//config:       in the $PATH for this to work. Make sure to select that applet.
 //config:
-//config:         Note: currently, TLS code only makes TLS I/O work, it
-//config:         does *not* check that the peer is who it claims to be, etc.
-//config:         IOW: it uses peer-supplied public keys to establish encryption
-//config:         and signing keys, then encrypts and signs outgoing data and
-//config:         decrypts incoming data.
-//config:         It does not check signature hashes on the incoming data:
-//config:         this means that attackers manipulating TCP packets can
-//config:         send altered data and we unknowingly receive garbage.
-//config:         (This check might be relatively easy to add).
-//config:         It does not check public key's certificate:
-//config:         this means that the peer may be an attacker impersonating
-//config:         the server we think we are talking to.
+//config:       Note: currently, TLS code only makes TLS I/O work, it
+//config:       does *not* check that the peer is who it claims to be, etc.
+//config:       IOW: it uses peer-supplied public keys to establish encryption
+//config:       and signing keys, then encrypts and signs outgoing data and
+//config:       decrypts incoming data.
+//config:       It does not check signature hashes on the incoming data:
+//config:       this means that attackers manipulating TCP packets can
+//config:       send altered data and we unknowingly receive garbage.
+//config:       (This check might be relatively easy to add).
+//config:       It does not check public key's certificate:
+//config:       this means that the peer may be an attacker impersonating
+//config:       the server we think we are talking to.
 //config:
-//config:         If you think this is unacceptable, consider this. As more and more
-//config:         servers switch to HTTPS-only operation, without such "crippled"
-//config:         TLS code it is *impossible* to simply download a kernel source
-//config:         from kernel.org. Which can in real world translate into
-//config:         "my small automatic tooling to build cross-compilers from sources
-//config:         no longer works, I need to additionally keep a local copy
-//config:         of ~4 megabyte source tarball of a SSL library and ~2 megabyte
-//config:         source of wget, need to compile and built both before I can
-//config:         download anything. All this despite the fact that the build
-//config:         is done in a QEMU sandbox on a machine with absolutely nothing
-//config:         worth stealing, so I don't care if someone would go to a lot
-//config:         of trouble to intercept my HTTPS download to send me an altered
-//config:         kernel tarball".
+//config:       If you think this is unacceptable, consider this. As more and more
+//config:       servers switch to HTTPS-only operation, without such "crippled"
+//config:       TLS code it is *impossible* to simply download a kernel source
+//config:       from kernel.org. Which can in real world translate into
+//config:       "my small automatic tooling to build cross-compilers from sources
+//config:       no longer works, I need to additionally keep a local copy
+//config:       of ~4 megabyte source tarball of a SSL library and ~2 megabyte
+//config:       source of wget, need to compile and built both before I can
+//config:       download anything. All this despite the fact that the build
+//config:       is done in a QEMU sandbox on a machine with absolutely nothing
+//config:       worth stealing, so I don't care if someone would go to a lot
+//config:       of trouble to intercept my HTTPS download to send me an altered
+//config:       kernel tarball".
 //config:
-//config:         If you still think this is unacceptable, send patches.
+//config:       If you still think this is unacceptable, send patches.
 //config:
-//config:         If you still think this is unacceptable, do not want to send
-//config:         patches, but do want to waste bandwidth expaining how wrong
-//config:         it is, you will be ignored.
+//config:       If you still think this is unacceptable, do not want to send
+//config:       patches, but do want to waste bandwidth expaining how wrong
+//config:       it is, you will be ignored.
 //config:
 //config:config FEATURE_WGET_OPENSSL
 //config:       bool "Try to connect to HTTPS using openssl"
 //config:       default y
 //config:       depends on WGET
 //config:       help
-//config:         Try to use openssl to handle HTTPS.
+//config:       Try to use openssl to handle HTTPS.
 //config:
-//config:         OpenSSL has a simple SSL client for debug purposes.
-//config:         If you select this option, wget will effectively run:
-//config:         "openssl s_client -quiet -connect hostname:443
-//config:         -servername hostname 2>/dev/null" and pipe its data
-//config:         through it. -servername is not used if hostname is numeric.
-//config:         Note inconvenient API: host resolution is done twice,
-//config:         and there is no guarantee openssl's idea of IPv6 address
-//config:         format is the same as ours.
-//config:         Another problem is that s_client prints debug information
-//config:         to stderr, and it needs to be suppressed. This means
-//config:         all error messages get suppressed too.
-//config:         openssl is also a big binary, often dynamically linked
-//config:         against ~15 libraries.
+//config:       OpenSSL has a simple SSL client for debug purposes.
+//config:       If you select this option, wget will effectively run:
+//config:       "openssl s_client -quiet -connect hostname:443
+//config:       -servername hostname 2>/dev/null" and pipe its data
+//config:       through it. -servername is not used if hostname is numeric.
+//config:       Note inconvenient API: host resolution is done twice,
+//config:       and there is no guarantee openssl's idea of IPv6 address
+//config:       format is the same as ours.
+//config:       Another problem is that s_client prints debug information
+//config:       to stderr, and it needs to be suppressed. This means
+//config:       all error messages get suppressed too.
+//config:       openssl is also a big binary, often dynamically linked
+//config:       against ~15 libraries.
 //config:
-//config:         If openssl can't be executed, internal TLS code will be used
-//config:         (if you enabled it); if openssl can be executed but fails later,
-//config:         wget can't detect this, and download will fail.
+//config:       If openssl can't be executed, internal TLS code will be used
+//config:       (if you enabled it); if openssl can be executed but fails later,
+//config:       wget can't detect this, and download will fail.
 
 //applet:IF_WGET(APPLET(wget, BB_DIR_USR_BIN, BB_SUID_DROP))
 
diff --git a/networking/whois.c b/networking/whois.c
index c9dfcf5ee..0cb7e5411 100644
--- a/networking/whois.c
+++ b/networking/whois.c
@@ -11,10 +11,10 @@
  */
 
 //config:config WHOIS
-//config:       bool "whois"
+//config:       bool "whois (6.6 kb)"
 //config:       default y
 //config:       help
-//config:         whois is a client for the whois directory service
+//config:       whois is a client for the whois directory service
 
 //applet:IF_WHOIS(APPLET(whois, BB_DIR_USR_BIN, BB_SUID_DROP))
 
diff --git a/networking/zcip.c b/networking/zcip.c
index 9122bd681..94174a165 100644
--- a/networking/zcip.c
+++ b/networking/zcip.c
@@ -15,17 +15,17 @@
  * certainly be used.  Its naming is built over multicast DNS.
  */
 //config:config ZCIP
-//config:       bool "zcip"
+//config:       bool "zcip (7.8 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       select FEATURE_SYSLOG
 //config:       help
-//config:         ZCIP provides ZeroConf IPv4 address selection, according to RFC 3927.
-//config:         It's a daemon that allocates and defends a dynamically assigned
-//config:         address on the 169.254/16 network, requiring no system administrator.
+//config:       ZCIP provides ZeroConf IPv4 address selection, according to RFC 3927.
+//config:       It's a daemon that allocates and defends a dynamically assigned
+//config:       address on the 169.254/16 network, requiring no system administrator.
 //config:
-//config:         See http://www.zeroconf.org for further details, and "zcip.script"
-//config:         in the busybox examples.
+//config:       See http://www.zeroconf.org for further details, and "zcip.script"
+//config:       in the busybox examples.
 
 //applet:IF_ZCIP(APPLET(zcip, BB_DIR_SBIN, BB_SUID_DROP))
 
@@ -183,6 +183,7 @@ static int run(char *argv[3], const char *param, uint32_t nip)
         int status;
         const char *addr = addr; /* for gcc */
         const char *fmt = "%s %s %s" + 3;
+        char *env_ip = env_ip;
 
         argv[2] = (char*)param;
 
@@ -190,12 +191,16 @@ static int run(char *argv[3], const char *param, uint32_t nip)
 
         if (nip != 0) {
                 addr = nip_to_a(nip);
-                xsetenv("ip", addr);
+                /* Must not use setenv() repeatedly, it leaks memory. Use putenv() */
+                env_ip = xasprintf("ip=%s", addr);
+                putenv(env_ip);
                 fmt -= 3;
         }
         bb_error_msg(fmt, argv[2], argv[0], addr);
-
         status = spawn_and_wait(argv + 1);
+        if (nip != 0)
+                bb_unsetenv_and_free(env_ip);
+
         if (status < 0) {
                 bb_perror_msg("%s %s %s" + 3, argv[2], argv[0]);
                 return -errno;
diff --git a/printutils/lpd.c b/printutils/lpd.c
index 882393436..3fdba5d2b 100644
--- a/printutils/lpd.c
+++ b/printutils/lpd.c
@@ -70,10 +70,10 @@
  * mv -f ./"$DATAFILE" save/
  */
 //config:config LPD
-//config:       bool "lpd"
+//config:       bool "lpd (5.3 kb)"
 //config:       default y
 //config:       help
-//config:         lpd is a print spooling daemon.
+//config:       lpd is a print spooling daemon.
 
 //applet:IF_LPD(APPLET(lpd, BB_DIR_USR_SBIN, BB_SUID_DROP))
 
diff --git a/printutils/lpr.c b/printutils/lpr.c
index 8cc87d167..808ecb5dc 100644
--- a/printutils/lpr.c
+++ b/printutils/lpr.c
@@ -12,16 +12,16 @@
  * See RFC 1179 for protocol description.
  */
 //config:config LPR
-//config:       bool "lpr"
+//config:       bool "lpr (10 kb)"
 //config:       default y
 //config:       help
-//config:         lpr sends files (or standard input) to a print spooling daemon.
+//config:       lpr sends files (or standard input) to a print spooling daemon.
 //config:
 //config:config LPQ
-//config:       bool "lpq"
+//config:       bool "lpq (10 kb)"
 //config:       default y
 //config:       help
-//config:         lpq is a print spool queue examination and manipulation program.
+//config:       lpq is a print spool queue examination and manipulation program.
 
 //              APPLET_ODDNAME:name main  location        suid_type     help
 //applet:IF_LPQ(APPLET_ODDNAME(lpq, lpqr, BB_DIR_USR_BIN, BB_SUID_DROP, lpq))
diff --git a/procps/Config.src b/procps/Config.src
index 35fef2eda..515d79938 100644
--- a/procps/Config.src
+++ b/procps/Config.src
@@ -12,7 +12,7 @@ config FEATURE_SHOW_THREADS
         default y
         depends on PS || TOP || PSTREE
         help
-          Enables the ps -T option, showing of threads in pstree,
-          and 'h' command in top.
+        Enables the ps -T option, showing of threads in pstree,
+        and 'h' command in top.
 
 endmenu
diff --git a/procps/free.c b/procps/free.c
index f3a2c3c0c..618664e08 100644
--- a/procps/free.c
+++ b/procps/free.c
@@ -7,13 +7,13 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config FREE
-//config:       bool "free"
+//config:       bool "free (2.4 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX #sysinfo()
 //config:       help
-//config:         free displays the total amount of free and used physical and swap
-//config:         memory in the system, as well as the buffers used by the kernel.
-//config:         The shared memory column should be ignored; it is obsolete.
+//config:       free displays the total amount of free and used physical and swap
+//config:       memory in the system, as well as the buffers used by the kernel.
+//config:       The shared memory column should be ignored; it is obsolete.
 
 //applet:IF_FREE(APPLET(free, BB_DIR_USR_BIN, BB_SUID_DROP))
 
diff --git a/procps/fuser.c b/procps/fuser.c
index db28cca79..2585a4203 100644
--- a/procps/fuser.c
+++ b/procps/fuser.c
@@ -7,12 +7,12 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config FUSER
-//config:       bool "fuser"
+//config:       bool "fuser (7 kb)"
 //config:       default y
 //config:       help
-//config:         fuser lists all PIDs (Process IDs) that currently have a given
-//config:         file open. fuser can also list all PIDs that have a given network
-//config:         (TCP or UDP) port open.
+//config:       fuser lists all PIDs (Process IDs) that currently have a given
+//config:       file open. fuser can also list all PIDs that have a given network
+//config:       (TCP or UDP) port open.
 
 //applet:IF_FUSER(APPLET(fuser, BB_DIR_USR_BIN, BB_SUID_DROP))
 
diff --git a/procps/iostat.c b/procps/iostat.c
index 2db343f69..6a39c324f 100644
--- a/procps/iostat.c
+++ b/procps/iostat.c
@@ -8,10 +8,10 @@
  */
 
 //config:config IOSTAT
-//config:       bool "iostat"
+//config:       bool "iostat (7.4 kb)"
 //config:       default y
 //config:       help
-//config:         Report CPU and I/O statistics
+//config:       Report CPU and I/O statistics
 
 //applet:IF_IOSTAT(APPLET(iostat, BB_DIR_BIN, BB_SUID_DROP))
 
diff --git a/procps/kill.c b/procps/kill.c
index 975a3e8c5..5cff24475 100644
--- a/procps/kill.c
+++ b/procps/kill.c
@@ -8,29 +8,29 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config KILL
-//config:       bool "kill"
+//config:       bool "kill (2.6 kb)"
 //config:       default y
 //config:       help
-//config:         The command kill sends the specified signal to the specified
-//config:         process or process group. If no signal is specified, the TERM
-//config:         signal is sent.
+//config:       The command kill sends the specified signal to the specified
+//config:       process or process group. If no signal is specified, the TERM
+//config:       signal is sent.
 //config:
 //config:config KILLALL
-//config:       bool "killall"
+//config:       bool "killall (5.6 kb)"
 //config:       default y
 //config:       help
-//config:         killall sends a signal to all processes running any of the
-//config:         specified commands. If no signal name is specified, SIGTERM is
-//config:         sent.
+//config:       killall sends a signal to all processes running any of the
+//config:       specified commands. If no signal name is specified, SIGTERM is
+//config:       sent.
 //config:
 //config:config KILLALL5
-//config:       bool "killall5"
+//config:       bool "killall5 (5.3 kb)"
 //config:       default y
 //config:       help
-//config:         The SystemV killall command. killall5 sends a signal
-//config:         to all processes except kernel threads and the processes
-//config:         in its own session, so it won't kill the shell that is running
-//config:         the script it was called from.
+//config:       The SystemV killall command. killall5 sends a signal
+//config:       to all processes except kernel threads and the processes
+//config:       in its own session, so it won't kill the shell that is running
+//config:       the script it was called from.
 
 //applet:IF_KILL(APPLET(kill, BB_DIR_BIN, BB_SUID_DROP))
 //                   APPLET_ODDNAME:name      main  location         suid_type     help
diff --git a/procps/lsof.c b/procps/lsof.c
index b0156a538..8d3a23cc8 100644
--- a/procps/lsof.c
+++ b/procps/lsof.c
@@ -8,11 +8,11 @@
  */
 
 //config:config LSOF
-//config:       bool "lsof"
+//config:       bool "lsof (3.6 kb)"
 //config:       default y
 //config:       help
-//config:         Show open files in the format of:
-//config:         PID <TAB> /path/to/executable <TAB> /path/to/opened/file
+//config:       Show open files in the format of:
+//config:       PID <TAB> /path/to/executable <TAB> /path/to/opened/file
 
 //applet:IF_LSOF(APPLET(lsof, BB_DIR_USR_BIN, BB_SUID_DROP))
 
diff --git a/procps/mpstat.c b/procps/mpstat.c
index 8a79fd8ba..05a3f3ff3 100644
--- a/procps/mpstat.c
+++ b/procps/mpstat.c
@@ -12,10 +12,10 @@
 //kbuild:lib-$(CONFIG_MPSTAT) += mpstat.o
 
 //config:config MPSTAT
-//config:       bool "mpstat"
+//config:       bool "mpstat (10 kb)"
 //config:       default y
 //config:       help
-//config:         Per-processor statistics
+//config:       Per-processor statistics
 
 #include "libbb.h"
 #include <sys/utsname.h>  /* struct utsname */
diff --git a/procps/nmeter.c b/procps/nmeter.c
index 05bf0a08c..9463f94dc 100644
--- a/procps/nmeter.c
+++ b/procps/nmeter.c
@@ -7,10 +7,10 @@
  */
 
 //config:config NMETER
-//config:       bool "nmeter"
+//config:       bool "nmeter (10 kb)"
 //config:       default y
 //config:       help
-//config:         Prints selected system stats continuously, one line per update.
+//config:       Prints selected system stats continuously, one line per update.
 
 //applet:IF_NMETER(APPLET(nmeter, BB_DIR_USR_BIN, BB_SUID_DROP))
 
diff --git a/procps/pgrep.c b/procps/pgrep.c
index 3d01c6cff..a3ca9e295 100644
--- a/procps/pgrep.c
+++ b/procps/pgrep.c
@@ -7,16 +7,16 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config PGREP
-//config:       bool "pgrep"
+//config:       bool "pgrep (6.8 kb)"
 //config:       default y
 //config:       help
-//config:         Look for processes by name.
+//config:       Look for processes by name.
 //config:
 //config:config PKILL
-//config:       bool "pkill"
+//config:       bool "pkill (7.6 kb)"
 //config:       default y
 //config:       help
-//config:         Send signals to processes by name.
+//config:       Send signals to processes by name.
 
 //applet:IF_PGREP(APPLET(pgrep, BB_DIR_USR_BIN, BB_SUID_DROP))
 //                APPLET_ODDNAME:name   main   location        suid_type     help
@@ -155,15 +155,18 @@ int pgrep_main(int argc UNUSED_PARAM, char **argv)
         proc = NULL;
         while ((proc = procps_scan(proc, scan_mask)) != NULL) {
                 char *cmd;
-                int cmdlen;
+                int cmdlen, match;
 
                 if (proc->pid == pid)
                         continue;
 
-                if (ppid2match >= 0 && ppid2match != proc->ppid)
-                        continue;
-                if (sid2match >= 0 && sid2match != proc->sid)
-                        continue;
+                if (!OPT_INVERT) {
+                        /* Quickly reject -sN -PN mismatches... unless -v */
+                        if (ppid2match >= 0 && ppid2match != proc->ppid)
+                                continue;
+                        if (sid2match >= 0 && sid2match != proc->sid)
+                                continue;
+                }
 
                 cmdlen = -1;
                 cmd = proc->argv0;
@@ -186,12 +189,36 @@ int pgrep_main(int argc UNUSED_PARAM, char **argv)
                         }
                 }
 
+                if (OPT_INVERT) {
+                        /* "pgrep -v -P1 firefox" means "not (ppid=1 AND name=firefox)"
+                         * or equivalently "ppid!=1 OR name!=firefox".
+                         * Check the first condition and if true, skip matching.
+                         */
+                        if (ppid2match >= 0 && ppid2match != proc->ppid)
+                                goto got_it;
+                        if (sid2match >= 0 && sid2match != proc->sid)
+                                goto got_it;
+                }
+
+                match = !argv[0]; /* if no PATTERN, then it's a match, else... */
+                if (!match) {
+ again:
+                        match = (regexec(&re_buffer, cmd, 1, re_match, 0) == 0);
+                        if (!match && cmd != proc->comm) {
+                                /* if argv[] did not match, try comm */
+                                cmdlen = -1;
+                                cmd = proc->comm;
+                                goto again;
+                        }
+                        if (match && OPT_ANCHOR) {
+                                /* -x requires full string match */
+                                match = (re_match[0].rm_so == 0 && cmd[re_match[0].rm_eo] == '\0');
+                        }
+                }
+
                 /* NB: OPT_INVERT is always 0 or 1 */
-                if (!argv[0]
-                 || (regexec(&re_buffer, cmd, 1, re_match, 0) == 0 /* match found */
-                    && (!OPT_ANCHOR || (re_match[0].rm_so == 0 && re_match[0].rm_eo == (regoff_t)strlen(cmd)))
-                    ) ^ OPT_INVERT
-                ) {
+                if (match ^ OPT_INVERT) {
+ got_it:
                         matched_pid = proc->pid;
                         if (OPT_LAST) {
                                 free(cmd_last);
diff --git a/procps/pidof.c b/procps/pidof.c
index b64f0cbd6..41247a02c 100644
--- a/procps/pidof.c
+++ b/procps/pidof.c
@@ -7,27 +7,27 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config PIDOF
-//config:       bool "pidof"
+//config:       bool "pidof (6.6 kb)"
 //config:       default y
 //config:       help
-//config:         Pidof finds the process id's (pids) of the named programs. It prints
-//config:         those id's on the standard output.
+//config:       Pidof finds the process id's (pids) of the named programs. It prints
+//config:       those id's on the standard output.
 //config:
 //config:config FEATURE_PIDOF_SINGLE
 //config:       bool "Enable single shot (-s)"
 //config:       default y
 //config:       depends on PIDOF
 //config:       help
-//config:         Support '-s' for returning only the first pid found.
+//config:       Support '-s' for returning only the first pid found.
 //config:
 //config:config FEATURE_PIDOF_OMIT
 //config:       bool "Enable omitting pids (-o PID)"
 //config:       default y
 //config:       depends on PIDOF
 //config:       help
-//config:         Support '-o PID' for omitting the given pid(s) in output.
-//config:         The special pid %PPID can be used to name the parent process
-//config:         of the pidof, in other words the calling shell or shell script.
+//config:       Support '-o PID' for omitting the given pid(s) in output.
+//config:       The special pid %PPID can be used to name the parent process
+//config:       of the pidof, in other words the calling shell or shell script.
 
 //applet:IF_PIDOF(APPLET(pidof, BB_DIR_BIN, BB_SUID_DROP))
 
diff --git a/procps/pmap.c b/procps/pmap.c
index aa221cfb8..c8f728897 100644
--- a/procps/pmap.c
+++ b/procps/pmap.c
@@ -9,10 +9,10 @@
  */
 
 //config:config PMAP
-//config:       bool "pmap"
-//config:       default y
-//config:       help
-//config:         Display processes' memory mappings.
+//config:       bool "pmap (6 kb)"
+//config:       default y
+//config:       help
+//config:       Display processes' memory mappings.
 
 //applet:IF_PMAP(APPLET(pmap, BB_DIR_USR_BIN, BB_SUID_DROP))
 //kbuild:lib-$(CONFIG_PMAP) += pmap.o
diff --git a/procps/powertop.c b/procps/powertop.c
index 413806836..ebd659bdb 100644
--- a/procps/powertop.c
+++ b/procps/powertop.c
@@ -14,18 +14,18 @@
 //kbuild:lib-$(CONFIG_POWERTOP) += powertop.o
 
 //config:config POWERTOP
-//config:       bool "powertop"
+//config:       bool "powertop (9.1 kb)"
 //config:       default y
 //config:       help
-//config:         Analyze power consumption on Intel-based laptops
+//config:       Analyze power consumption on Intel-based laptops
 //config:
 //config:config FEATURE_POWERTOP_INTERACTIVE
 //config:       bool "Accept keyboard commands"
 //config:       default y
 //config:       depends on POWERTOP
 //config:       help
-//config:         Without this, powertop will only refresh display every 10 seconds.
-//config:         No keyboard commands will work, only ^C to terminate.
+//config:       Without this, powertop will only refresh display every 10 seconds.
+//config:       No keyboard commands will work, only ^C to terminate.
 
 // XXX This should be configurable
 #define ENABLE_FEATURE_POWERTOP_PROCIRQ 1
diff --git a/procps/ps.c b/procps/ps.c
index f7242f2d5..c1da921bd 100644
--- a/procps/ps.c
+++ b/procps/ps.c
@@ -9,27 +9,27 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config PS
-//config:       bool "ps"
+//config:       bool "ps (11 kb)"
 //config:       default y
 //config:       help
-//config:         ps gives a snapshot of the current processes.
+//config:       ps gives a snapshot of the current processes.
 //config:
 //config:config FEATURE_PS_WIDE
 //config:       bool "Enable wide output option (-w)"
 //config:       default y
 //config:       depends on PS && !DESKTOP
 //config:       help
-//config:         Support argument 'w' for wide output.
-//config:         If given once, 132 chars are printed, and if given more
-//config:         than once, the length is unlimited.
+//config:       Support argument 'w' for wide output.
+//config:       If given once, 132 chars are printed, and if given more
+//config:       than once, the length is unlimited.
 //config:
 //config:config FEATURE_PS_LONG
 //config:       bool "Enable long output option (-l)"
 //config:       default y
 //config:       depends on PS && !DESKTOP
 //config:       help
-//config:         Support argument 'l' for long output.
-//config:         Adds fields PPID, RSS, START, TIME & TTY
+//config:       Support argument 'l' for long output.
+//config:       Adds fields PPID, RSS, START, TIME & TTY
 //config:
 //config:config FEATURE_PS_TIME
 //config:       bool "Support -o time and -o etime output specifiers"
@@ -42,8 +42,8 @@
 //config:       default n
 //config:       depends on FEATURE_PS_TIME
 //config:       help
-//config:         Include support for measuring HZ on old kernels and non-ELF systems
-//config:         (if you are on Linux 2.4.0+ and use ELF, you don't need this)
+//config:       Include support for measuring HZ on old kernels and non-ELF systems
+//config:       (if you are on Linux 2.4.0+ and use ELF, you don't need this)
 //config:
 //config:config FEATURE_PS_ADDITIONAL_COLUMNS
 //config:       bool "Support -o rgroup, -o ruser, -o nice specifiers"
diff --git a/procps/pstree.c b/procps/pstree.c
index bc9f0c927..212cda23c 100644
--- a/procps/pstree.c
+++ b/procps/pstree.c
@@ -11,10 +11,10 @@
  */
 
 //config:config PSTREE
-//config:       bool "pstree"
+//config:       bool "pstree (9.4 kb)"
 //config:       default y
 //config:       help
-//config:         Display a tree of processes.
+//config:       Display a tree of processes.
 
 //applet:IF_PSTREE(APPLET(pstree, BB_DIR_USR_BIN, BB_SUID_DROP))
 
diff --git a/procps/pwdx.c b/procps/pwdx.c
index 4e34149ed..dac238950 100644
--- a/procps/pwdx.c
+++ b/procps/pwdx.c
@@ -9,10 +9,10 @@
  */
 
 //config:config PWDX
-//config:       bool "pwdx"
+//config:       bool "pwdx (3.5 kb)"
 //config:       default y
 //config:       help
-//config:         Report current working directory of a process
+//config:       Report current working directory of a process
 
 //applet:IF_PWDX(APPLET(pwdx, BB_DIR_USR_BIN, BB_SUID_DROP))
 
diff --git a/procps/smemcap.c b/procps/smemcap.c
index b2b32198f..17aeccd53 100644
--- a/procps/smemcap.c
+++ b/procps/smemcap.c
@@ -13,11 +13,11 @@
 //kbuild:lib-$(CONFIG_SMEMCAP) += smemcap.o
 
 //config:config SMEMCAP
-//config:       bool "smemcap"
+//config:       bool "smemcap (2.5 kb)"
 //config:       default y
 //config:       help
-//config:         smemcap is a tool for capturing process data for smem,
-//config:         a memory usage statistic tool.
+//config:       smemcap is a tool for capturing process data for smem,
+//config:       a memory usage statistic tool.
 
 #include "libbb.h"
 #define BB_ARCHIVE_PUBLIC
diff --git a/procps/sysctl.c b/procps/sysctl.c
index 93d7c3418..b17f5e896 100644
--- a/procps/sysctl.c
+++ b/procps/sysctl.c
@@ -11,10 +11,10 @@
  * v1.01.1 - busybox applet aware by <solar@gentoo.org>
  */
 //config:config BB_SYSCTL
-//config:       bool "sysctl"
+//config:       bool "sysctl (6.9 kb)"
 //config:       default y
 //config:       help
-//config:         Configure kernel parameters at runtime.
+//config:       Configure kernel parameters at runtime.
 
 //applet:IF_BB_SYSCTL(APPLET(sysctl, BB_DIR_SBIN, BB_SUID_DROP))
 
diff --git a/procps/top.c b/procps/top.c
index ff2fddeea..015d1ab74 100644
--- a/procps/top.c
+++ b/procps/top.c
@@ -50,66 +50,66 @@
  * chroot . ./top -bn1 >top1.out
  */
 //config:config TOP
-//config:       bool "top"
+//config:       bool "top (17 kb)"
 //config:       default y
 //config:       help
-//config:         The top program provides a dynamic real-time view of a running
-//config:         system.
+//config:       The top program provides a dynamic real-time view of a running
+//config:       system.
 //config:
 //config:config FEATURE_TOP_INTERACTIVE
 //config:       bool "Accept keyboard commands"
 //config:       default y
 //config:       depends on TOP
 //config:       help
-//config:         Without this, top will only refresh display every 5 seconds.
-//config:         No keyboard commands will work, only ^C to terminate.
+//config:       Without this, top will only refresh display every 5 seconds.
+//config:       No keyboard commands will work, only ^C to terminate.
 //config:
 //config:config FEATURE_TOP_CPU_USAGE_PERCENTAGE
 //config:       bool "Show CPU per-process usage percentage"
 //config:       default y
 //config:       depends on TOP
 //config:       help
-//config:         Make top display CPU usage for each process.
-//config:         This adds about 2k.
+//config:       Make top display CPU usage for each process.
+//config:       This adds about 2k.
 //config:
 //config:config FEATURE_TOP_CPU_GLOBAL_PERCENTS
 //config:       bool "Show CPU global usage percentage"
 //config:       default y
 //config:       depends on FEATURE_TOP_CPU_USAGE_PERCENTAGE
 //config:       help
-//config:         Makes top display "CPU: NN% usr NN% sys..." line.
-//config:         This adds about 0.5k.
+//config:       Makes top display "CPU: NN% usr NN% sys..." line.
+//config:       This adds about 0.5k.
 //config:
 //config:config FEATURE_TOP_SMP_CPU
 //config:       bool "SMP CPU usage display ('c' key)"
 //config:       default y
 //config:       depends on FEATURE_TOP_CPU_GLOBAL_PERCENTS
 //config:       help
-//config:         Allow 'c' key to switch between individual/cumulative CPU stats
-//config:         This adds about 0.5k.
+//config:       Allow 'c' key to switch between individual/cumulative CPU stats
+//config:       This adds about 0.5k.
 //config:
 //config:config FEATURE_TOP_DECIMALS
 //config:       bool "Show 1/10th of a percent in CPU/mem statistics"
 //config:       default y
 //config:       depends on FEATURE_TOP_CPU_USAGE_PERCENTAGE
 //config:       help
-//config:         Show 1/10th of a percent in CPU/mem statistics.
-//config:         This adds about 0.3k.
+//config:       Show 1/10th of a percent in CPU/mem statistics.
+//config:       This adds about 0.3k.
 //config:
 //config:config FEATURE_TOP_SMP_PROCESS
 //config:       bool "Show CPU process runs on ('j' field)"
 //config:       default y
 //config:       depends on TOP
 //config:       help
-//config:         Show CPU where process was last found running on.
-//config:         This is the 'j' field.
+//config:       Show CPU where process was last found running on.
+//config:       This is the 'j' field.
 //config:
 //config:config FEATURE_TOPMEM
 //config:       bool "Topmem command ('s' key)"
 //config:       default y
 //config:       depends on TOP
 //config:       help
-//config:         Enable 's' in top (gives lots of memory info).
+//config:       Enable 's' in top (gives lots of memory info).
 
 //applet:IF_TOP(APPLET(top, BB_DIR_USR_BIN, BB_SUID_DROP))
 
diff --git a/procps/uptime.c b/procps/uptime.c
index 8e8956c0f..24b2b39df 100644
--- a/procps/uptime.c
+++ b/procps/uptime.c
@@ -12,20 +12,20 @@
  * Added FEATURE_UPTIME_UTMP_SUPPORT flag.
  */
 //config:config UPTIME
-//config:       bool "uptime"
+//config:       bool "uptime (632 bytes)"
 //config:       default y
 //config:       select PLATFORM_LINUX #sysinfo()
 //config:       help
-//config:         uptime gives a one line display of the current time, how long
-//config:         the system has been running, how many users are currently logged
-//config:         on, and the system load averages for the past 1, 5, and 15 minutes.
+//config:       uptime gives a one line display of the current time, how long
+//config:       the system has been running, how many users are currently logged
+//config:       on, and the system load averages for the past 1, 5, and 15 minutes.
 //config:
 //config:config FEATURE_UPTIME_UTMP_SUPPORT
 //config:       bool "Show the number of users"
 //config:       default y
 //config:       depends on UPTIME && FEATURE_UTMP
 //config:       help
-//config:         Display the number of users currently logged on.
+//config:       Display the number of users currently logged on.
 
 //applet:IF_UPTIME(APPLET(uptime, BB_DIR_USR_BIN, BB_SUID_DROP))
 
diff --git a/procps/watch.c b/procps/watch.c
index bb34124c0..2bb7cca90 100644
--- a/procps/watch.c
+++ b/procps/watch.c
@@ -12,11 +12,11 @@
 /* BB_AUDIT GNU defects -- only option -n is supported. */
 
 //config:config WATCH
-//config:       bool "watch"
+//config:       bool "watch (4.1 kb)"
 //config:       default y
 //config:       help
-//config:         watch is used to execute a program periodically, showing
-//config:         output to the screen.
+//config:       watch is used to execute a program periodically, showing
+//config:       output to the screen.
 
 //applet:IF_WATCH(APPLET(watch, BB_DIR_BIN, BB_SUID_DROP))
 
diff --git a/runit/chpst.c b/runit/chpst.c
index ee3a33153..3a2f9e616 100644
--- a/runit/chpst.c
+++ b/runit/chpst.c
@@ -28,36 +28,36 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 /* Busyboxed by Denys Vlasenko <vda.linux@googlemail.com> */
 
 //config:config CHPST
-//config:       bool "chpst"
+//config:       bool "chpst (8.7 kb)"
 //config:       default y
 //config:       help
-//config:         chpst changes the process state according to the given options, and
-//config:         execs specified program.
+//config:       chpst changes the process state according to the given options, and
+//config:       execs specified program.
 //config:
 //config:config SETUIDGID
-//config:       bool "setuidgid"
+//config:       bool "setuidgid (4.2 kb)"
 //config:       default y
 //config:       help
-//config:         Sets soft resource limits as specified by options
+//config:       Sets soft resource limits as specified by options
 //config:
 //config:config ENVUIDGID
-//config:       bool "envuidgid"
+//config:       bool "envuidgid (3.6 kb)"
 //config:       default y
 //config:       help
-//config:         Sets $UID to account's uid and $GID to account's gid
+//config:       Sets $UID to account's uid and $GID to account's gid
 //config:
 //config:config ENVDIR
-//config:       bool "envdir"
+//config:       bool "envdir (2.5 kb)"
 //config:       default y
 //config:       help
-//config:         Sets various environment variables as specified by files
-//config:         in the given directory
+//config:       Sets various environment variables as specified by files
+//config:       in the given directory
 //config:
 //config:config SOFTLIMIT
-//config:       bool "softlimit"
+//config:       bool "softlimit (4.3 kb)"
 //config:       default y
 //config:       help
-//config:         Sets soft resource limits as specified by options
+//config:       Sets soft resource limits as specified by options
 
 //applet:IF_CHPST(APPLET(chpst, BB_DIR_USR_BIN, BB_SUID_DROP))
 //                    APPLET_ODDNAME:name       main   location        suid_type     help
diff --git a/runit/runsv.c b/runit/runsv.c
index 939653d12..ad7d82cb8 100644
--- a/runit/runsv.c
+++ b/runit/runsv.c
@@ -28,11 +28,11 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 /* Busyboxed by Denys Vlasenko <vda.linux@googlemail.com> */
 
 //config:config RUNSV
-//config:       bool "runsv"
+//config:       bool "runsv (7.2 kb)"
 //config:       default y
 //config:       help
-//config:         runsv starts and monitors a service and optionally an appendant log
-//config:         service.
+//config:       runsv starts and monitors a service and optionally an appendant log
+//config:       service.
 
 //applet:IF_RUNSV(APPLET(runsv, BB_DIR_USR_BIN, BB_SUID_DROP))
 
diff --git a/runit/runsvdir.c b/runit/runsvdir.c
index 84916e929..b4f5c303b 100644
--- a/runit/runsvdir.c
+++ b/runit/runsvdir.c
@@ -28,21 +28,21 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 /* Busyboxed by Denys Vlasenko <vda.linux@googlemail.com> */
 
 //config:config RUNSVDIR
-//config:       bool "runsvdir"
+//config:       bool "runsvdir (6 kb)"
 //config:       default y
 //config:       help
-//config:         runsvdir starts a runsv process for each subdirectory, or symlink to
-//config:         a directory, in the services directory dir, up to a limit of 1000
-//config:         subdirectories, and restarts a runsv process if it terminates.
+//config:       runsvdir starts a runsv process for each subdirectory, or symlink to
+//config:       a directory, in the services directory dir, up to a limit of 1000
+//config:       subdirectories, and restarts a runsv process if it terminates.
 //config:
 //config:config FEATURE_RUNSVDIR_LOG
 //config:       bool "Enable scrolling argument log"
 //config:       depends on RUNSVDIR
 //config:       default n
 //config:       help
-//config:         Enable feature where second parameter of runsvdir holds last error
-//config:         message (viewable via top/ps). Otherwise (feature is off
-//config:         or no parameter), error messages go to stderr only.
+//config:       Enable feature where second parameter of runsvdir holds last error
+//config:       message (viewable via top/ps). Otherwise (feature is off
+//config:       or no parameter), error messages go to stderr only.
 
 //applet:IF_RUNSVDIR(APPLET(runsvdir, BB_DIR_USR_BIN, BB_SUID_DROP))
 
diff --git a/runit/sv.c b/runit/sv.c
index faa31d4fa..2d5b466bf 100644
--- a/runit/sv.c
+++ b/runit/sv.c
@@ -154,26 +154,26 @@ Exit Codes
 /* Busyboxed by Denys Vlasenko <vda.linux@googlemail.com> */
 
 //config:config SV
-//config:       bool "sv"
+//config:       bool "sv (7.8 kb)"
 //config:       default y
 //config:       help
-//config:         sv reports the current status and controls the state of services
-//config:         monitored by the runsv supervisor.
+//config:       sv reports the current status and controls the state of services
+//config:       monitored by the runsv supervisor.
 //config:
 //config:config SV_DEFAULT_SERVICE_DIR
 //config:       string "Default directory for services"
 //config:       default "/var/service"
 //config:       depends on SV
 //config:       help
-//config:         Default directory for services.
-//config:         Defaults to "/var/service"
+//config:       Default directory for services.
+//config:       Defaults to "/var/service"
 //config:
 //config:config SVC
-//config:       bool "svc"
+//config:       bool "svc (7.8 kb)"
 //config:       default y
 //config:       help
-//config:         svc controls the state of services monitored by the runsv supervisor.
-//config:         It is comaptible with daemontools command with the same name.
+//config:       svc controls the state of services monitored by the runsv supervisor.
+//config:       It is comaptible with daemontools command with the same name.
 
 //applet:IF_SV(APPLET(sv, BB_DIR_USR_BIN, BB_SUID_DROP))
 //applet:IF_SVC(APPLET(svc, BB_DIR_USR_BIN, BB_SUID_DROP))
diff --git a/runit/svlogd.c b/runit/svlogd.c
index 795bf48bb..8dbf67106 100644
--- a/runit/svlogd.c
+++ b/runit/svlogd.c
@@ -125,12 +125,12 @@ log message, you can use a pattern like this instead
 */
 
 //config:config SVLOGD
-//config:       bool "svlogd"
+//config:       bool "svlogd (15 kb)"
 //config:       default y
 //config:       help
-//config:         svlogd continuously reads log data from its standard input, optionally
-//config:         filters log messages, and writes the data to one or more automatically
-//config:         rotated logs.
+//config:       svlogd continuously reads log data from its standard input, optionally
+//config:       filters log messages, and writes the data to one or more automatically
+//config:       rotated logs.
 
 //applet:IF_SVLOGD(APPLET(svlogd, BB_DIR_USR_SBIN, BB_SUID_DROP))
 
diff --git a/scripts/test_setenv_leak.c b/scripts/test_setenv_leak.c
new file mode 100644
index 000000000..e51722ca7
--- /dev/null
+++ b/scripts/test_setenv_leak.c
@@ -0,0 +1,18 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+int main(int argc, char **argv)
+{
+        char buf[256];
+
+        int i = argv[1] ? atoi(argv[1]) : 999999;
+        while (--i > 0) {
+                sprintf(buf, "%d", i);
+                setenv("VAR", buf, 1);
+        }
+        printf("Check size of [heap] mapping:\n");
+        freopen("/proc/self/maps", "r", stdin);
+        while (fgets(buf, sizeof(buf), stdin))
+                fputs(buf, stdout);
+        return 0;
+}
diff --git a/selinux/chcon.c b/selinux/chcon.c
index ba9b08638..ae87fb554 100644
--- a/selinux/chcon.c
+++ b/selinux/chcon.c
@@ -8,11 +8,11 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config CHCON
-//config:       bool "chcon"
+//config:       bool "chcon (8.9 kb)"
 //config:       default n
 //config:       depends on SELINUX
 //config:       help
-//config:         Enable support to change the security context of file.
+//config:       Enable support to change the security context of file.
 //config:
 //config:config FEATURE_CHCON_LONG_OPTIONS
 //config:       bool "Enable long options"
diff --git a/selinux/getenforce.c b/selinux/getenforce.c
index 37477652b..0286dd0be 100644
--- a/selinux/getenforce.c
+++ b/selinux/getenforce.c
@@ -7,11 +7,11 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config GETENFORCE
-//config:       bool "getenforce"
+//config:       bool "getenforce (1.7 kb)"
 //config:       default n
 //config:       depends on SELINUX
 //config:       help
-//config:         Enable support to get the current mode of SELinux.
+//config:       Enable support to get the current mode of SELinux.
 
 //applet:IF_GETENFORCE(APPLET(getenforce, BB_DIR_USR_SBIN, BB_SUID_DROP))
 
diff --git a/selinux/getsebool.c b/selinux/getsebool.c
index fce478f5b..6d7805c8d 100644
--- a/selinux/getsebool.c
+++ b/selinux/getsebool.c
@@ -7,11 +7,11 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config GETSEBOOL
-//config:       bool "getsebool"
+//config:       bool "getsebool (5.5 kb)"
 //config:       default n
 //config:       depends on SELINUX
 //config:       help
-//config:         Enable support to get SELinux boolean values.
+//config:       Enable support to get SELinux boolean values.
 
 //applet:IF_GETSEBOOL(APPLET(getsebool, BB_DIR_USR_SBIN, BB_SUID_DROP))
 
diff --git a/selinux/load_policy.c b/selinux/load_policy.c
index f969453e3..b7930839c 100644
--- a/selinux/load_policy.c
+++ b/selinux/load_policy.c
@@ -5,11 +5,11 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config LOAD_POLICY
-//config:       bool "load_policy"
+//config:       bool "load_policy (1.6 kb)"
 //config:       default n
 //config:       depends on SELINUX
 //config:       help
-//config:         Enable support to load SELinux policy.
+//config:       Enable support to load SELinux policy.
 
 //applet:IF_LOAD_POLICY(APPLET(load_policy, BB_DIR_USR_SBIN, BB_SUID_DROP))
 
diff --git a/selinux/matchpathcon.c b/selinux/matchpathcon.c
index a3b2fcb74..3388d0857 100644
--- a/selinux/matchpathcon.c
+++ b/selinux/matchpathcon.c
@@ -6,12 +6,12 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config MATCHPATHCON
-//config:       bool "matchpathcon"
+//config:       bool "matchpathcon (6.1 kb)"
 //config:       default n
 //config:       depends on SELINUX
 //config:       help
-//config:         Enable support to get default security context of the
-//config:         specified path from the file contexts configuration.
+//config:       Enable support to get default security context of the
+//config:       specified path from the file contexts configuration.
 
 //applet:IF_MATCHPATHCON(APPLET(matchpathcon, BB_DIR_USR_SBIN, BB_SUID_DROP))
 
diff --git a/selinux/runcon.c b/selinux/runcon.c
index 82f4d50d3..09082d6c2 100644
--- a/selinux/runcon.c
+++ b/selinux/runcon.c
@@ -29,11 +29,11 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config RUNCON
-//config:       bool "runcon"
+//config:       bool "runcon (6.6 kb)"
 //config:       default n
 //config:       depends on SELINUX
 //config:       help
-//config:         Enable support to run command in specified security context.
+//config:       Enable support to run command in specified security context.
 //config:
 //config:config FEATURE_RUNCON_LONG_OPTIONS
 //config:       bool "Enable long options"
diff --git a/selinux/selinuxenabled.c b/selinux/selinuxenabled.c
index b80c4e71b..e70a452cf 100644
--- a/selinux/selinuxenabled.c
+++ b/selinux/selinuxenabled.c
@@ -7,12 +7,12 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config SELINUXENABLED
-//config:       bool "selinuxenabled"
+//config:       bool "selinuxenabled (321 bytes)"
 //config:       default n
 //config:       depends on SELINUX
 //config:       help
-//config:         Enable support for this command to be used within shell scripts
-//config:         to determine if selinux is enabled.
+//config:       Enable support for this command to be used within shell scripts
+//config:       to determine if selinux is enabled.
 
 //applet:IF_SELINUXENABLED(APPLET(selinuxenabled, BB_DIR_USR_SBIN, BB_SUID_DROP))
 
diff --git a/selinux/sestatus.c b/selinux/sestatus.c
index ad49c9d25..daf4b223b 100644
--- a/selinux/sestatus.c
+++ b/selinux/sestatus.c
@@ -8,11 +8,11 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config SESTATUS
-//config:       bool "sestatus"
+//config:       bool "sestatus (12 kb)"
 //config:       default n
 //config:       depends on SELINUX
 //config:       help
-//config:         Displays the status of SELinux.
+//config:       Displays the status of SELinux.
 
 //applet:IF_SESTATUS(APPLET(sestatus, BB_DIR_USR_SBIN, BB_SUID_DROP))
 
diff --git a/selinux/setenforce.c b/selinux/setenforce.c
index 8d18abd29..c28de6ec5 100644
--- a/selinux/setenforce.c
+++ b/selinux/setenforce.c
@@ -7,11 +7,11 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config SETENFORCE
-//config:       bool "setenforce"
+//config:       bool "setenforce (2.1 kb)"
 //config:       default n
 //config:       depends on SELINUX
 //config:       help
-//config:         Enable support to modify the mode SELinux is running in.
+//config:       Enable support to modify the mode SELinux is running in.
 
 //applet:IF_SETENFORCE(APPLET(setenforce, BB_DIR_USR_SBIN, BB_SUID_DROP))
 
diff --git a/selinux/setfiles.c b/selinux/setfiles.c
index c14a67be5..01106bd67 100644
--- a/selinux/setfiles.c
+++ b/selinux/setfiles.c
@@ -4,30 +4,30 @@
   Port to BusyBox (c) 2007 by Yuichi Nakamura <ynakam@hitachisoft.jp>
 */
 //config:config SETFILES
-//config:       bool "setfiles"
+//config:       bool "setfiles (13 kb)"
 //config:       default n
 //config:       depends on SELINUX
 //config:       help
-//config:         Enable support to modify to relabel files.
-//config:         Notice: If you built libselinux with -D_FILE_OFFSET_BITS=64,
-//config:         (It is default in libselinux's Makefile), you _must_ enable
-//config:         CONFIG_LFS.
+//config:       Enable support to modify to relabel files.
+//config:       Notice: If you built libselinux with -D_FILE_OFFSET_BITS=64,
+//config:       (It is default in libselinux's Makefile), you _must_ enable
+//config:       CONFIG_LFS.
 //config:
 //config:config FEATURE_SETFILES_CHECK_OPTION
 //config:       bool "Enable check option"
 //config:       default n
 //config:       depends on SETFILES
 //config:       help
-//config:         Support "-c" option (check the validity of the contexts against
-//config:         the specified binary policy) for setfiles. Requires libsepol.
+//config:       Support "-c" option (check the validity of the contexts against
+//config:       the specified binary policy) for setfiles. Requires libsepol.
 //config:
 //config:config RESTORECON
-//config:       bool "restorecon"
+//config:       bool "restorecon (12 kb)"
 //config:       default n
 //config:       depends on SELINUX
 //config:       help
-//config:         Enable support to relabel files. The feature is almost
-//config:         the same as setfiles, but usage is a little different.
+//config:       Enable support to relabel files. The feature is almost
+//config:       the same as setfiles, but usage is a little different.
 
 //applet:IF_SETFILES(APPLET(setfiles, BB_DIR_SBIN, BB_SUID_DROP))
 //                     APPLET_ODDNAME:name        main      location     suid_type     help
diff --git a/selinux/setsebool.c b/selinux/setsebool.c
index 6a6bd031c..579118172 100644
--- a/selinux/setsebool.c
+++ b/selinux/setsebool.c
@@ -8,12 +8,12 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config SETSEBOOL
-//config:       bool "setsebool"
+//config:       bool "setsebool (1.7 kb)"
 //config:       default n
 //config:       depends on SELINUX
 //config:       help
-//config:         Enable support for change boolean.
-//config:         semanage and -P option is not supported yet.
+//config:       Enable support for change boolean.
+//config:       semanage and -P option is not supported yet.
 
 //applet:IF_SETSEBOOL(APPLET(setsebool, BB_DIR_USR_SBIN, BB_SUID_DROP))
 
diff --git a/shell/Config.src b/shell/Config.src
index ccb1b15fe..81c4ec874 100644
--- a/shell/Config.src
+++ b/shell/Config.src
@@ -10,26 +10,26 @@ choice
         prompt "Choose which shell is aliased to 'sh' name"
         default SH_IS_ASH
         help
-          Choose which shell you want to be executed by 'sh' alias.
-          The ash shell is the most bash compatible and full featured one.
+        Choose which shell you want to be executed by 'sh' alias.
+        The ash shell is the most bash compatible and full featured one.
 
 # note: cannot use "select ASH" here, it breaks "make allnoconfig"
 config SH_IS_ASH
         depends on !NOMMU
         bool "ash"
         help
-          Choose ash to be the shell executed by 'sh' name.
-          The ash code will be built into busybox. If you don't select
-          "ash" choice (CONFIG_ASH), this shell may only be invoked by
-          the name 'sh' (and not 'ash').
+        Choose ash to be the shell executed by 'sh' name.
+        The ash code will be built into busybox. If you don't select
+        "ash" choice (CONFIG_ASH), this shell may only be invoked by
+        the name 'sh' (and not 'ash').
 
 config SH_IS_HUSH
         bool "hush"
         help
-          Choose hush to be the shell executed by 'sh' name.
-          The hush code will be built into busybox. If you don't select
-          "hush" choice (CONFIG_HUSH), this shell may only be invoked by
-          the name 'sh' (and not 'hush').
+        Choose hush to be the shell executed by 'sh' name.
+        The hush code will be built into busybox. If you don't select
+        "hush" choice (CONFIG_HUSH), this shell may only be invoked by
+        the name 'sh' (and not 'hush').
 
 config SH_IS_NONE
         bool "none"
@@ -40,36 +40,36 @@ choice
         prompt "Choose which shell is aliased to 'bash' name"
         default BASH_IS_NONE
         help
-          Choose which shell you want to be executed by 'bash' alias.
-          The ash shell is the most bash compatible and full featured one,
-          although compatibility is far from being complete.
+        Choose which shell you want to be executed by 'bash' alias.
+        The ash shell is the most bash compatible and full featured one,
+        although compatibility is far from being complete.
 
-          Note that selecting this option does not switch on any bash
-          compatibility code. It merely makes it possible to install
-          /bin/bash (sym)link and run scripts which start with
-          #!/bin/bash line.
+        Note that selecting this option does not switch on any bash
+        compatibility code. It merely makes it possible to install
+        /bin/bash (sym)link and run scripts which start with
+        #!/bin/bash line.
 
-          Many systems use it in scripts which use bash-specific features,
-          even simple ones like $RANDOM. Without this option, busybox
-          can't be used for running them because it won't recongnize
-          "bash" as a supported applet name.
+        Many systems use it in scripts which use bash-specific features,
+        even simple ones like $RANDOM. Without this option, busybox
+        can't be used for running them because it won't recongnize
+        "bash" as a supported applet name.
 
 config BASH_IS_ASH
         depends on !NOMMU
         bool "ash"
         help
-          Choose ash to be the shell executed by 'bash' name.
-          The ash code will be built into busybox. If you don't select
-          "ash" choice (CONFIG_ASH), this shell may only be invoked by
-          the name 'bash' (and not 'ash').
+        Choose ash to be the shell executed by 'bash' name.
+        The ash code will be built into busybox. If you don't select
+        "ash" choice (CONFIG_ASH), this shell may only be invoked by
+        the name 'bash' (and not 'ash').
 
 config BASH_IS_HUSH
         bool "hush"
         help
-          Choose hush to be the shell executed by 'bash' name.
-          The hush code will be built into busybox. If you don't select
-          "hush" choice (CONFIG_HUSH), this shell may only be invoked by
-          the name 'bash' (and not 'hush').
+        Choose hush to be the shell executed by 'bash' name.
+        The hush code will be built into busybox. If you don't select
+        "hush" choice (CONFIG_HUSH), this shell may only be invoked by
+        the name 'bash' (and not 'hush').
 
 config BASH_IS_NONE
         bool "none"
@@ -88,71 +88,78 @@ config FEATURE_SH_MATH
         default y
         depends on ASH || HUSH || SH_IS_ASH || BASH_IS_ASH || SH_IS_HUSH || BASH_IS_HUSH
         help
-          Enable math support in the shell via $((...)) syntax.
+        Enable math support in the shell via $((...)) syntax.
 
 config FEATURE_SH_MATH_64
         bool "Extend POSIX math support to 64 bit"
         default y
         depends on FEATURE_SH_MATH
         help
-          Enable 64-bit math support in the shell. This will make the shell
-          slightly larger, but will allow computation with very large numbers.
-          This is not in POSIX, so do not rely on this in portable code.
+        Enable 64-bit math support in the shell. This will make the shell
+        slightly larger, but will allow computation with very large numbers.
+        This is not in POSIX, so do not rely on this in portable code.
 
 config FEATURE_SH_EXTRA_QUIET
         bool "Hide message on interactive shell startup"
         default y
         depends on ASH || HUSH || SH_IS_ASH || BASH_IS_ASH || SH_IS_HUSH || BASH_IS_HUSH
         help
-          Remove the busybox introduction when starting a shell.
+        Remove the busybox introduction when starting a shell.
 
 config FEATURE_SH_STANDALONE
         bool "Standalone shell"
         default n
         depends on ASH || HUSH || SH_IS_ASH || BASH_IS_ASH || SH_IS_HUSH || BASH_IS_HUSH
         help
-          This option causes busybox shells to use busybox applets
-          in preference to executables in the PATH whenever possible. For
-          example, entering the command 'ifconfig' into the shell would cause
-          busybox to use the ifconfig busybox applet. Specifying the fully
-          qualified executable name, such as '/sbin/ifconfig' will still
-          execute the /sbin/ifconfig executable on the filesystem. This option
-          is generally used when creating a statically linked version of busybox
-          for use as a rescue shell, in the event that you screw up your system.
-
-          This is implemented by re-execing /proc/self/exe (typically)
-          with right parameters.
-
-          However, there are drawbacks: it is problematic in chroot jails
-          without mounted /proc, and ps/top may show command name as 'exe'
-          for applets started this way.
+        This option causes busybox shells to use busybox applets
+        in preference to executables in the PATH whenever possible. For
+        example, entering the command 'ifconfig' into the shell would cause
+        busybox to use the ifconfig busybox applet. Specifying the fully
+        qualified executable name, such as '/sbin/ifconfig' will still
+        execute the /sbin/ifconfig executable on the filesystem. This option
+        is generally used when creating a statically linked version of busybox
+        for use as a rescue shell, in the event that you screw up your system.
+
+        This is implemented by re-execing /proc/self/exe (typically)
+        with right parameters.
+
+        However, there are drawbacks: it is problematic in chroot jails
+        without mounted /proc, and ps/top may show command name as 'exe'
+        for applets started this way.
 
 config FEATURE_SH_NOFORK
         bool "Run 'nofork' applets directly"
         default n
         depends on ASH || HUSH || SH_IS_ASH || BASH_IS_ASH || SH_IS_HUSH || BASH_IS_HUSH
         help
-          This option causes busybox shells to not execute typical
-          fork/exec/wait sequence, but call <applet>_main directly,
-          if possible. (Sometimes it is not possible: for example,
-          this is not possible in pipes).
+        This option causes busybox shells to not execute typical
+        fork/exec/wait sequence, but call <applet>_main directly,
+        if possible. (Sometimes it is not possible: for example,
+        this is not possible in pipes).
 
-          This will be done only for some applets (those which are marked
-          NOFORK in include/applets.h).
+        This will be done only for some applets (those which are marked
+        NOFORK in include/applets.h).
 
-          This may significantly speed up some shell scripts.
+        This may significantly speed up some shell scripts.
 
-          This feature is relatively new. Use with care. Report bugs
-          to project mailing list.
+        This feature is relatively new. Use with care. Report bugs
+        to project mailing list.
+
+config FEATURE_SH_READ_FRAC
+        bool "read -t N.NNN support (+110 bytes)"
+        default y
+        depends on ASH || HUSH || SH_IS_ASH || BASH_IS_ASH || SH_IS_HUSH || BASH_IS_HUSH
+        help
+        Enable support for fractional second timeout in read builtin.
 
 config FEATURE_SH_HISTFILESIZE
         bool "Use $HISTFILESIZE"
         default y
         depends on ASH || HUSH || SH_IS_ASH || BASH_IS_ASH || SH_IS_HUSH || BASH_IS_HUSH
         help
-          This option makes busybox shells to use $HISTFILESIZE variable
-          to set shell history size. Note that its max value is capped
-          by "History size" setting in library tuning section.
+        This option makes busybox shells to use $HISTFILESIZE variable
+        to set shell history size. Note that its max value is capped
+        by "History size" setting in library tuning section.
 
 endif # Options common to all shells
 
diff --git a/shell/ash.c b/shell/ash.c
index dc5561765..28b522d7c 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -31,15 +31,14 @@
  */
 
 //config:config ASH
-//config:       bool "ash"
+//config:       bool "ash (77 kb)"
 //config:       default y
 //config:       depends on !NOMMU
 //config:       help
-//config:         Tha 'ash' shell adds about 60k in the default configuration and is
-//config:         the most complete and most pedantically correct shell included with
-//config:         busybox. This shell is actually a derivative of the Debian 'dash'
-//config:         shell (by Herbert Xu), which was created by porting the 'ash' shell
-//config:         (written by Kenneth Almquist) from NetBSD.
+//config:       The most complete and most pedantically correct shell included with
+//config:       busybox. This shell is actually a derivative of the Debian 'dash'
+//config:       shell (by Herbert Xu), which was created by porting the 'ash' shell
+//config:       (written by Kenneth Almquist) from NetBSD.
 //config:
 //config:# ash options
 //config:# note: Don't remove !NOMMU part in the next line; it would break
@@ -56,11 +55,11 @@
 //config:       default y       # Y is bigger, but because of uclibc glob() bug, let Y be default for now
 //config:       depends on ASH || SH_IS_ASH || BASH_IS_ASH
 //config:       help
-//config:         Do not use glob() function from libc, use internal implementation.
-//config:         Use this if you are getting "glob.h: No such file or directory"
-//config:         or similar build errors.
-//config:         Note that as of now (2017-01), uclibc and musl glob() both have bugs
-//config:         which would break ash if you select N here.
+//config:       Do not use glob() function from libc, use internal implementation.
+//config:       Use this if you are getting "glob.h: No such file or directory"
+//config:       or similar build errors.
+//config:       Note that as of now (2017-01), uclibc and musl glob() both have bugs
+//config:       which would break ash if you select N here.
 //config:
 //config:config ASH_BASH_COMPAT
 //config:       bool "bash-compatible extensions"
@@ -82,37 +81,37 @@
 //config:       default y
 //config:       depends on ASH || SH_IS_ASH || BASH_IS_ASH
 //config:       help
-//config:         Enable pseudorandom generator and dynamic variable "$RANDOM".
-//config:         Each read of "$RANDOM" will generate a new pseudorandom value.
-//config:         You can reset the generator by using a specified start value.
-//config:         After "unset RANDOM" the generator will switch off and this
-//config:         variable will no longer have special treatment.
+//config:       Enable pseudorandom generator and dynamic variable "$RANDOM".
+//config:       Each read of "$RANDOM" will generate a new pseudorandom value.
+//config:       You can reset the generator by using a specified start value.
+//config:       After "unset RANDOM" the generator will switch off and this
+//config:       variable will no longer have special treatment.
 //config:
 //config:config ASH_EXPAND_PRMT
 //config:       bool "Expand prompt string"
 //config:       default y
 //config:       depends on ASH || SH_IS_ASH || BASH_IS_ASH
 //config:       help
-//config:         $PS# may contain volatile content, such as backquote commands.
-//config:         This option recreates the prompt string from the environment
-//config:         variable each time it is displayed.
+//config:       $PS# may contain volatile content, such as backquote commands.
+//config:       This option recreates the prompt string from the environment
+//config:       variable each time it is displayed.
 //config:
 //config:config ASH_IDLE_TIMEOUT
 //config:       bool "Idle timeout variable $TMOUT"
 //config:       default y
 //config:       depends on ASH || SH_IS_ASH || BASH_IS_ASH
 //config:       help
-//config:         Enable bash-like auto-logout after $TMOUT seconds of idle time.
+//config:       Enable bash-like auto-logout after $TMOUT seconds of idle time.
 //config:
 //config:config ASH_MAIL
 //config:       bool "Check for new mail in interactive shell"
 //config:       default y
 //config:       depends on ASH || SH_IS_ASH || BASH_IS_ASH
 //config:       help
-//config:         Enable "check for new mail" function:
-//config:         if set, $MAIL file and $MAILPATH list of files
-//config:         are checked for mtime changes, and "you have mail"
-//config:         message is printed if change is detected.
+//config:       Enable "check for new mail" function:
+//config:       if set, $MAIL file and $MAILPATH list of files
+//config:       are checked for mtime changes, and "you have mail"
+//config:       message is printed if change is detected.
 //config:
 //config:config ASH_ECHO
 //config:       bool "echo builtin"
@@ -144,9 +143,9 @@
 //config:       default y
 //config:       depends on ASH || SH_IS_ASH || BASH_IS_ASH
 //config:       help
-//config:         Enable support for the 'command' builtin, which allows
-//config:         you to run the specified command or builtin,
-//config:         even when there is a function with the same name.
+//config:       Enable support for the 'command' builtin, which allows
+//config:       you to run the specified command or builtin,
+//config:       even when there is a function with the same name.
 //config:
 //config:
 //config:config ASH_NOCONSOLE
@@ -1746,7 +1745,7 @@ static char *
 stack_nputstr(const char *s, size_t n, char *p)
 {
         p = makestrspace(n, p);
-        p = (char *)memcpy(p, s, n) + n;
+        p = (char *)mempcpy(p, s, n);
         return p;
 }
 
@@ -1830,7 +1829,7 @@ number(const char *s)
 }
 
 /*
- * Produce a possibly single quoted string suitable as input to the shell.
+ * Produce a single quoted string suitable as input to the shell.
  * The return string is allocated on the stack.
  */
 static char *
@@ -1849,7 +1848,7 @@ single_quote(const char *s)
                 q = p = makestrspace(len + 3, p);
 
                 *q++ = '\'';
-                q = (char *)memcpy(q, s, len) + len;
+                q = (char *)mempcpy(q, s, len);
                 *q++ = '\'';
                 s += len;
 
@@ -1863,7 +1862,7 @@ single_quote(const char *s)
                 q = p = makestrspace(len + 3, p);
 
                 *q++ = '"';
-                q = (char *)memcpy(q, s - len, len) + len;
+                q = (char *)mempcpy(q, s - len, len);
                 *q++ = '"';
 
                 STADJUST(q - p, p);
@@ -1874,6 +1873,47 @@ single_quote(const char *s)
         return stackblock();
 }
 
+/*
+ * Produce a possibly single quoted string suitable as input to the shell.
+ * If 'conditional' is nonzero, quoting is only done if the string contains
+ * non-shellsafe characters, or is identical to a shell keyword (reserved
+ * word); if it is zero, quoting is always done.
+ * If quoting was done, the return string is allocated on the stack,
+ * otherwise a pointer to the original string is returned.
+ */
+static const char *
+maybe_single_quote(const char *s)
+{
+        const char *p = s;
+
+        while (*p) {
+                /* Assuming ACSII */
+                /* quote ctrl_chars space !"#$%&'()* */
+                if (*p < '+')
+                        goto need_quoting;
+                /* quote ;<=>? */
+                if (*p >= ';' && *p <= '?')
+                        goto need_quoting;
+                /* quote `[\ */
+                if (*p == '`')
+                        goto need_quoting;
+                if (*p == '[')
+                        goto need_quoting;
+                if (*p == '\\')
+                        goto need_quoting;
+                /* quote {|}~ DEL and high bytes */
+                if (*p > 'z')
+                        goto need_quoting;
+                /* Not quoting these: +,-./ 0-9 :@ A-Z ]^_ a-z */
+                /* TODO: maybe avoid quoting % */
+                p++;
+        }
+        return s;
+
+ need_quoting:
+        return single_quote(s);
+}
+
 
 /* ============ nextopt */
 
@@ -2362,10 +2402,10 @@ setvar(const char *name, const char *val, int flags)
 
         INT_OFF;
         nameeq = ckmalloc(namelen + vallen + 2);
-        p = memcpy(nameeq, name, namelen) + namelen;
+        p = mempcpy(nameeq, name, namelen);
         if (val) {
                 *p++ = '=';
-                p = memcpy(p, val, vallen) + vallen;
+                p = mempcpy(p, val, vallen);
         }
         *p = '\0';
         setvareq(nameeq, flags | VNOSAVE);
@@ -2512,8 +2552,7 @@ path_advance(const char **path, const char *name)
                 growstackblock();
         q = stackblock();
         if (p != start) {
-                memcpy(q, start, p - start);
-                q += p - start;
+                q = mempcpy(q, start, p - start);
                 *q++ = '/';
         }
         strcpy(q, name);
@@ -6277,7 +6316,7 @@ rmescapes(char *str, int flag)
                 }
                 q = r;
                 if (len > 0) {
-                        q = (char *)memcpy(q, str, len) + len;
+                        q = (char *)mempcpy(q, str, len);
                 }
         }
 
@@ -10161,18 +10200,36 @@ evalcommand(union node *cmd, int flags)
 
         /* Print the command if xflag is set. */
         if (xflag) {
-                int n;
-                const char *p = " %s" + 1;
+                const char *pfx = "";
+
+                fdprintf(preverrout_fd, "%s", expandstr(ps4val()));
 
-                fdprintf(preverrout_fd, p, expandstr(ps4val()));
                 sp = varlist.list;
-                for (n = 0; n < 2; n++) {
-                        while (sp) {
-                                fdprintf(preverrout_fd, p, sp->text);
-                                sp = sp->next;
-                                p = " %s";
-                        }
-                        sp = arglist.list;
+                while (sp) {
+                        char *varval = sp->text;
+                        char *eq = strchrnul(varval, '=');
+                        if (*eq)
+                                eq++;
+                        fdprintf(preverrout_fd, "%s%.*s%s",
+                                pfx,
+                                (int)(eq - varval), varval,
+                                maybe_single_quote(eq)
+                        );
+                        sp = sp->next;
+                        pfx = " ";
+                }
+
+                sp = arglist.list;
+                while (sp) {
+                        fdprintf(preverrout_fd, "%s%s",
+                                pfx,
+                                /* always quote if matches reserved word: */
+                                findkwd(sp->text)
+                                ? single_quote(sp->text)
+                                : maybe_single_quote(sp->text)
+                        );
+                        sp = sp->next;
+                        pfx = " ";
                 }
                 safe_write(preverrout_fd, "\n", 1);
         }
diff --git a/shell/ash_test/ash-parsing/argv0.right b/shell/ash_test/ash-parsing/argv0.right
new file mode 100644
index 000000000..d86bac9de
--- /dev/null
+++ b/shell/ash_test/ash-parsing/argv0.right
@@ -0,0 +1 @@
+OK
diff --git a/shell/ash_test/ash-parsing/argv0.tests b/shell/ash_test/ash-parsing/argv0.tests
new file mode 100755
index 000000000..f5c40f6fe
--- /dev/null
+++ b/shell/ash_test/ash-parsing/argv0.tests
@@ -0,0 +1,4 @@
+if test $# = 0; then
+    exec "$THIS_SH" "$0" arg
+fi
+echo OK
diff --git a/shell/ash_test/ash-parsing/brace1.right b/shell/ash_test/ash-parsing/brace1.right
new file mode 100644
index 000000000..10aa7a419
--- /dev/null
+++ b/shell/ash_test/ash-parsing/brace1.right
@@ -0,0 +1,7 @@
+{abc}
+{
+}
+./brace1.tests: line 4: {cmd: not found
+./brace1.tests: line 5: {: not found
+./brace1.tests: line 6: {: not found
+Done: 127
diff --git a/shell/ash_test/ash-parsing/brace1.tests b/shell/ash_test/ash-parsing/brace1.tests
new file mode 100755
index 000000000..2b45927c0
--- /dev/null
+++ b/shell/ash_test/ash-parsing/brace1.tests
@@ -0,0 +1,7 @@
+echo {abc}
+echo {
+echo }
+{cmd
+""{
+{""
+echo Done: $?
diff --git a/shell/ash_test/ash-parsing/brace2.right b/shell/ash_test/ash-parsing/brace2.right
new file mode 100644
index 000000000..37a966654
--- /dev/null
+++ b/shell/ash_test/ash-parsing/brace2.right
@@ -0,0 +1,3 @@
+{q,w}
+{q,w}
+Done
diff --git a/shell/ash_test/ash-parsing/brace2.tests b/shell/ash_test/ash-parsing/brace2.tests
new file mode 100755
index 000000000..ef75f0b70
--- /dev/null
+++ b/shell/ash_test/ash-parsing/brace2.tests
@@ -0,0 +1,5 @@
+v='{q,w}'
+# Should not brace-expand v value
+echo $v
+echo "$v"
+echo Done
diff --git a/shell/ash_test/ash-parsing/comment1.right b/shell/ash_test/ash-parsing/comment1.right
new file mode 100644
index 000000000..a102b1d4e
--- /dev/null
+++ b/shell/ash_test/ash-parsing/comment1.right
@@ -0,0 +1,2 @@
+Nothing:
+String: #should-be-echoed
diff --git a/shell/ash_test/ash-parsing/comment1.tests b/shell/ash_test/ash-parsing/comment1.tests
new file mode 100755
index 000000000..d268860ff
--- /dev/null
+++ b/shell/ash_test/ash-parsing/comment1.tests
@@ -0,0 +1,2 @@
+echo Nothing: #should-not-be-echoed
+echo String: ""#should-be-echoed
diff --git a/shell/ash_test/ash-parsing/eol1.right b/shell/ash_test/ash-parsing/eol1.right
new file mode 100644
index 000000000..31c896f62
--- /dev/null
+++ b/shell/ash_test/ash-parsing/eol1.right
@@ -0,0 +1 @@
+Done:0
diff --git a/shell/ash_test/ash-parsing/eol1.tests b/shell/ash_test/ash-parsing/eol1.tests
new file mode 100755
index 000000000..f1b55e8b8
--- /dev/null
+++ b/shell/ash_test/ash-parsing/eol1.tests
@@ -0,0 +1,18 @@
+# bug was that we treated <newline> as ';' in this line:
+true || echo foo |
+echo BAD1 | cat
+
+# variation on the same theme
+true || echo foo |
+# comment
+echo BAD2 | cat
+
+# variation on the same theme
+true || echo foo |
+
+echo BAD3 | cat
+
+# this should error out, but currently works in hush:
+#true || echo foo |;
+
+echo Done:$?
diff --git a/shell/ash_test/ash-parsing/escape1.right b/shell/ash_test/ash-parsing/escape1.right
new file mode 100644
index 000000000..1899b87ef
--- /dev/null
+++ b/shell/ash_test/ash-parsing/escape1.right
@@ -0,0 +1,4 @@
+\
+a\b
+\\
+c\\d
diff --git a/shell/ash_test/ash-parsing/escape1.tests b/shell/ash_test/ash-parsing/escape1.tests
new file mode 100755
index 000000000..25ac96b25
--- /dev/null
+++ b/shell/ash_test/ash-parsing/escape1.tests
@@ -0,0 +1,6 @@
+test "$CONFIG_FEATURE_FANCY_ECHO" = "y" || exit 77
+
+echo "\\"
+echo a"\\"b
+echo '\\'
+echo c'\\'d
diff --git a/shell/ash_test/ash-parsing/escape2.right b/shell/ash_test/ash-parsing/escape2.right
new file mode 100644
index 000000000..f55fd4a42
--- /dev/null
+++ b/shell/ash_test/ash-parsing/escape2.right
@@ -0,0 +1,4 @@
+*?[a]*
+a*?[a]*b
+*?[a]*
+c*?[a]*d
diff --git a/shell/ash_test/ash-parsing/escape2.tests b/shell/ash_test/ash-parsing/escape2.tests
new file mode 100755
index 000000000..ee718018d
--- /dev/null
+++ b/shell/ash_test/ash-parsing/escape2.tests
@@ -0,0 +1,4 @@
+echo "*?[a]*"
+echo a"*?[a]*"b
+echo '*?[a]*'
+echo c'*?[a]*'d
diff --git a/shell/ash_test/ash-parsing/escape3.right b/shell/ash_test/ash-parsing/escape3.right
new file mode 100644
index 000000000..da02a976a
--- /dev/null
+++ b/shell/ash_test/ash-parsing/escape3.right
@@ -0,0 +1,23 @@
+v: a \ b \\ c \\\ d \\\\ e
+v: a \ b \\ c \\\ d \\\\ e
+Unquoted:
+.a.
+.\.
+.b.
+.\\.
+.c.
+.\\\.
+.d.
+.\\\\.
+.e.
+Quoted:
+.a.
+.\.
+.b.
+.\\.
+.c.
+.\\\.
+.d.
+.\\\\.
+.e.
+done
diff --git a/shell/ash_test/ash-parsing/escape3.tests b/shell/ash_test/ash-parsing/escape3.tests
new file mode 100755
index 000000000..18705bd0c
--- /dev/null
+++ b/shell/ash_test/ash-parsing/escape3.tests
@@ -0,0 +1,10 @@
+test "$CONFIG_FEATURE_FANCY_ECHO" = "y" || exit 77
+
+v='a \ b \\ c \\\ d \\\\ e'
+echo v: $v
+echo v: "$v"
+echo Unquoted:
+for a in $v; do echo .$a.; done
+echo Quoted:
+for a in $v; do echo ".$a."; done
+echo done
diff --git a/shell/ash_test/ash-parsing/escape4.right b/shell/ash_test/ash-parsing/escape4.right
new file mode 100644
index 000000000..5de3e0c90
--- /dev/null
+++ b/shell/ash_test/ash-parsing/escape4.right
@@ -0,0 +1,2 @@
+Ok
+End
diff --git a/shell/ash_test/ash-parsing/escape4.tests b/shell/ash_test/ash-parsing/escape4.tests
new file mode 100755
index 000000000..df8bf0af7
--- /dev/null
+++ b/shell/ash_test/ash-parsing/escape4.tests
@@ -0,0 +1,6 @@
+i\
+f tr\
+ue; th\
+en echo "O\
+k"; fi; echo "\
+End"
\ No newline at end of file
diff --git a/shell/ash_test/ash-parsing/escape5.right b/shell/ash_test/ash-parsing/escape5.right
new file mode 100644
index 000000000..3cdd393c7
--- /dev/null
+++ b/shell/ash_test/ash-parsing/escape5.right
@@ -0,0 +1,9 @@
+a\nb\nc\n
+a
+b
+c
+a\nb\nc\n
+a
+b
+c
+Done
diff --git a/shell/ash_test/ash-parsing/escape5.tests b/shell/ash_test/ash-parsing/escape5.tests
new file mode 100755
index 000000000..337a98ec7
--- /dev/null
+++ b/shell/ash_test/ash-parsing/escape5.tests
@@ -0,0 +1,7 @@
+v="a\nb\nc\n"
+echo "$v"
+printf "$v"
+v='a\nb\nc\n'
+echo "$v"
+printf "$v"
+echo Done
diff --git a/shell/ash_test/ash-parsing/group1.right b/shell/ash_test/ash-parsing/group1.right
new file mode 100644
index 000000000..6a7c4be0a
--- /dev/null
+++ b/shell/ash_test/ash-parsing/group1.right
@@ -0,0 +1 @@
+word} }
diff --git a/shell/ash_test/ash-parsing/group1.tests b/shell/ash_test/ash-parsing/group1.tests
new file mode 100755
index 000000000..f063fbcb3
--- /dev/null
+++ b/shell/ash_test/ash-parsing/group1.tests
@@ -0,0 +1 @@
+{ echo word} }; }
diff --git a/shell/ash_test/ash-parsing/group2.right b/shell/ash_test/ash-parsing/group2.right
new file mode 100644
index 000000000..df4d9306a
--- /dev/null
+++ b/shell/ash_test/ash-parsing/group2.right
@@ -0,0 +1,2 @@
+got TERM
+Done: 0
diff --git a/shell/ash_test/ash-parsing/group2.tests b/shell/ash_test/ash-parsing/group2.tests
new file mode 100755
index 000000000..d99178585
--- /dev/null
+++ b/shell/ash_test/ash-parsing/group2.tests
@@ -0,0 +1,3 @@
+# Bug was in handling of "}&" without space
+{ trap "echo got TERM" TERM; sleep 2; }& sleep 1; kill $!; wait
+echo Done: $?
diff --git a/shell/ash_test/ash-parsing/groups_and_keywords1.right b/shell/ash_test/ash-parsing/groups_and_keywords1.right
new file mode 100644
index 000000000..4c46650dc
--- /dev/null
+++ b/shell/ash_test/ash-parsing/groups_and_keywords1.right
@@ -0,0 +1,11 @@
+Semicolons after } can be omitted 1:
+foo
+bar
+Semicolons after } can be omitted 2:
+foo
+bar
+Semicolons after fi can be omitted:
+foo
+bar
+baz
+Done:0
diff --git a/shell/ash_test/ash-parsing/groups_and_keywords1.tests b/shell/ash_test/ash-parsing/groups_and_keywords1.tests
new file mode 100755
index 000000000..01944d714
--- /dev/null
+++ b/shell/ash_test/ash-parsing/groups_and_keywords1.tests
@@ -0,0 +1,10 @@
+echo "Semicolons after } can be omitted 1:"
+if { echo foo; } then { echo bar; } fi
+
+echo "Semicolons after } can be omitted 2:"
+while { echo foo; } do { echo bar; break; } done
+
+echo "Semicolons after fi can be omitted:"
+while if echo foo; then echo bar; fi do echo baz; break; done
+
+echo Done:$?
diff --git a/shell/ash_test/ash-parsing/negate.right b/shell/ash_test/ash-parsing/negate.right
new file mode 100644
index 000000000..61d2ecd3a
--- /dev/null
+++ b/shell/ash_test/ash-parsing/negate.right
@@ -0,0 +1,36 @@
+! printing !
+0
+1
+1
+0
+0
+0
+!
+a
+b
+c
+! 1
+a 1
+b 1
+c 1
+! 1
+a 1
+b 1
+c 1
+0
+0
+0
+0
+1
+1
+1
+1
+0
+0
+0
+0
+1
+1
+1
+1
+Done
diff --git a/shell/ash_test/ash-parsing/negate.tests b/shell/ash_test/ash-parsing/negate.tests
new file mode 100755
index 000000000..51151cbd4
--- /dev/null
+++ b/shell/ash_test/ash-parsing/negate.tests
@@ -0,0 +1,19 @@
+echo ! printing !
+! false
+echo $?
+! true
+echo $?
+if ! false; then false; echo $?; fi
+echo $?
+if ! false; then ! false; echo $?; fi
+echo $?
+PRINTF=`which printf`
+for a in ! a b c; do echo $a; done
+for a in ! a b c; do ! printf "$a "; echo $?; done
+test x"$PRINTF" = x"" && exit 1
+for a in ! a b c; do ! "$PRINTF" "$a "; echo $?; done
+for a in ! a b c; do ! printf "$a " | false; echo $?; done
+for a in ! a b c; do ! printf "$a " | true; echo $?; done
+for a in ! a b c; do ! { printf "$a " | false; }; echo $?; done
+for a in ! a b c; do ! { printf "$a " | true; }; echo $?; done
+echo Done
diff --git a/shell/ash_test/ash-parsing/noeol.right b/shell/ash_test/ash-parsing/noeol.right
new file mode 100644
index 000000000..e427984d4
--- /dev/null
+++ b/shell/ash_test/ash-parsing/noeol.right
@@ -0,0 +1 @@
+HELLO
diff --git a/shell/ash_test/ash-parsing/noeol.tests b/shell/ash_test/ash-parsing/noeol.tests
new file mode 100755
index 000000000..a93113a03
--- /dev/null
+++ b/shell/ash_test/ash-parsing/noeol.tests
@@ -0,0 +1,2 @@
+# next line has no EOL!
+echo HELLO
\ No newline at end of file
diff --git a/shell/ash_test/ash-parsing/noeol2.right b/shell/ash_test/ash-parsing/noeol2.right
new file mode 100644
index 000000000..d00491fd7
--- /dev/null
+++ b/shell/ash_test/ash-parsing/noeol2.right
@@ -0,0 +1 @@
+1
diff --git a/shell/ash_test/ash-parsing/noeol2.tests b/shell/ash_test/ash-parsing/noeol2.tests
new file mode 100755
index 000000000..1220f056f
--- /dev/null
+++ b/shell/ash_test/ash-parsing/noeol2.tests
@@ -0,0 +1,7 @@
+# last line has no EOL!
+if true
+then
+  echo 1
+else
+  echo 2
+fi
\ No newline at end of file
diff --git a/shell/ash_test/ash-parsing/noeol3.right b/shell/ash_test/ash-parsing/noeol3.right
new file mode 100644
index 000000000..c2a0e38f8
--- /dev/null
+++ b/shell/ash_test/ash-parsing/noeol3.right
@@ -0,0 +1 @@
+./noeol3.tests: line 2: syntax error: unterminated quoted string
diff --git a/shell/ash_test/ash-parsing/noeol3.tests b/shell/ash_test/ash-parsing/noeol3.tests
new file mode 100755
index 000000000..ec958ed7a
--- /dev/null
+++ b/shell/ash_test/ash-parsing/noeol3.tests
@@ -0,0 +1,2 @@
+# last line has no EOL!
+echo "unterminated
\ No newline at end of file
diff --git a/shell/ash_test/ash-parsing/process_subst.right b/shell/ash_test/ash-parsing/process_subst.right
new file mode 100644
index 000000000..397bc8067
--- /dev/null
+++ b/shell/ash_test/ash-parsing/process_subst.right
@@ -0,0 +1,3 @@
+TESTzzBEST
+TEST$(echo zz)BEST
+TEST'BEST
diff --git a/shell/ash_test/ash-parsing/process_subst.tests b/shell/ash_test/ash-parsing/process_subst.tests
new file mode 100755
index 000000000..21996bc0e
--- /dev/null
+++ b/shell/ash_test/ash-parsing/process_subst.tests
@@ -0,0 +1,3 @@
+echo "TEST`echo zz;echo;echo`BEST"
+echo "TEST`echo '$(echo zz)'`BEST"
+echo "TEST`echo "'"`BEST"
diff --git a/shell/ash_test/ash-parsing/quote1.right b/shell/ash_test/ash-parsing/quote1.right
new file mode 100644
index 000000000..cb382054c
--- /dev/null
+++ b/shell/ash_test/ash-parsing/quote1.right
@@ -0,0 +1 @@
+'1'
diff --git a/shell/ash_test/ash-parsing/quote1.tests b/shell/ash_test/ash-parsing/quote1.tests
new file mode 100755
index 000000000..f55895466
--- /dev/null
+++ b/shell/ash_test/ash-parsing/quote1.tests
@@ -0,0 +1,2 @@
+a=1
+echo "'$a'"
diff --git a/shell/ash_test/ash-parsing/quote2.right b/shell/ash_test/ash-parsing/quote2.right
new file mode 100644
index 000000000..3bc9edcd6
--- /dev/null
+++ b/shell/ash_test/ash-parsing/quote2.right
@@ -0,0 +1 @@
+>1
diff --git a/shell/ash_test/ash-parsing/quote2.tests b/shell/ash_test/ash-parsing/quote2.tests
new file mode 100755
index 000000000..bd966f30b
--- /dev/null
+++ b/shell/ash_test/ash-parsing/quote2.tests
@@ -0,0 +1,2 @@
+a=1
+echo ">$a"
diff --git a/shell/ash_test/ash-parsing/quote3.right b/shell/ash_test/ash-parsing/quote3.right
new file mode 100644
index 000000000..bbe46df67
--- /dev/null
+++ b/shell/ash_test/ash-parsing/quote3.right
@@ -0,0 +1,12 @@
+Testing: in ""
+..
+Testing: in ''
+..
+Testing: in $empty
+Testing: in $empty""
+..
+Testing: in $empty''
+..
+Testing: in "$empty"
+..
+Finished
diff --git a/shell/ash_test/ash-parsing/quote3.tests b/shell/ash_test/ash-parsing/quote3.tests
new file mode 100755
index 000000000..b5fd5978c
--- /dev/null
+++ b/shell/ash_test/ash-parsing/quote3.tests
@@ -0,0 +1,21 @@
+empty=''
+
+echo 'Testing: in ""'
+for a in ""; do echo ".$a."; done
+
+echo 'Testing: in '"''"
+for a in ''; do echo ".$a."; done
+
+echo 'Testing: in $empty'
+for a in $empty; do echo ".$a."; done
+
+echo 'Testing: in $empty""'
+for a in $empty""; do echo ".$a."; done
+
+echo 'Testing: in $empty'"''"
+for a in $empty''; do echo ".$a."; done
+
+echo 'Testing: in "$empty"'
+for a in "$empty"; do echo ".$a."; done
+
+echo Finished
diff --git a/shell/ash_test/ash-parsing/quote4.right b/shell/ash_test/ash-parsing/quote4.right
new file mode 100644
index 000000000..b2901ea97
--- /dev/null
+++ b/shell/ash_test/ash-parsing/quote4.right
@@ -0,0 +1 @@
+a b
diff --git a/shell/ash_test/ash-parsing/quote4.tests b/shell/ash_test/ash-parsing/quote4.tests
new file mode 100755
index 000000000..f1dabfa54
--- /dev/null
+++ b/shell/ash_test/ash-parsing/quote4.tests
@@ -0,0 +1,2 @@
+a_b='a b'
+echo "$a_b"
diff --git a/shell/ash_test/ash-parsing/starquoted.right b/shell/ash_test/ash-parsing/starquoted.right
new file mode 100644
index 000000000..b56323fe1
--- /dev/null
+++ b/shell/ash_test/ash-parsing/starquoted.right
@@ -0,0 +1,8 @@
+.1 abc d e f.
+.1.
+.abc.
+.d e f.
+.-1 abc d e f-.
+.-1.
+.abc.
+.d e f-.
diff --git a/shell/ash_test/ash-parsing/starquoted.tests b/shell/ash_test/ash-parsing/starquoted.tests
new file mode 100755
index 000000000..2fe49b1cd
--- /dev/null
+++ b/shell/ash_test/ash-parsing/starquoted.tests
@@ -0,0 +1,8 @@
+if test $# = 0; then
+    exec "$THIS_SH" "$0" 1 abc 'd e f'
+fi
+
+for a in "$*"; do echo ".$a."; done
+for a in "$@"; do echo ".$a."; done
+for a in "-$*-"; do echo ".$a."; done
+for a in "-$@-"; do echo ".$a."; done
diff --git a/shell/ash_test/ash-parsing/starquoted2.right b/shell/ash_test/ash-parsing/starquoted2.right
new file mode 100644
index 000000000..1bff408ca
--- /dev/null
+++ b/shell/ash_test/ash-parsing/starquoted2.right
@@ -0,0 +1,8 @@
+Should be printed
+Would not be printed by bash
+Would not be printed by bash
+Would not be printed by bash
+Should be printed
+Empty:
+Empty:
+Empty:
diff --git a/shell/ash_test/ash-parsing/starquoted2.tests b/shell/ash_test/ash-parsing/starquoted2.tests
new file mode 100755
index 000000000..7c5ff45b8
--- /dev/null
+++ b/shell/ash_test/ash-parsing/starquoted2.tests
@@ -0,0 +1,19 @@
+if test $# != 0; then
+    exec "$THIS_SH" "$0"
+fi
+
+# No params!
+for a in "$*"; do echo Should be printed; done
+for a in "$@"; do echo Should not be printed; done
+# Yes, believe it or not, bash is mesmerized by "$@" and stops
+# treating "" as "this word cannot be expanded to nothing,
+# but must be at least null string". Now it can be expanded to nothing.
+for a in "$@"""; do echo Would not be printed by bash; done
+for a in """$@"; do echo Would not be printed by bash; done
+for a in """$@"''"$@"''; do echo Would not be printed by bash; done
+for a in ""; do echo Should be printed; done
+
+# Bug 207: "$@" expands to nothing, and we erroneously glob "%s\n" twice:
+printf 'Empty:%s\n' "$@"
+printf "Empty:%s\n" "$@"
+printf "Empty:%s\\n" "$@"
diff --git a/shell/ash_test/ash-quoting/mode_x.right b/shell/ash_test/ash-quoting/mode_x.right
new file mode 100644
index 000000000..c2dd3550c
--- /dev/null
+++ b/shell/ash_test/ash-quoting/mode_x.right
@@ -0,0 +1,10 @@
++ var1=val
++ var2='one two'
++ true '%s\n' one 'two '"'"'three' four
++ this=command
++ 'this=command'
+./mode_x.tests: line 1: this=command: not found
++ true
++ true
++ 'if' true
+./mode_x.tests: line 1: if: not found
diff --git a/shell/ash_test/ash-quoting/mode_x.tests b/shell/ash_test/ash-quoting/mode_x.tests
new file mode 100755
index 000000000..16dae3f4b
--- /dev/null
+++ b/shell/ash_test/ash-quoting/mode_x.tests
@@ -0,0 +1,14 @@
+set -x
+
+var1=val
+var2='one two'
+true %s\\n one "two 'three" four
+
+# assignment:
+this=command
+# NOT assignment, +x code should show it quoted:
+"this=command"
+
+if true; then true; fi
+# +x code should quote 'if' here:
+"if" true
diff --git a/shell/ash_test/ash-read/read_t0.right b/shell/ash_test/ash-read/read_t0.right
new file mode 100644
index 000000000..f02105961
--- /dev/null
+++ b/shell/ash_test/ash-read/read_t0.right
@@ -0,0 +1,3 @@
+><[0]
+><[0]
+><[1]
diff --git a/shell/ash_test/ash-read/read_t0.tests b/shell/ash_test/ash-read/read_t0.tests
new file mode 100755
index 000000000..6b7bc217b
--- /dev/null
+++ b/shell/ash_test/ash-read/read_t0.tests
@@ -0,0 +1,14 @@
+# ><[0]
+echo Ok | { sleep 0.1; read -t 0 reply; echo ">$reply<[$?]"; }
+
+# This would not be deterministic: returns 0 "data exists" if EOF is seen
+# (true terminated) - because EOF is considered to be data (read will not block),
+# else returns 1 "no data".
+## ><[????]
+#true | { read -t 0 reply; echo ">$reply<[$?]"; }
+
+# ><[0]
+true | { sleep 0.1; read -t 0 reply; echo ">$reply<[$?]"; }
+
+# ><[1]
+sleep 0.2 | { read -p IGNORED_PROMPT -t 0 reply; echo ">$reply<[$?]"; }
diff --git a/shell/ash_test/ash-vars/readonly0.right b/shell/ash_test/ash-vars/readonly0.right
new file mode 100644
index 000000000..f3a6bde9e
--- /dev/null
+++ b/shell/ash_test/ash-vars/readonly0.right
@@ -0,0 +1,13 @@
+readonly a='A'
+readonly b='B'
+Ok:0
+
+./readonly0.tests: line 19: a: is read only
+Fail:2
+./readonly0.tests: readonly: line 21: a: is read only
+Fail:2
+
+./readonly0.tests: export: line 27: a: is read only
+Fail:2
+
+Fail:1
diff --git a/shell/ash_test/ash-vars/readonly0.tests b/shell/ash_test/ash-vars/readonly0.tests
new file mode 100755
index 000000000..94af79060
--- /dev/null
+++ b/shell/ash_test/ash-vars/readonly0.tests
@@ -0,0 +1,45 @@
+unset a b
+#
+readonly a=A
+b=B
+readonly b
+# readonly on already readonly var is harmless:
+readonly b a
+readonly | grep '^readonly [ab]='
+# this should work:
+export a b
+export -n a b
+echo Ok:$?
+env | grep -e^a= -e^b=  # shows nothing
+
+echo
+# these should all fail (despite the same value being assigned)
+# bash does not abort even in non-interactive more (in script)
+# ash does, using subshell to continue
+true; (a=A)
+echo Fail:$?
+true; (readonly a=A)
+echo Fail:$?
+
+echo
+# in bash, assignment in export fails, but export succeeds! :)
+# we don't mimic that!
+true; (export a=Z)
+echo Fail:$?
+#env | grep '^a='
+#echo "^^^a is exported"
+export -n a  # undo that bashism, if it happens
+
+## ash: assignment errors in "a=Z CMD" lead to CMD not executed
+## echo
+## export b
+## # this fails to both set and export a:
+## a=Z env | echo grep '^[ab]='
+## echo "^^^a is not exported"
+## # but external command does get executed, and $? is not mangled (stays 42):
+## (exit 42); a=Z env echo Visible:$?
+
+echo
+# ash: this fails *silently*, bug? bash says "cannot unset: readonly variable"
+true; unset a
+echo Fail:$?
diff --git a/shell/ash_test/ash-vars/readonly1.right b/shell/ash_test/ash-vars/readonly1.right
index 2b363e325..1f5be64c7 100644
--- a/shell/ash_test/ash-vars/readonly1.right
+++ b/shell/ash_test/ash-vars/readonly1.right
@@ -1,2 +1,2 @@
-One:1
-One:1
+Fail:2
+Fail:2
diff --git a/shell/ash_test/ash-vars/readonly1.tests b/shell/ash_test/ash-vars/readonly1.tests
index 81b461f5f..f3cccd940 100755
--- a/shell/ash_test/ash-vars/readonly1.tests
+++ b/shell/ash_test/ash-vars/readonly1.tests
@@ -1,7 +1,7 @@
 readonly bla=123
 # Bare "eval bla=123" should abort ("eval" is a special builtin):
 (eval bla=123 2>/dev/null; echo BUG)
-echo One:$?
+echo Fail:$?
 # "command BLTIN" disables "special-ness", should not abort:
 command eval bla=123 2>/dev/null
-echo One:$?
+echo Fail:$?
diff --git a/shell/ash_test/run-all b/shell/ash_test/run-all
index 983e6d184..caf033577 100755
--- a/shell/ash_test/run-all
+++ b/shell/ash_test/run-all
@@ -2,10 +2,24 @@
 
 TOPDIR=`pwd`
 
-test -x ash || {
-    echo "No ./ash - creating a link to ../../busybox"
-    ln -s ../../busybox ash
-}
+if test ! -x ash; then
+        if test ! -x ../../busybox; then
+                echo "Can't run tests. Put ash binary into this directory (`pwd`)"
+                exit 1
+        fi
+        echo "No ./ash - creating a link to ../../busybox"
+        ln -s ../../busybox ash
+fi
+if test ! -f .config; then
+        if test ! -f ../../.config; then
+                echo "Missing .config file"
+                exit 1
+        fi
+        cp ../../.config . || exit 1
+fi
+
+eval $(sed -e '/^#/d' -e '/^$/d' -e 's:^:export :' .config)
+
 test -x printenv || gcc -O2 -o printenv printenv.c || exit $?
 test -x recho    || gcc -O2 -o recho    recho.c    || exit $?
 test -x zecho    || gcc -O2 -o zecho    zecho.c    || exit $?
diff --git a/shell/cttyhack.c b/shell/cttyhack.c
index f9b59c263..9004b4763 100644
--- a/shell/cttyhack.c
+++ b/shell/cttyhack.c
@@ -11,48 +11,48 @@
 //kbuild:lib-$(CONFIG_CTTYHACK) += cttyhack.o
 
 //config:config CTTYHACK
-//config:       bool "cttyhack"
+//config:       bool "cttyhack (2.5 kb)"
 //config:       default y
 //config:       help
-//config:         One common problem reported on the mailing list is the "can't
-//config:         access tty; job control turned off" error message, which typically
-//config:         appears when one tries to use a shell with stdin/stdout on
-//config:         /dev/console.
-//config:         This device is special - it cannot be a controlling tty.
+//config:       One common problem reported on the mailing list is the "can't
+//config:       access tty; job control turned off" error message, which typically
+//config:       appears when one tries to use a shell with stdin/stdout on
+//config:       /dev/console.
+//config:       This device is special - it cannot be a controlling tty.
 //config:
-//config:         The proper solution is to use the correct device instead of
-//config:         /dev/console.
+//config:       The proper solution is to use the correct device instead of
+//config:       /dev/console.
 //config:
-//config:         cttyhack provides a "quick and dirty" solution to this problem.
-//config:         It analyzes stdin with various ioctls, trying to determine whether
-//config:         it is a /dev/ttyN or /dev/ttySN (virtual terminal or serial line).
-//config:         On Linux it also checks sysfs for a pointer to the active console.
-//config:         If cttyhack is able to find the real console device, it closes
-//config:         stdin/out/err and reopens that device.
-//config:         Then it executes the given program. Opening the device will make
-//config:         that device a controlling tty. This may require cttyhack
-//config:         to be a session leader.
+//config:       cttyhack provides a "quick and dirty" solution to this problem.
+//config:       It analyzes stdin with various ioctls, trying to determine whether
+//config:       it is a /dev/ttyN or /dev/ttySN (virtual terminal or serial line).
+//config:       On Linux it also checks sysfs for a pointer to the active console.
+//config:       If cttyhack is able to find the real console device, it closes
+//config:       stdin/out/err and reopens that device.
+//config:       Then it executes the given program. Opening the device will make
+//config:       that device a controlling tty. This may require cttyhack
+//config:       to be a session leader.
 //config:
-//config:         Example for /etc/inittab (for busybox init):
+//config:       Example for /etc/inittab (for busybox init):
 //config:
-//config:         ::respawn:/bin/cttyhack /bin/sh
+//config:       ::respawn:/bin/cttyhack /bin/sh
 //config:
-//config:         Starting an interactive shell from boot shell script:
+//config:       Starting an interactive shell from boot shell script:
 //config:
-//config:         setsid cttyhack sh
+//config:       setsid cttyhack sh
 //config:
-//config:         Giving controlling tty to shell running with PID 1:
+//config:       Giving controlling tty to shell running with PID 1:
 //config:
-//config:         # exec cttyhack sh
+//config:       # exec cttyhack sh
 //config:
-//config:         Without cttyhack, you need to know exact tty name,
-//config:         and do something like this:
+//config:       Without cttyhack, you need to know exact tty name,
+//config:       and do something like this:
 //config:
-//config:         # exec setsid sh -c 'exec sh </dev/tty1 >/dev/tty1 2>&1'
+//config:       # exec setsid sh -c 'exec sh </dev/tty1 >/dev/tty1 2>&1'
 //config:
-//config:         Starting getty on a controlling tty from a shell script:
+//config:       Starting getty on a controlling tty from a shell script:
 //config:
-//config:         # getty 115200 $(cttyhack)
+//config:       # getty 115200 $(cttyhack)
 
 //usage:#define cttyhack_trivial_usage
 //usage:       "[PROG ARGS]"
diff --git a/shell/hush.c b/shell/hush.c
index f6da826d3..309ed2139 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -101,18 +101,18 @@
  *              aaa
  */
 //config:config HUSH
-//config:       bool "hush"
+//config:       bool "hush (64 kb)"
 //config:       default y
 //config:       help
-//config:         hush is a small shell (25k). It handles the normal flow control
-//config:         constructs such as if/then/elif/else/fi, for/in/do/done, while loops,
-//config:         case/esac. Redirections, here documents, $((arithmetic))
-//config:         and functions are supported.
+//config:       hush is a small shell. It handles the normal flow control
+//config:       constructs such as if/then/elif/else/fi, for/in/do/done, while loops,
+//config:       case/esac. Redirections, here documents, $((arithmetic))
+//config:       and functions are supported.
 //config:
-//config:         It will compile and work on no-mmu systems.
+//config:       It will compile and work on no-mmu systems.
 //config:
-//config:         It does not handle select, aliases, tilde expansion,
-//config:         &>file and >&file redirection of stdout+stderr.
+//config:       It does not handle select, aliases, tilde expansion,
+//config:       &>file and >&file redirection of stdout+stderr.
 //config:
 //config:config HUSH_BASH_COMPAT
 //config:       bool "bash-compatible extensions"
@@ -124,17 +124,17 @@
 //config:       default y
 //config:       depends on HUSH_BASH_COMPAT
 //config:       help
-//config:         Enable {abc,def} extension.
+//config:       Enable {abc,def} extension.
 //config:
 //config:config HUSH_INTERACTIVE
 //config:       bool "Interactive mode"
 //config:       default y
 //config:       depends on HUSH || SH_IS_HUSH || BASH_IS_HUSH
 //config:       help
-//config:         Enable interactive mode (prompt and command editing).
-//config:         Without this, hush simply reads and executes commands
-//config:         from stdin just like a shell script from a file.
-//config:         No prompt, no PS1/PS2 magic shell variables.
+//config:       Enable interactive mode (prompt and command editing).
+//config:       Without this, hush simply reads and executes commands
+//config:       from stdin just like a shell script from a file.
+//config:       No prompt, no PS1/PS2 magic shell variables.
 //config:
 //config:config HUSH_SAVEHISTORY
 //config:       bool "Save command history to .hush_history"
@@ -146,18 +146,18 @@
 //config:       default y
 //config:       depends on HUSH_INTERACTIVE
 //config:       help
-//config:         Enable job control: Ctrl-Z backgrounds, Ctrl-C interrupts current
-//config:         command (not entire shell), fg/bg builtins work. Without this option,
-//config:         "cmd &" still works by simply spawning a process and immediately
-//config:         prompting for next command (or executing next command in a script),
-//config:         but no separate process group is formed.
+//config:       Enable job control: Ctrl-Z backgrounds, Ctrl-C interrupts current
+//config:       command (not entire shell), fg/bg builtins work. Without this option,
+//config:       "cmd &" still works by simply spawning a process and immediately
+//config:       prompting for next command (or executing next command in a script),
+//config:       but no separate process group is formed.
 //config:
 //config:config HUSH_TICK
 //config:       bool "Support process substitution"
 //config:       default y
 //config:       depends on HUSH || SH_IS_HUSH || BASH_IS_HUSH
 //config:       help
-//config:         Enable `command` and $(command).
+//config:       Enable `command` and $(command).
 //config:
 //config:config HUSH_IF
 //config:       bool "Support if/then/elif/else/fi"
@@ -174,37 +174,37 @@
 //config:       default y
 //config:       depends on HUSH || SH_IS_HUSH || BASH_IS_HUSH
 //config:       help
-//config:         Enable case ... esac statement. +400 bytes.
+//config:       Enable case ... esac statement. +400 bytes.
 //config:
 //config:config HUSH_FUNCTIONS
 //config:       bool "Support funcname() { commands; } syntax"
 //config:       default y
 //config:       depends on HUSH || SH_IS_HUSH || BASH_IS_HUSH
 //config:       help
-//config:         Enable support for shell functions. +800 bytes.
+//config:       Enable support for shell functions. +800 bytes.
 //config:
 //config:config HUSH_LOCAL
 //config:       bool "local builtin"
 //config:       default y
 //config:       depends on HUSH_FUNCTIONS
 //config:       help
-//config:         Enable support for local variables in functions.
+//config:       Enable support for local variables in functions.
 //config:
 //config:config HUSH_RANDOM_SUPPORT
 //config:       bool "Pseudorandom generator and $RANDOM variable"
 //config:       default y
 //config:       depends on HUSH || SH_IS_HUSH || BASH_IS_HUSH
 //config:       help
-//config:         Enable pseudorandom generator and dynamic variable "$RANDOM".
-//config:         Each read of "$RANDOM" will generate a new pseudorandom value.
+//config:       Enable pseudorandom generator and dynamic variable "$RANDOM".
+//config:       Each read of "$RANDOM" will generate a new pseudorandom value.
 //config:
 //config:config HUSH_MODE_X
 //config:       bool "Support 'hush -x' option and 'set -x' command"
 //config:       default y
 //config:       depends on HUSH || SH_IS_HUSH || BASH_IS_HUSH
 //config:       help
-//config:         This instructs hush to print commands before execution.
-//config:         Adds ~300 bytes.
+//config:       This instructs hush to print commands before execution.
+//config:       Adds ~300 bytes.
 //config:
 //config:config HUSH_ECHO
 //config:       bool "echo builtin"
@@ -236,14 +236,14 @@
 //config:       default y
 //config:       depends on HUSH_EXPORT
 //config:       help
-//config:         export -n unexports variables. It is a bash extension.
+//config:       export -n unexports variables. It is a bash extension.
 //config:
 //config:config HUSH_READONLY
 //config:       bool "readonly builtin"
 //config:       default y
 //config:       depends on HUSH || SH_IS_HUSH || BASH_IS_HUSH
 //config:       help
-//config:         Enable support for read-only variables.
+//config:       Enable support for read-only variables.
 //config:
 //config:config HUSH_KILL
 //config:       bool "kill builtin (supports kill %jobspec)"
@@ -1068,7 +1068,7 @@ static const struct built_in_command bltins1[] = {
         BLTIN("export"   , builtin_export  , "Set environment variables"),
 #endif
 #if ENABLE_HUSH_JOB
-        BLTIN("fg"       , builtin_fg_bg   , "Bring job into foreground"),
+        BLTIN("fg"       , builtin_fg_bg   , "Bring job to foreground"),
 #endif
 #if ENABLE_HUSH_HELP
         BLTIN("help"     , builtin_help    , NULL),
@@ -1121,7 +1121,7 @@ static const struct built_in_command bltins1[] = {
         BLTIN("unset"    , builtin_unset   , "Unset variables"),
 #endif
 #if ENABLE_HUSH_WAIT
-        BLTIN("wait"     , builtin_wait    , "Wait for process"),
+        BLTIN("wait"     , builtin_wait    , "Wait for process to finish"),
 #endif
 };
 /* These builtins won't be used if we are on NOMMU and need to re-exec
@@ -2662,9 +2662,8 @@ static void o_delchr(o_string *o)
 static void o_addblock(o_string *o, const char *str, int len)
 {
         o_grow_by(o, len);
-        memcpy(&o->data[o->length], str, len);
+        ((char*)mempcpy(&o->data[o->length], str, len))[0] = '\0';
         o->length += len;
-        o->data[o->length] = '\0';
 }
 
 static void o_addstr(o_string *o, const char *str)
@@ -5519,17 +5518,15 @@ static char *replace_pattern(char *val, const char *pattern, const char *repl, c
                         break;
 
                 result = xrealloc(result, res_len + (s - val) + repl_len + 1);
-                memcpy(result + res_len, val, s - val);
-                res_len += s - val;
-                strcpy(result + res_len, repl);
-                res_len += repl_len;
+                strcpy(mempcpy(result + res_len, val, s - val), repl);
+                res_len += (s - val) + repl_len;
                 debug_printf_varexp("val:'%s' s:'%s' result:'%s'\n", val, s, result);
 
                 val = s + size;
                 if (exp_op == '/')
                         break;
         }
-        if (val[0] && result) {
+        if (*val && result) {
                 result = xrealloc(result, res_len + strlen(val) + 1);
                 strcpy(result + res_len, val);
                 debug_printf_varexp("val:'%s' result:'%s'\n", val, result);
diff --git a/shell/hush_test/hush-read/read_t0.right b/shell/hush_test/hush-read/read_t0.right
new file mode 100644
index 000000000..f02105961
--- /dev/null
+++ b/shell/hush_test/hush-read/read_t0.right
@@ -0,0 +1,3 @@
+><[0]
+><[0]
+><[1]
diff --git a/shell/hush_test/hush-read/read_t0.tests b/shell/hush_test/hush-read/read_t0.tests
new file mode 100755
index 000000000..6b7bc217b
--- /dev/null
+++ b/shell/hush_test/hush-read/read_t0.tests
@@ -0,0 +1,14 @@
+# ><[0]
+echo Ok | { sleep 0.1; read -t 0 reply; echo ">$reply<[$?]"; }
+
+# This would not be deterministic: returns 0 "data exists" if EOF is seen
+# (true terminated) - because EOF is considered to be data (read will not block),
+# else returns 1 "no data".
+## ><[????]
+#true | { read -t 0 reply; echo ">$reply<[$?]"; }
+
+# ><[0]
+true | { sleep 0.1; read -t 0 reply; echo ">$reply<[$?]"; }
+
+# ><[1]
+sleep 0.2 | { read -p IGNORED_PROMPT -t 0 reply; echo ">$reply<[$?]"; }
diff --git a/shell/shell_common.c b/shell/shell_common.c
index 154b860f8..750adc5d8 100644
--- a/shell/shell_common.c
+++ b/shell/shell_common.c
@@ -61,9 +61,10 @@ shell_builtin_read(void FAST_FUNC (*setvar)(const char *name, const char *val),
         const char *opt_u
 )
 {
+        struct pollfd pfd[1];
+#define fd (pfd[0].fd) /* -u FD */
         unsigned err;
         unsigned end_ms; /* -t TIMEOUT */
-        int fd; /* -u FD */
         int nchars; /* -n NUM */
         char **pp;
         char *buffer;
@@ -92,38 +93,43 @@ shell_builtin_read(void FAST_FUNC (*setvar)(const char *name, const char *val),
                         return "invalid count";
                 /* note: "-n 0": off (bash 3.2 does this too) */
         }
+
         end_ms = 0;
-        if (opt_t) {
+        if (opt_t && !ENABLE_FEATURE_SH_READ_FRAC) {
                 end_ms = bb_strtou(opt_t, NULL, 10);
-                if (errno || end_ms > UINT_MAX / 2048)
+                if (errno)
                         return "invalid timeout";
+                if (end_ms > UINT_MAX / 2048) /* be safely away from overflow */
+                        end_ms = UINT_MAX / 2048;
                 end_ms *= 1000;
-#if 0 /* even bash has no -t N.NNN support */
-                ts.tv_sec = bb_strtou(opt_t, &p, 10);
-                ts.tv_usec = 0;
-                /* EINVAL means number is ok, but not terminated by NUL */
-                if (*p == '.' && errno == EINVAL) {
-                        char *p2;
-                        if (*++p) {
-                                int scale;
-                                ts.tv_usec = bb_strtou(p, &p2, 10);
-                                if (errno)
-                                        return "invalid timeout";
-                                scale = p2 - p;
-                                /* normalize to usec */
-                                if (scale > 6)
+        }
+        if (opt_t && ENABLE_FEATURE_SH_READ_FRAC) {
+                /* bash 4.3 (maybe earlier) supports -t N.NNNNNN */
+                char *p;
+                /* Eat up to three fractional digits */
+                int frac_digits = 3 + 1;
+
+                end_ms = bb_strtou(opt_t, &p, 10);
+                if (end_ms > UINT_MAX / 2048) /* be safely away from overflow */
+                        end_ms = UINT_MAX / 2048;
+
+                if (errno) {
+                        /* EINVAL = number is ok, but not NUL terminated */
+                        if (errno != EINVAL || *p != '.')
+                                return "invalid timeout";
+                        /* Do not check the rest: bash allows "0.123456xyz" */
+                        while (*++p && --frac_digits) {
+                                end_ms *= 10;
+                                end_ms += (*p - '0');
+                                if ((unsigned char)(*p - '0') > 9)
                                         return "invalid timeout";
-                                while (scale++ < 6)
-                                        ts.tv_usec *= 10;
                         }
-                } else if (ts.tv_sec < 0 || errno) {
-                        return "invalid timeout";
                 }
-                if (!(ts.tv_sec | ts.tv_usec)) { /* both are 0? */
-                        return "invalid timeout";
+                while (--frac_digits > 0) {
+                        end_ms *= 10;
                 }
-#endif /* if 0 */
         }
+
         fd = STDIN_FILENO;
         if (opt_u) {
                 fd = bb_strtou(opt_u, NULL, 10);
@@ -131,6 +137,19 @@ shell_builtin_read(void FAST_FUNC (*setvar)(const char *name, const char *val),
                         return "invalid file descriptor";
         }
 
+        if (opt_t && end_ms == 0) {
+                /* "If timeout is 0, read returns immediately, without trying
+                 * to read any data. The exit status is 0 if input is available
+                 * on the specified file descriptor, non-zero otherwise."
+                 * bash seems to ignore -p PROMPT for this use case.
+                 */
+                int r;
+                pfd[0].events = POLLIN;
+                r = poll(pfd, 1, /*timeout:*/ 0);
+                /* Return 0 only if poll returns 1 ("one fd ready"), else return 1: */
+                return (const char *)(uintptr_t)(r <= 0);
+        }
+
         if (opt_p && isatty(fd)) {
                 fputs(opt_p, stderr);
                 fflush_all();
@@ -165,21 +184,24 @@ shell_builtin_read(void FAST_FUNC (*setvar)(const char *name, const char *val),
         retval = (const char *)(uintptr_t)0;
         startword = 1;
         backslash = 0;
-        if (end_ms) /* NB: end_ms stays nonzero: */
-                end_ms = ((unsigned)monotonic_ms() + end_ms) | 1;
+        if (opt_t)
+                end_ms += (unsigned)monotonic_ms();
         buffer = NULL;
         bufpos = 0;
         do {
                 char c;
-                struct pollfd pfd[1];
                 int timeout;
 
                 if ((bufpos & 0xff) == 0)
                         buffer = xrealloc(buffer, bufpos + 0x101);
 
                 timeout = -1;
-                if (end_ms) {
+                if (opt_t) {
                         timeout = end_ms - (unsigned)monotonic_ms();
+                        /* ^^^^^^^^^^^^^ all values are unsigned,
+                         * wrapping math is used here, good even if
+                         * 32-bit unix time wrapped (year 2038+).
+                         */
                         if (timeout <= 0) { /* already late? */
                                 retval = (const char *)(uintptr_t)1;
                                 goto ret;
@@ -192,9 +214,8 @@ shell_builtin_read(void FAST_FUNC (*setvar)(const char *name, const char *val),
                  */
                 errno = 0;
 #if !ENABLE_PLATFORM_MINGW32
-                pfd[0].fd = fd;
                 pfd[0].events = POLLIN;
-                if (poll(pfd, 1, timeout) != 1) {
+                if (poll(pfd, 1, timeout) <= 0) {
                         /* timed out, or EINTR */
                         err = errno;
                         retval = (const char *)(uintptr_t)1;
@@ -278,6 +299,7 @@ shell_builtin_read(void FAST_FUNC (*setvar)(const char *name, const char *val),
 
         errno = err;
         return retval;
+#undef fd
 }
 
 /* ulimit builtin */
diff --git a/size_single_applets.sh b/size_single_applets.sh
new file mode 100755
index 000000000..0fa56e09e
--- /dev/null
+++ b/size_single_applets.sh
@@ -0,0 +1,76 @@
+#!/bin/bash
+# The list of all applet config symbols
+test -f include/applets.h || { echo "No include/applets.h file"; exit 1; }
+apps="`
+grep ^IF_ include/applets.h \
+| grep -v ^IF_FEATURE_ \
+| sed 's/IF_\([A-Z0-9._-]*\)(.*/\1/' \
+| sort | uniq
+`"
+
+test $# = 0 && set -- $apps
+
+mintext=999999999
+for app; do
+        b="busybox_${app}"
+        test -f "$b" || continue
+        text=`size "$b" | tail -1 | sed -e's/\t/ /g' -e's/^ *//' -e's/ .*//'`
+        #echo "text from $app: $text"
+        test x"${text//[0123456789]/}" = x"" || {
+                echo "Can't get: size $b"
+                exit 1
+        }
+        test $mintext -gt $text && {
+                mintext=$text
+                echo "New mintext from $app: $mintext"
+        }
+        eval "text_${app}=$text"
+done
+
+for app; do
+        b="busybox_${app}"
+        test -f "$b" || continue
+        eval "text=\$text_${app}"
+        echo "$app adds $((text-mintext))"
+done
+
+grep ^IF_ include/applets.h \
+| grep -v ^IF_FEATURE_ \
+| sed 's/, .*//' \
+| sed 's/\t//g' \
+| sed 's/ //g' \
+| sed 's/(APPLET(/(/' \
+| sed 's/(APPLET_[A-Z]*(/(/' \
+| sed 's/(IF_[A-Z_]*(/(/' \
+| sed 's/IF_\([A-Z0-9._-]*\)(\(.*\)/\1 \2/' \
+| sort | uniq \
+| while read app name; do
+        b="busybox_${app}"
+        test -f "$b" || continue
+
+        file=`grep -lF "bool \"$name" $(find -name '*.c') | xargs`
+        # so far all such items are in .c files; if need to check Config.* files:
+        #test "$file" || file=`grep -lF "bool \"$name" $(find -name 'Config.*') |  xargs`
+        test "$file" || continue
+        #echo "FILE:'$file'"
+
+        eval "text=\$text_${app}"
+        sz=$((text-mintext))
+        sz_kb=$((sz/1000))
+        sz_frac=$(( (sz - sz_kb*1000) ))
+        sz_f=$((sz_frac / 100))
+
+        echo -n "sed 's/bool \"$name *(*[0-9tinykbytes .]*)*\"/"
+        if test "$sz_kb" -ge 10; then
+                echo -n "bool \"$name (${sz_kb} kb)\""
+        elif test "$sz_kb" -gt 0 -a "$sz_f" = 0; then
+                echo -n "bool \"$name (${sz_kb} kb)\""
+        elif test "$sz_kb" -gt 0; then
+                echo -n "bool \"$name ($sz_kb.${sz_f} kb)\""
+        elif test "$sz" -ge 200; then
+                echo -n "bool \"$name ($sz bytes)\""
+        else
+                echo -n "bool \"$name (tiny)\""
+        fi
+        echo "/' -i $file"
+done
diff --git a/sysklogd/klogd.c b/sysklogd/klogd.c
index 4db72110d..728cc8d38 100644
--- a/sysklogd/klogd.c
+++ b/sysklogd/klogd.c
@@ -17,14 +17,14 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config KLOGD
-//config:       bool "klogd"
+//config:       bool "klogd (5.5 kb)"
 //config:       default y
 //config:       help
-//config:         klogd is a utility which intercepts and logs all
-//config:         messages from the Linux kernel and sends the messages
-//config:         out to the 'syslogd' utility so they can be logged. If
-//config:         you wish to record the messages produced by the kernel,
-//config:         you should enable this option.
+//config:       klogd is a utility which intercepts and logs all
+//config:       messages from the Linux kernel and sends the messages
+//config:       out to the 'syslogd' utility so they can be logged. If
+//config:       you wish to record the messages produced by the kernel,
+//config:       you should enable this option.
 //config:
 //config:comment "klogd should not be used together with syslog to kernel printk buffer"
 //config:       depends on KLOGD && FEATURE_KMSG_SYSLOG
@@ -35,16 +35,16 @@
 //config:       depends on KLOGD
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         The klogd applet supports two interfaces for reading
-//config:         kernel messages. Linux provides the klogctl() interface
-//config:         which allows reading messages from the kernel ring buffer
-//config:         independently from the file system.
+//config:       The klogd applet supports two interfaces for reading
+//config:       kernel messages. Linux provides the klogctl() interface
+//config:       which allows reading messages from the kernel ring buffer
+//config:       independently from the file system.
 //config:
-//config:         If you answer 'N' here, klogd will use the more portable
-//config:         approach of reading them from /proc or a device node.
-//config:         However, this method requires the file to be available.
+//config:       If you answer 'N' here, klogd will use the more portable
+//config:       approach of reading them from /proc or a device node.
+//config:       However, this method requires the file to be available.
 //config:
-//config:         If in doubt, say 'Y'.
+//config:       If in doubt, say 'Y'.
 
 //applet:IF_KLOGD(APPLET(klogd, BB_DIR_SBIN, BB_SUID_DROP))
 
diff --git a/sysklogd/logger.c b/sysklogd/logger.c
index f9eafeb25..6769a8175 100644
--- a/sysklogd/logger.c
+++ b/sysklogd/logger.c
@@ -7,14 +7,14 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config LOGGER
-//config:       bool "logger"
+//config:       bool "logger (6.4 kb)"
 //config:       default y
 //config:       select FEATURE_SYSLOG
 //config:       help
-//config:           The logger utility allows you to send arbitrary text
-//config:           messages to the system log (i.e. the 'syslogd' utility) so
-//config:           they can be logged. This is generally used to help locate
-//config:           problems that occur within programs and scripts.
+//config:       The logger utility allows you to send arbitrary text
+//config:       messages to the system log (i.e. the 'syslogd' utility) so
+//config:       they can be logged. This is generally used to help locate
+//config:       problems that occur within programs and scripts.
 
 //applet:IF_LOGGER(APPLET(logger, BB_DIR_USR_BIN, BB_SUID_DROP))
 
diff --git a/sysklogd/logread.c b/sysklogd/logread.c
index 71459941e..da552e087 100644
--- a/sysklogd/logread.c
+++ b/sysklogd/logread.c
@@ -9,26 +9,26 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config LOGREAD
-//config:       bool "logread"
+//config:       bool "logread (6 kb)"
 //config:       default y
 //WRONG: it should be compilable without SYSLOG=y:
 //WRONG:        depends on FEATURE_IPC_SYSLOG
 //config:       help
-//config:         If you enabled Circular Buffer support, you almost
-//config:         certainly want to enable this feature as well. This
-//config:         utility will allow you to read the messages that are
-//config:         stored in the syslogd circular buffer.
+//config:       If you enabled Circular Buffer support, you almost
+//config:       certainly want to enable this feature as well. This
+//config:       utility will allow you to read the messages that are
+//config:       stored in the syslogd circular buffer.
 //config:
 //config:config FEATURE_LOGREAD_REDUCED_LOCKING
 //config:       bool "Double buffering"
 //config:       default y
 //config:       depends on LOGREAD
 //config:       help
-//config:         'logread' output to slow serial terminals can have
-//config:         side effects on syslog because of the semaphore.
-//config:         This option make logread to double buffer copy
-//config:         from circular buffer, minimizing semaphore
-//config:         contention at some minor memory expense.
+//config:       'logread' output to slow serial terminals can have
+//config:       side effects on syslog because of the semaphore.
+//config:       This option make logread to double buffer copy
+//config:       from circular buffer, minimizing semaphore
+//config:       contention at some minor memory expense.
 //config:
 
 //applet:IF_LOGREAD(APPLET(logread, BB_DIR_SBIN, BB_SUID_DROP))
diff --git a/sysklogd/syslogd.c b/sysklogd/syslogd.c
index d64ff278f..31730a7f9 100644
--- a/sysklogd/syslogd.c
+++ b/sysklogd/syslogd.c
@@ -13,56 +13,56 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config SYSLOGD
-//config:       bool "syslogd"
+//config:       bool "syslogd (12 kb)"
 //config:       default y
 //config:       help
-//config:         The syslogd utility is used to record logs of all the
-//config:         significant events that occur on a system. Every
-//config:         message that is logged records the date and time of the
-//config:         event, and will generally also record the name of the
-//config:         application that generated the message. When used in
-//config:         conjunction with klogd, messages from the Linux kernel
-//config:         can also be recorded. This is terribly useful,
-//config:         especially for finding what happened when something goes
-//config:         wrong. And something almost always will go wrong if
-//config:         you wait long enough....
+//config:       The syslogd utility is used to record logs of all the
+//config:       significant events that occur on a system. Every
+//config:       message that is logged records the date and time of the
+//config:       event, and will generally also record the name of the
+//config:       application that generated the message. When used in
+//config:       conjunction with klogd, messages from the Linux kernel
+//config:       can also be recorded. This is terribly useful,
+//config:       especially for finding what happened when something goes
+//config:       wrong. And something almost always will go wrong if
+//config:       you wait long enough....
 //config:
 //config:config FEATURE_ROTATE_LOGFILE
 //config:       bool "Rotate message files"
 //config:       default y
 //config:       depends on SYSLOGD
 //config:       help
-//config:         This enables syslogd to rotate the message files
-//config:         on his own. No need to use an external rotate script.
+//config:       This enables syslogd to rotate the message files
+//config:       on his own. No need to use an external rotate script.
 //config:
 //config:config FEATURE_REMOTE_LOG
 //config:       bool "Remote Log support"
 //config:       default y
 //config:       depends on SYSLOGD
 //config:       help
-//config:         When you enable this feature, the syslogd utility can
-//config:         be used to send system log messages to another system
-//config:         connected via a network. This allows the remote
-//config:         machine to log all the system messages, which can be
-//config:         terribly useful for reducing the number of serial
-//config:         cables you use. It can also be a very good security
-//config:         measure to prevent system logs from being tampered with
-//config:         by an intruder.
+//config:       When you enable this feature, the syslogd utility can
+//config:       be used to send system log messages to another system
+//config:       connected via a network. This allows the remote
+//config:       machine to log all the system messages, which can be
+//config:       terribly useful for reducing the number of serial
+//config:       cables you use. It can also be a very good security
+//config:       measure to prevent system logs from being tampered with
+//config:       by an intruder.
 //config:
 //config:config FEATURE_SYSLOGD_DUP
 //config:       bool "Support -D (drop dups) option"
 //config:       default y
 //config:       depends on SYSLOGD
 //config:       help
-//config:         Option -D instructs syslogd to drop consecutive messages
-//config:         which are totally the same.
+//config:       Option -D instructs syslogd to drop consecutive messages
+//config:       which are totally the same.
 //config:
 //config:config FEATURE_SYSLOGD_CFG
 //config:       bool "Support syslog.conf"
 //config:       default y
 //config:       depends on SYSLOGD
 //config:       help
-//config:         Supports restricted syslogd config. See docs/syslog.conf.txt
+//config:       Supports restricted syslogd config. See docs/syslog.conf.txt
 //config:
 //config:config FEATURE_SYSLOGD_READ_BUFFER_SIZE
 //config:       int "Read buffer size in bytes"
@@ -70,23 +70,23 @@
 //config:       range 256 20000
 //config:       depends on SYSLOGD
 //config:       help
-//config:         This option sets the size of the syslog read buffer.
-//config:         Actual memory usage increases around five times the
-//config:         change done here.
+//config:       This option sets the size of the syslog read buffer.
+//config:       Actual memory usage increases around five times the
+//config:       change done here.
 //config:
 //config:config FEATURE_IPC_SYSLOG
 //config:       bool "Circular Buffer support"
 //config:       default y
 //config:       depends on SYSLOGD
 //config:       help
-//config:         When you enable this feature, the syslogd utility will
-//config:         use a circular buffer to record system log messages.
-//config:         When the buffer is filled it will continue to overwrite
-//config:         the oldest messages. This can be very useful for
-//config:         systems with little or no permanent storage, since
-//config:         otherwise system logs can eventually fill up your
-//config:         entire filesystem, which may cause your system to
-//config:         break badly.
+//config:       When you enable this feature, the syslogd utility will
+//config:       use a circular buffer to record system log messages.
+//config:       When the buffer is filled it will continue to overwrite
+//config:       the oldest messages. This can be very useful for
+//config:       systems with little or no permanent storage, since
+//config:       otherwise system logs can eventually fill up your
+//config:       entire filesystem, which may cause your system to
+//config:       break badly.
 //config:
 //config:config FEATURE_IPC_SYSLOG_BUFFER_SIZE
 //config:       int "Circular buffer size in Kbytes (minimum 4KB)"
@@ -94,8 +94,8 @@
 //config:       range 4 2147483647
 //config:       depends on FEATURE_IPC_SYSLOG
 //config:       help
-//config:         This option sets the size of the circular buffer
-//config:         used to record system log messages.
+//config:       This option sets the size of the circular buffer
+//config:       used to record system log messages.
 //config:
 //config:config FEATURE_KMSG_SYSLOG
 //config:       bool "Linux kernel printk buffer support"
@@ -103,12 +103,12 @@
 //config:       depends on SYSLOGD
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         When you enable this feature, the syslogd utility will
-//config:         write system log message to the Linux kernel's printk buffer.
-//config:         This can be used as a smaller alternative to the syslogd IPC
-//config:         support, as klogd and logread aren't needed.
+//config:       When you enable this feature, the syslogd utility will
+//config:       write system log message to the Linux kernel's printk buffer.
+//config:       This can be used as a smaller alternative to the syslogd IPC
+//config:       support, as klogd and logread aren't needed.
 //config:
-//config:         NOTICE: Syslog facilities in log entries needs kernel 3.5+.
+//config:       NOTICE: Syslog facilities in log entries needs kernel 3.5+.
 
 //applet:IF_SYSLOGD(APPLET(syslogd, BB_DIR_SBIN, BB_SUID_DROP))
 
diff --git a/testsuite/od.tests b/testsuite/od.tests
index 7a9da3e97..0880e0d2f 100755
--- a/testsuite/od.tests
+++ b/testsuite/od.tests
@@ -16,6 +16,16 @@ testing "od -b" \
         "" "HELLO"
 SKIP=
 
+optional DESKTOP
+testing "od -f" \
+        "od -f" \
+"\
+0000000   0.0000000e+00   0.0000000e+00
+0000010
+" \
+        "" "\x00\x00\x00\x00\x00\x00\x00\x00"
+SKIP=
+
 optional DESKTOP LONG_OPTS
 testing "od -b --traditional" \
         "od -b --traditional" \
diff --git a/util-linux/Config.src b/util-linux/Config.src
index 0971d714a..68fcc266f 100644
--- a/util-linux/Config.src
+++ b/util-linux/Config.src
@@ -15,29 +15,29 @@ config FEATURE_MOUNT_LOOP
         default y
         depends on MOUNT || UMOUNT
         help
-          Enabling this feature allows automatic mounting of files (containing
-          filesystem images) via the linux kernel's loopback devices.
-          The mount command will detect you are trying to mount a file instead
-          of a block device, and transparently associate the file with a
-          loopback device. The umount command will also free that loopback
-          device.
+        Enabling this feature allows automatic mounting of files (containing
+        filesystem images) via the linux kernel's loopback devices.
+        The mount command will detect you are trying to mount a file instead
+        of a block device, and transparently associate the file with a
+        loopback device. The umount command will also free that loopback
+        device.
 
-          You can still use the 'losetup' utility (to manually associate files
-          with loop devices) if you need to do something advanced, such as
-          specify an offset or cryptographic options to the loopback device.
-          (If you don't want umount to free the loop device, use "umount -D".)
+        You can still use the 'losetup' utility (to manually associate files
+        with loop devices) if you need to do something advanced, such as
+        specify an offset or cryptographic options to the loopback device.
+        (If you don't want umount to free the loop device, use "umount -D".)
 
 config FEATURE_MOUNT_LOOP_CREATE
         bool "Create new loopback devices if needed"
         default y
         depends on FEATURE_MOUNT_LOOP
         help
-          Linux kernels >= 2.6.24 support unlimited loopback devices. They are
-          allocated for use when trying to use a loop device. The loop device
-          must however exist.
+        Linux kernels >= 2.6.24 support unlimited loopback devices. They are
+        allocated for use when trying to use a loop device. The loop device
+        must however exist.
 
-          This feature lets mount to try to create next /dev/loopN device
-          if it does not find a free one.
+        This feature lets mount to try to create next /dev/loopN device
+        if it does not find a free one.
 
 config FEATURE_MTAB_SUPPORT
         bool "Support old /etc/mtab file"
@@ -45,23 +45,23 @@ config FEATURE_MTAB_SUPPORT
         depends on MOUNT || UMOUNT
         select FEATURE_MOUNT_FAKE
         help
-          Historically, Unix systems kept track of the currently mounted
-          partitions in the file "/etc/mtab". These days, the kernel exports
-          the list of currently mounted partitions in "/proc/mounts", rendering
-          the old mtab file obsolete. (In modern systems, /etc/mtab should be
-          a symlink to /proc/mounts.)
+        Historically, Unix systems kept track of the currently mounted
+        partitions in the file "/etc/mtab". These days, the kernel exports
+        the list of currently mounted partitions in "/proc/mounts", rendering
+        the old mtab file obsolete. (In modern systems, /etc/mtab should be
+        a symlink to /proc/mounts.)
 
-          The only reason to have mount maintain an /etc/mtab file itself is if
-          your stripped-down embedded system does not have a /proc directory.
-          If you must use this, keep in mind it's inherently brittle (for
-          example a mount under chroot won't update it), can't handle modern
-          features like separate per-process filesystem namespaces, requires
-          that your /etc directory be writable, tends to get easily confused
-          by --bind or --move mounts, won't update if you rename a directory
-          that contains a mount point, and so on. (In brief: avoid.)
+        The only reason to have mount maintain an /etc/mtab file itself is if
+        your stripped-down embedded system does not have a /proc directory.
+        If you must use this, keep in mind it's inherently brittle (for
+        example a mount under chroot won't update it), can't handle modern
+        features like separate per-process filesystem namespaces, requires
+        that your /etc directory be writable, tends to get easily confused
+        by --bind or --move mounts, won't update if you rename a directory
+        that contains a mount point, and so on. (In brief: avoid.)
 
-          About the only reason to use this is if you've removed /proc from
-          your kernel.
+        About the only reason to use this is if you've removed /proc from
+        your kernel.
 
 source util-linux/volume_id/Config.in
 
diff --git a/util-linux/acpid.c b/util-linux/acpid.c
index 3e68b61ab..3c3811752 100644
--- a/util-linux/acpid.c
+++ b/util-linux/acpid.c
@@ -7,27 +7,27 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config ACPID
-//config:       bool "acpid"
+//config:       bool "acpid (8.7 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         acpid listens to ACPI events coming either in textual form from
-//config:         /proc/acpi/event (though it is marked deprecated it is still widely
-//config:         used and _is_ a standard) or in binary form from specified evdevs
-//config:         (just use /dev/input/event*).
+//config:       acpid listens to ACPI events coming either in textual form from
+//config:       /proc/acpi/event (though it is marked deprecated it is still widely
+//config:       used and _is_ a standard) or in binary form from specified evdevs
+//config:       (just use /dev/input/event*).
 //config:
-//config:         It parses the event to retrieve ACTION and a possible PARAMETER.
-//config:         It then spawns /etc/acpi/<ACTION>[/<PARAMETER>] either via run-parts
-//config:         (if the resulting path is a directory) or directly as an executable.
+//config:       It parses the event to retrieve ACTION and a possible PARAMETER.
+//config:       It then spawns /etc/acpi/<ACTION>[/<PARAMETER>] either via run-parts
+//config:       (if the resulting path is a directory) or directly as an executable.
 //config:
-//config:         N.B. acpid relies on run-parts so have the latter installed.
+//config:       N.B. acpid relies on run-parts so have the latter installed.
 //config:
 //config:config FEATURE_ACPID_COMPAT
 //config:       bool "Accept and ignore redundant options"
 //config:       default y
 //config:       depends on ACPID
 //config:       help
-//config:         Accept and ignore compatibility options -g -m -s -S -v.
+//config:       Accept and ignore compatibility options -g -m -s -S -v.
 
 //applet:IF_ACPID(APPLET(acpid, BB_DIR_SBIN, BB_SUID_DROP))
 
diff --git a/util-linux/blkdiscard.c b/util-linux/blkdiscard.c
index 85039c5d0..8f6a4ab6c 100644
--- a/util-linux/blkdiscard.c
+++ b/util-linux/blkdiscard.c
@@ -6,10 +6,10 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config BLKDISCARD
-//config:       bool "blkdiscard"
+//config:       bool "blkdiscard (5.3 kb)"
 //config:       default y
 //config:       help
-//config:         blkdiscard discards sectors on a given device.
+//config:       blkdiscard discards sectors on a given device.
 
 //kbuild:lib-$(CONFIG_BLKDISCARD) += blkdiscard.o
 //applet:IF_BLKDISCARD(APPLET(blkdiscard, BB_DIR_USR_BIN, BB_SUID_DROP))
diff --git a/util-linux/blkid.c b/util-linux/blkid.c
index b6f33b513..f353cf248 100644
--- a/util-linux/blkid.c
+++ b/util-linux/blkid.c
@@ -7,21 +7,21 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config BLKID
-//config:       bool "blkid"
+//config:       bool "blkid (11 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       select VOLUMEID
 //config:       help
-//config:         Lists labels and UUIDs of all filesystems.
-//config:         WARNING:
-//config:         With all submodules selected, it will add ~8k to busybox.
+//config:       Lists labels and UUIDs of all filesystems.
+//config:       WARNING:
+//config:       With all submodules selected, it will add ~8k to busybox.
 //config:
 //config:config FEATURE_BLKID_TYPE
 //config:       bool "Print filesystem type"
 //config:       default n
 //config:       depends on BLKID
 //config:       help
-//config:         Show TYPE="filesystem type"
+//config:       Show TYPE="filesystem type"
 
 //applet:IF_BLKID(APPLET(blkid, BB_DIR_SBIN, BB_SUID_DROP))
 
diff --git a/util-linux/blockdev.c b/util-linux/blockdev.c
index bf4d49792..9e1fef206 100644
--- a/util-linux/blockdev.c
+++ b/util-linux/blockdev.c
@@ -6,10 +6,10 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config BLOCKDEV
-//config:       bool "blockdev"
+//config:       bool "blockdev (2.4 kb)"
 //config:       default y
 //config:       help
-//config:         Performs some ioctls with block devices.
+//config:       Performs some ioctls with block devices.
 
 //applet:IF_BLOCKDEV(APPLET(blockdev, BB_DIR_SBIN, BB_SUID_DROP))
 
diff --git a/util-linux/cal.c b/util-linux/cal.c
index 8196619b0..091fdbd2b 100644
--- a/util-linux/cal.c
+++ b/util-linux/cal.c
@@ -11,10 +11,10 @@
  * Major size reduction... over 50% (>1.5k) on i386.
  */
 //config:config CAL
-//config:       bool "cal"
+//config:       bool "cal (6.5 kb)"
 //config:       default y
 //config:       help
-//config:         cal is used to display a monthly calendar.
+//config:       cal is used to display a monthly calendar.
 
 //applet:IF_CAL(APPLET(cal, BB_DIR_USR_BIN, BB_SUID_DROP))
 
diff --git a/util-linux/chrt.c b/util-linux/chrt.c
index 1604a6890..4bc8b6cfa 100644
--- a/util-linux/chrt.c
+++ b/util-linux/chrt.c
@@ -6,11 +6,11 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config CHRT
-//config:       bool "chrt"
+//config:       bool "chrt (4.4 kb)"
 //config:       default y
 //config:       help
-//config:         manipulate real-time attributes of a process.
-//config:         This requires sched_{g,s}etparam support in your libc.
+//config:       manipulate real-time attributes of a process.
+//config:       This requires sched_{g,s}etparam support in your libc.
 
 //applet:IF_CHRT(APPLET(chrt, BB_DIR_USR_BIN, BB_SUID_DROP))
 
diff --git a/util-linux/dmesg.c b/util-linux/dmesg.c
index c3574f8f5..6da9d9f4e 100644
--- a/util-linux/dmesg.c
+++ b/util-linux/dmesg.c
@@ -9,38 +9,38 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config DMESG
-//config:       bool "dmesg"
+//config:       bool "dmesg (3.5 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         dmesg is used to examine or control the kernel ring buffer. When the
-//config:         Linux kernel prints messages to the system log, they are stored in
-//config:         the kernel ring buffer. You can use dmesg to print the kernel's ring
-//config:         buffer, clear the kernel ring buffer, change the size of the kernel
-//config:         ring buffer, and change the priority level at which kernel messages
-//config:         are also logged to the system console. Enable this option if you
-//config:         wish to enable the 'dmesg' utility.
+//config:       dmesg is used to examine or control the kernel ring buffer. When the
+//config:       Linux kernel prints messages to the system log, they are stored in
+//config:       the kernel ring buffer. You can use dmesg to print the kernel's ring
+//config:       buffer, clear the kernel ring buffer, change the size of the kernel
+//config:       ring buffer, and change the priority level at which kernel messages
+//config:       are also logged to the system console. Enable this option if you
+//config:       wish to enable the 'dmesg' utility.
 //config:
 //config:config FEATURE_DMESG_PRETTY
 //config:       bool "Pretty output"
 //config:       default y
 //config:       depends on DMESG
 //config:       help
-//config:         If you wish to scrub the syslog level from the output, say 'Y' here.
-//config:         The syslog level is a string prefixed to every line with the form
-//config:         "<#>".
+//config:       If you wish to scrub the syslog level from the output, say 'Y' here.
+//config:       The syslog level is a string prefixed to every line with the form
+//config:       "<#>".
 //config:
-//config:         With this option you will see:
-//config:           # dmesg
-//config:           Linux version 2.6.17.4 .....
-//config:           BIOS-provided physical RAM map:
-//config:            BIOS-e820: 0000000000000000 - 000000000009f000 (usable)
+//config:       With this option you will see:
+//config:               # dmesg
+//config:               Linux version 2.6.17.4 .....
+//config:               BIOS-provided physical RAM map:
+//config:                BIOS-e820: 0000000000000000 - 000000000009f000 (usable)
 //config:
-//config:         Without this option you will see:
-//config:           # dmesg
-//config:           <5>Linux version 2.6.17.4 .....
-//config:           <6>BIOS-provided physical RAM map:
-//config:           <6> BIOS-e820: 0000000000000000 - 000000000009f000 (usable)
+//config:       Without this option you will see:
+//config:               # dmesg
+//config:               <5>Linux version 2.6.17.4 .....
+//config:               <6>BIOS-provided physical RAM map:
+//config:               <6> BIOS-e820: 0000000000000000 - 000000000009f000 (usable)
 
 //applet:IF_DMESG(APPLET(dmesg, BB_DIR_BIN, BB_SUID_DROP))
 
diff --git a/util-linux/eject.c b/util-linux/eject.c
index 667932f6c..8095cbef0 100644
--- a/util-linux/eject.c
+++ b/util-linux/eject.c
@@ -13,19 +13,19 @@
  * Most of the dirty work blatantly ripped off from cat.c =)
  */
 //config:config EJECT
-//config:       bool "eject"
+//config:       bool "eject (4.1 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         Used to eject cdroms. (defaults to /dev/cdrom)
+//config:       Used to eject cdroms. (defaults to /dev/cdrom)
 //config:
 //config:config FEATURE_EJECT_SCSI
 //config:       bool "SCSI support"
 //config:       default y
 //config:       depends on EJECT
 //config:       help
-//config:         Add the -s option to eject, this allows to eject SCSI-Devices and
-//config:         usb-storage devices.
+//config:       Add the -s option to eject, this allows to eject SCSI-Devices and
+//config:       usb-storage devices.
 
 //applet:IF_EJECT(APPLET(eject, BB_DIR_USR_BIN, BB_SUID_DROP))
 
diff --git a/util-linux/fallocate.c b/util-linux/fallocate.c
index 1cd851bde..70e7e178f 100644
--- a/util-linux/fallocate.c
+++ b/util-linux/fallocate.c
@@ -6,10 +6,10 @@
  */
 
 //config:config FALLOCATE
-//config:       bool "fallocate"
+//config:       bool "fallocate (5 kb)"
 //config:       default y
 //config:       help
-//config:         Preallocate space for files.
+//config:       Preallocate space for files.
 
 //applet:IF_FALLOCATE(APPLET(fallocate, BB_DIR_USR_BIN, BB_SUID_DROP))
 
diff --git a/util-linux/fatattr.c b/util-linux/fatattr.c
index 030978f64..9fb566d5a 100644
--- a/util-linux/fatattr.c
+++ b/util-linux/fatattr.c
@@ -9,11 +9,11 @@
  * Public License
  */
 //config:config FATATTR
-//config:       bool "fatattr"
+//config:       bool "fatattr (1.9 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         fatattr lists or changes the file attributes on a fat file system.
+//config:       fatattr lists or changes the file attributes on a fat file system.
 
 //applet:IF_FATATTR(APPLET(fatattr, BB_DIR_BIN, BB_SUID_DROP))
 
diff --git a/util-linux/fbset.c b/util-linux/fbset.c
index 673bf9aa4..11cb20cb2 100644
--- a/util-linux/fbset.c
+++ b/util-linux/fbset.c
@@ -12,33 +12,33 @@
  *     Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be)
  */
 //config:config FBSET
-//config:       bool "fbset"
+//config:       bool "fbset (5.8 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         fbset is used to show or change the settings of a Linux frame buffer
-//config:         device. The frame buffer device provides a simple and unique
-//config:         interface to access a graphics display. Enable this option
-//config:         if you wish to enable the 'fbset' utility.
+//config:       fbset is used to show or change the settings of a Linux frame buffer
+//config:       device. The frame buffer device provides a simple and unique
+//config:       interface to access a graphics display. Enable this option
+//config:       if you wish to enable the 'fbset' utility.
 //config:
 //config:config FEATURE_FBSET_FANCY
 //config:       bool "Enable extra options"
 //config:       default y
 //config:       depends on FBSET
 //config:       help
-//config:         This option enables extended fbset options, allowing one to set the
-//config:         framebuffer size, color depth, etc. interface to access a graphics
-//config:         display. Enable this option if you wish to enable extended fbset
-//config:         options.
+//config:       This option enables extended fbset options, allowing one to set the
+//config:       framebuffer size, color depth, etc. interface to access a graphics
+//config:       display. Enable this option if you wish to enable extended fbset
+//config:       options.
 //config:
 //config:config FEATURE_FBSET_READMODE
 //config:       bool "Enable readmode support"
 //config:       default y
 //config:       depends on FBSET
 //config:       help
-//config:         This option allows fbset to read the video mode database stored by
-//config:         default as /etc/fb.modes, which can be used to set frame buffer
-//config:         device to pre-defined video modes.
+//config:       This option allows fbset to read the video mode database stored by
+//config:       default as /etc/fb.modes, which can be used to set frame buffer
+//config:       device to pre-defined video modes.
 
 //applet:IF_FBSET(APPLET(fbset, BB_DIR_USR_SBIN, BB_SUID_DROP))
 
diff --git a/util-linux/fdformat.c b/util-linux/fdformat.c
index 67c6e1504..6faaf1b10 100644
--- a/util-linux/fdformat.c
+++ b/util-linux/fdformat.c
@@ -5,11 +5,11 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config FDFORMAT
-//config:       bool "fdformat"
+//config:       bool "fdformat (4.5 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         fdformat is used to low-level format a floppy disk.
+//config:       fdformat is used to low-level format a floppy disk.
 
 //applet:IF_FDFORMAT(APPLET(fdformat, BB_DIR_USR_SBIN, BB_SUID_DROP))
 
diff --git a/util-linux/fdisk.c b/util-linux/fdisk.c
index 4467525c7..e00f85864 100644
--- a/util-linux/fdisk.c
+++ b/util-linux/fdisk.c
@@ -7,14 +7,14 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config FDISK
-//config:       bool "fdisk"
+//config:       bool "fdisk (41 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         The fdisk utility is used to divide hard disks into one or more
-//config:         logical disks, which are generally called partitions. This utility
-//config:         can be used to list and edit the set of partitions or BSD style
-//config:         'disk slices' that are defined on a hard drive.
+//config:       The fdisk utility is used to divide hard disks into one or more
+//config:       logical disks, which are generally called partitions. This utility
+//config:       can be used to list and edit the set of partitions or BSD style
+//config:       'disk slices' that are defined on a hard drive.
 //config:
 //config:config FDISK_SUPPORT_LARGE_DISKS
 //config:       bool "Support over 4GB disks"
@@ -27,59 +27,59 @@
 //config:       default y
 //config:       depends on FDISK
 //config:       help
-//config:         Enabling this option allows you to create or change a partition table
-//config:         and write those changes out to disk. If you leave this option
-//config:         disabled, you will only be able to view the partition table.
+//config:       Enabling this option allows you to create or change a partition table
+//config:       and write those changes out to disk. If you leave this option
+//config:       disabled, you will only be able to view the partition table.
 //config:
 //config:config FEATURE_AIX_LABEL
 //config:       bool "Support AIX disklabels"
 //config:       default n
 //config:       depends on FDISK && FEATURE_FDISK_WRITABLE
 //config:       help
-//config:         Enabling this option allows you to create or change AIX disklabels.
-//config:         Most people can safely leave this option disabled.
+//config:       Enabling this option allows you to create or change AIX disklabels.
+//config:       Most people can safely leave this option disabled.
 //config:
 //config:config FEATURE_SGI_LABEL
 //config:       bool "Support SGI disklabels"
 //config:       default n
 //config:       depends on FDISK && FEATURE_FDISK_WRITABLE
 //config:       help
-//config:         Enabling this option allows you to create or change SGI disklabels.
-//config:         Most people can safely leave this option disabled.
+//config:       Enabling this option allows you to create or change SGI disklabels.
+//config:       Most people can safely leave this option disabled.
 //config:
 //config:config FEATURE_SUN_LABEL
 //config:       bool "Support SUN disklabels"
 //config:       default n
 //config:       depends on FDISK && FEATURE_FDISK_WRITABLE
 //config:       help
-//config:         Enabling this option allows you to create or change SUN disklabels.
-//config:         Most people can safely leave this option disabled.
+//config:       Enabling this option allows you to create or change SUN disklabels.
+//config:       Most people can safely leave this option disabled.
 //config:
 //config:config FEATURE_OSF_LABEL
 //config:       bool "Support BSD disklabels"
 //config:       default n
 //config:       depends on FDISK && FEATURE_FDISK_WRITABLE
 //config:       help
-//config:         Enabling this option allows you to create or change BSD disklabels
-//config:         and define and edit BSD disk slices.
+//config:       Enabling this option allows you to create or change BSD disklabels
+//config:       and define and edit BSD disk slices.
 //config:
 //config:config FEATURE_GPT_LABEL
 //config:       bool "Support GPT disklabels"
 //config:       default n
 //config:       depends on FDISK && FEATURE_FDISK_WRITABLE
 //config:       help
-//config:         Enabling this option allows you to view GUID Partition Table
-//config:         disklabels.
+//config:       Enabling this option allows you to view GUID Partition Table
+//config:       disklabels.
 //config:
 //config:config FEATURE_FDISK_ADVANCED
 //config:       bool "Support expert mode"
 //config:       default y
 //config:       depends on FDISK && FEATURE_FDISK_WRITABLE
 //config:       help
-//config:         Enabling this option allows you to do terribly unsafe things like
-//config:         define arbitrary drive geometry, move the beginning of data in a
-//config:         partition, and similarly evil things. Unless you have a very good
-//config:         reason you would be wise to leave this disabled.
+//config:       Enabling this option allows you to do terribly unsafe things like
+//config:       define arbitrary drive geometry, move the beginning of data in a
+//config:       partition, and similarly evil things. Unless you have a very good
+//config:       reason you would be wise to leave this disabled.
 
 //applet:IF_FDISK(APPLET(fdisk, BB_DIR_SBIN, BB_SUID_DROP))
 
diff --git a/util-linux/findfs.c b/util-linux/findfs.c
index daa46b039..359da581f 100644
--- a/util-linux/findfs.c
+++ b/util-linux/findfs.c
@@ -8,14 +8,14 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config FINDFS
-//config:       bool "findfs"
+//config:       bool "findfs (11 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       select VOLUMEID
 //config:       help
-//config:         Prints the name of a filesystem with given label or UUID.
-//config:         WARNING:
-//config:         With all submodules selected, it will add ~8k to busybox.
+//config:       Prints the name of a filesystem with given label or UUID.
+//config:       WARNING:
+//config:       With all submodules selected, it will add ~8k to busybox.
 
 /* Benefits from suid root: better access to /dev/BLOCKDEVs: */
 //applet:IF_FINDFS(APPLET(findfs, BB_DIR_SBIN, BB_SUID_MAYBE))
diff --git a/util-linux/flock.c b/util-linux/flock.c
index f34c0ad8f..ec35af18f 100644
--- a/util-linux/flock.c
+++ b/util-linux/flock.c
@@ -4,10 +4,10 @@
  * This is free software, licensed under the GNU General Public License v2.
  */
 //config:config FLOCK
-//config:       bool "flock"
+//config:       bool "flock (6.1 kb)"
 //config:       default y
 //config:       help
-//config:         Manage locks from shell scripts
+//config:       Manage locks from shell scripts
 
 //applet:IF_FLOCK(APPLET(flock, BB_DIR_USR_BIN, BB_SUID_DROP))
 
diff --git a/util-linux/freeramdisk.c b/util-linux/freeramdisk.c
index 28148fcbe..55187cb40 100644
--- a/util-linux/freeramdisk.c
+++ b/util-linux/freeramdisk.c
@@ -9,29 +9,29 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config FDFLUSH
-//config:       bool "fdflush"
+//config:       bool "fdflush (1.4 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         fdflush is only needed when changing media on slightly-broken
-//config:         removable media drives. It is used to make Linux believe that a
-//config:         hardware disk-change switch has been actuated, which causes Linux to
-//config:         forget anything it has cached from the previous media. If you have
-//config:         such a slightly-broken drive, you will need to run fdflush every time
-//config:         you change a disk. Most people have working hardware and can safely
-//config:         leave this disabled.
+//config:       fdflush is only needed when changing media on slightly-broken
+//config:       removable media drives. It is used to make Linux believe that a
+//config:       hardware disk-change switch has been actuated, which causes Linux to
+//config:       forget anything it has cached from the previous media. If you have
+//config:       such a slightly-broken drive, you will need to run fdflush every time
+//config:       you change a disk. Most people have working hardware and can safely
+//config:       leave this disabled.
 //config:
 //config:config FREERAMDISK
-//config:       bool "freeramdisk"
+//config:       bool "freeramdisk (1.4 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         Linux allows you to create ramdisks. This utility allows you to
-//config:         delete them and completely free all memory that was used for the
-//config:         ramdisk. For example, if you boot Linux into a ramdisk and later
-//config:         pivot_root, you may want to free the memory that is allocated to the
-//config:         ramdisk. If you have no use for freeing memory from a ramdisk, leave
-//config:         this disabled.
+//config:       Linux allows you to create ramdisks. This utility allows you to
+//config:       delete them and completely free all memory that was used for the
+//config:       ramdisk. For example, if you boot Linux into a ramdisk and later
+//config:       pivot_root, you may want to free the memory that is allocated to the
+//config:       ramdisk. If you have no use for freeing memory from a ramdisk, leave
+//config:       this disabled.
 
 //                  APPLET_ODDNAME:name     main         location    suid_type     help
 //applet:IF_FDFLUSH(APPLET_ODDNAME(fdflush, freeramdisk, BB_DIR_BIN, BB_SUID_DROP, fdflush))
diff --git a/util-linux/fsck_minix.c b/util-linux/fsck_minix.c
index 2ab7530ea..8c2b7d8de 100644
--- a/util-linux/fsck_minix.c
+++ b/util-linux/fsck_minix.c
@@ -89,12 +89,12 @@
 //config:       bool "fsck_minix"
 //config:       default y
 //config:       help
-//config:         The minix filesystem is a nice, small, compact, read-write filesystem
-//config:         with little overhead. It is not a journaling filesystem however and
-//config:         can experience corruption if it is not properly unmounted or if the
-//config:         power goes off in the middle of a write. This utility allows you to
-//config:         check for and attempt to repair any corruption that occurs to a minix
-//config:         filesystem.
+//config:       The minix filesystem is a nice, small, compact, read-write filesystem
+//config:       with little overhead. It is not a journaling filesystem however and
+//config:       can experience corruption if it is not properly unmounted or if the
+//config:       power goes off in the middle of a write. This utility allows you to
+//config:       check for and attempt to repair any corruption that occurs to a minix
+//config:       filesystem.
 
 //applet:IF_FSCK_MINIX(APPLET_ODDNAME(fsck.minix, fsck_minix, BB_DIR_SBIN, BB_SUID_DROP, fsck_minix))
 
diff --git a/util-linux/fsfreeze.c b/util-linux/fsfreeze.c
index 70dec24ec..5c10c8044 100644
--- a/util-linux/fsfreeze.c
+++ b/util-linux/fsfreeze.c
@@ -6,12 +6,12 @@
  */
 
 //config:config FSFREEZE
-//config:       bool "fsfreeze"
+//config:       bool "fsfreeze (3.6 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       select LONG_OPTS
 //config:       help
-//config:         Halt new accesses and flush writes on a mounted filesystem.
+//config:       Halt new accesses and flush writes on a mounted filesystem.
 
 //applet:IF_FSFREEZE(APPLET(fsfreeze, BB_DIR_USR_SBIN, BB_SUID_DROP))
 
diff --git a/util-linux/fstrim.c b/util-linux/fstrim.c
index 563aa9720..6d0d61d92 100644
--- a/util-linux/fstrim.c
+++ b/util-linux/fstrim.c
@@ -9,11 +9,11 @@
  */
 
 //config:config FSTRIM
-//config:       bool "fstrim"
+//config:       bool "fstrim (5.5 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         Discard unused blocks on a mounted filesystem.
+//config:       Discard unused blocks on a mounted filesystem.
 
 //applet:IF_FSTRIM(APPLET(fstrim, BB_DIR_SBIN, BB_SUID_DROP))
 
diff --git a/util-linux/getopt.c b/util-linux/getopt.c
index 79d54854b..cd5679cff 100644
--- a/util-linux/getopt.c
+++ b/util-linux/getopt.c
@@ -30,22 +30,22 @@
  *  Replaced our_malloc with xmalloc and our_realloc with xrealloc
  */
 //config:config GETOPT
-//config:       bool "getopt"
+//config:       bool "getopt (5.6 kb)"
 //config:       default y
 //config:       help
-//config:         The getopt utility is used to break up (parse) options in command
-//config:         lines to make it easy to write complex shell scripts that also check
-//config:         for legal (and illegal) options. If you want to write horribly
-//config:         complex shell scripts, or use some horribly complex shell script
-//config:         written by others, this utility may be for you. Most people will
-//config:         wisely leave this disabled.
+//config:       The getopt utility is used to break up (parse) options in command
+//config:       lines to make it easy to write complex shell scripts that also check
+//config:       for legal (and illegal) options. If you want to write horribly
+//config:       complex shell scripts, or use some horribly complex shell script
+//config:       written by others, this utility may be for you. Most people will
+//config:       wisely leave this disabled.
 //config:
 //config:config FEATURE_GETOPT_LONG
 //config:       bool "Support option -l"
 //config:       default y if LONG_OPTS
 //config:       depends on GETOPT
 //config:       help
-//config:         Enable support for long options (option -l).
+//config:       Enable support for long options (option -l).
 
 //applet:IF_GETOPT(APPLET(getopt, BB_DIR_BIN, BB_SUID_DROP))
 
diff --git a/util-linux/hexdump.c b/util-linux/hexdump.c
index 25f771201..719feaf4e 100644
--- a/util-linux/hexdump.c
+++ b/util-linux/hexdump.c
@@ -9,27 +9,27 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config HEXDUMP
-//config:       bool "hexdump"
+//config:       bool "hexdump (8.8 kb)"
 //config:       default y
 //config:       help
-//config:         The hexdump utility is used to display binary data in a readable
-//config:         way that is comparable to the output from most hex editors.
+//config:       The hexdump utility is used to display binary data in a readable
+//config:       way that is comparable to the output from most hex editors.
 //config:
 //config:config FEATURE_HEXDUMP_REVERSE
 //config:       bool "Support -R, reverse of 'hexdump -Cv'"
 //config:       default y
 //config:       depends on HEXDUMP
 //config:       help
-//config:         The hexdump utility is used to display binary data in an ascii
-//config:         readable way. This option creates binary data from an ascii input.
-//config:         NB: this option is non-standard. It's unwise to use it in scripts
-//config:         aimed to be portable.
+//config:       The hexdump utility is used to display binary data in an ascii
+//config:       readable way. This option creates binary data from an ascii input.
+//config:       NB: this option is non-standard. It's unwise to use it in scripts
+//config:       aimed to be portable.
 //config:
 //config:config HD
-//config:       bool "hd"
+//config:       bool "hd (8 kb)"
 //config:       default y
 //config:       help
-//config:         hd is an alias to hexdump -C.
+//config:       hd is an alias to hexdump -C.
 
 //applet:IF_HEXDUMP(APPLET_NOEXEC(hexdump, hexdump, BB_DIR_USR_BIN, BB_SUID_DROP, hexdump))
 //applet:IF_HD(APPLET_NOEXEC(hd, hexdump, BB_DIR_USR_BIN, BB_SUID_DROP, hd))
diff --git a/util-linux/hexdump_xxd.c b/util-linux/hexdump_xxd.c
index be4b4f354..37e58f2d0 100644
--- a/util-linux/hexdump_xxd.c
+++ b/util-linux/hexdump_xxd.c
@@ -7,11 +7,11 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config XXD
-//config:       bool "xxd"
+//config:       bool "xxd (8.9 kb)"
 //config:       default y
 //config:       help
-//config:         The xxd utility is used to display binary data in a readable
-//config:         way that is comparable to the output from most hex editors.
+//config:       The xxd utility is used to display binary data in a readable
+//config:       way that is comparable to the output from most hex editors.
 
 //applet:IF_XXD(APPLET_NOEXEC(xxd, xxd, BB_DIR_USR_BIN, BB_SUID_DROP, xxd))
 
diff --git a/util-linux/hwclock.c b/util-linux/hwclock.c
index 8cb908cb3..5df56de15 100644
--- a/util-linux/hwclock.c
+++ b/util-linux/hwclock.c
@@ -7,14 +7,14 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config HWCLOCK
-//config:       bool "hwclock"
+//config:       bool "hwclock (5.8 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         The hwclock utility is used to read and set the hardware clock
-//config:         on a system. This is primarily used to set the current time on
-//config:         shutdown in the hardware clock, so the hardware will keep the
-//config:         correct time when Linux is _not_ running.
+//config:       The hwclock utility is used to read and set the hardware clock
+//config:       on a system. This is primarily used to set the current time on
+//config:       shutdown in the hardware clock, so the hardware will keep the
+//config:       correct time when Linux is _not_ running.
 //config:
 //config:config FEATURE_HWCLOCK_LONG_OPTIONS
 //config:       bool "Support long options (--hctosys,...)"
@@ -26,12 +26,12 @@
 //config:       default n  # util-linux-ng in Fedora 13 still uses /etc/adjtime
 //config:       depends on HWCLOCK
 //config:       help
-//config:         Starting with FHS 2.3, the adjtime state file is supposed to exist
-//config:         at /var/lib/hwclock/adjtime instead of /etc/adjtime. If you wish
-//config:         to use the FHS behavior, answer Y here, otherwise answer N for the
-//config:         classic /etc/adjtime path.
+//config:       Starting with FHS 2.3, the adjtime state file is supposed to exist
+//config:       at /var/lib/hwclock/adjtime instead of /etc/adjtime. If you wish
+//config:       to use the FHS behavior, answer Y here, otherwise answer N for the
+//config:       classic /etc/adjtime path.
 //config:
-//config:         pathname.com/fhs/pub/fhs-2.3.html#VARLIBHWCLOCKSTATEDIRECTORYFORHWCLO
+//config:       pathname.com/fhs/pub/fhs-2.3.html#VARLIBHWCLOCKSTATEDIRECTORYFORHWCLO
 
 //applet:IF_HWCLOCK(APPLET(hwclock, BB_DIR_SBIN, BB_SUID_DROP))
 
diff --git a/util-linux/ionice.c b/util-linux/ionice.c
index c54b3a6e1..c7b7f0373 100644
--- a/util-linux/ionice.c
+++ b/util-linux/ionice.c
@@ -7,12 +7,12 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config IONICE
-//config:       bool "ionice"
+//config:       bool "ionice (3.6 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         Set/set program io scheduling class and priority
-//config:         Requires kernel >= 2.6.13
+//config:       Set/set program io scheduling class and priority
+//config:       Requires kernel >= 2.6.13
 
 //applet:IF_IONICE(APPLET(ionice, BB_DIR_BIN, BB_SUID_DROP))
 
diff --git a/util-linux/ipcrm.c b/util-linux/ipcrm.c
index 76ea3ca4f..c51d33143 100644
--- a/util-linux/ipcrm.c
+++ b/util-linux/ipcrm.c
@@ -8,12 +8,12 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config IPCRM
-//config:       bool "ipcrm"
+//config:       bool "ipcrm (2.9 kb)"
 //config:       default y
 //config:       help
-//config:         The ipcrm utility allows the removal of System V interprocess
-//config:         communication (IPC) objects and the associated data structures
-//config:         from the system.
+//config:       The ipcrm utility allows the removal of System V interprocess
+//config:       communication (IPC) objects and the associated data structures
+//config:       from the system.
 
 //applet:IF_IPCRM(APPLET(ipcrm, BB_DIR_USR_BIN, BB_SUID_DROP))
 
diff --git a/util-linux/ipcs.c b/util-linux/ipcs.c
index 88ae9225d..1404930d4 100644
--- a/util-linux/ipcs.c
+++ b/util-linux/ipcs.c
@@ -8,12 +8,12 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config IPCS
-//config:       bool "ipcs"
+//config:       bool "ipcs (11 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         The ipcs utility is used to provide information on the currently
-//config:         allocated System V interprocess (IPC) objects in the system.
+//config:       The ipcs utility is used to provide information on the currently
+//config:       allocated System V interprocess (IPC) objects in the system.
 
 //applet:IF_IPCS(APPLET(ipcs, BB_DIR_USR_BIN, BB_SUID_DROP))
 
diff --git a/util-linux/last.c b/util-linux/last.c
index b3f125c3f..f5ee8e5f4 100644
--- a/util-linux/last.c
+++ b/util-linux/last.c
@@ -7,19 +7,19 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config LAST
-//config:       bool "last"
+//config:       bool "last (6.2 kb)"
 //config:       default y
 //config:       depends on FEATURE_WTMP
 //config:       help
-//config:         'last' displays a list of the last users that logged into the system.
+//config:       'last' displays a list of the last users that logged into the system.
 //config:
 //config:config FEATURE_LAST_FANCY
 //config:       bool "Output extra information"
 //config:       default y
 //config:       depends on LAST
 //config:       help
-//config:         'last' displays detailed information about the last users that
-//config:         logged into the system (mimics sysvinit last). +900 bytes.
+//config:       'last' displays detailed information about the last users that
+//config:       logged into the system (mimics sysvinit last). +900 bytes.
 
 //applet:IF_LAST(APPLET(last, BB_DIR_USR_BIN, BB_SUID_DROP))
 
diff --git a/util-linux/losetup.c b/util-linux/losetup.c
index d356f49c2..c608de6cc 100644
--- a/util-linux/losetup.c
+++ b/util-linux/losetup.c
@@ -7,13 +7,13 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config LOSETUP
-//config:       bool "losetup"
+//config:       bool "losetup (5.4 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         losetup is used to associate or detach a loop device with a regular
-//config:         file or block device, and to query the status of a loop device. This
-//config:         version does not currently support enabling data encryption.
+//config:       losetup is used to associate or detach a loop device with a regular
+//config:       file or block device, and to query the status of a loop device. This
+//config:       version does not currently support enabling data encryption.
 
 //kbuild:lib-$(CONFIG_LOSETUP) += losetup.o
 
diff --git a/util-linux/lspci.c b/util-linux/lspci.c
index 8b38a2366..3877deb67 100644
--- a/util-linux/lspci.c
+++ b/util-linux/lspci.c
@@ -7,14 +7,14 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config LSPCI
-//config:       bool "lspci"
+//config:       bool "lspci (5.7 kb)"
 //config:       default y
 //config:       #select PLATFORM_LINUX
 //config:       help
-//config:         lspci is a utility for displaying information about PCI buses in the
-//config:         system and devices connected to them.
+//config:       lspci is a utility for displaying information about PCI buses in the
+//config:       system and devices connected to them.
 //config:
-//config:         This version uses sysfs (/sys/bus/pci/devices) only.
+//config:       This version uses sysfs (/sys/bus/pci/devices) only.
 
 //applet:IF_LSPCI(APPLET(lspci, BB_DIR_USR_BIN, BB_SUID_DROP))
 
diff --git a/util-linux/lsusb.c b/util-linux/lsusb.c
index 7d36d6f5a..cabf047cf 100644
--- a/util-linux/lsusb.c
+++ b/util-linux/lsusb.c
@@ -7,14 +7,14 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config LSUSB
-//config:       bool "lsusb"
+//config:       bool "lsusb (3.5 kb)"
 //config:       default y
 //config:       #select PLATFORM_LINUX
 //config:       help
-//config:         lsusb is a utility for displaying information about USB buses in the
-//config:         system and devices connected to them.
+//config:       lsusb is a utility for displaying information about USB buses in the
+//config:       system and devices connected to them.
 //config:
-//config:         This version uses sysfs (/sys/bus/usb/devices) only.
+//config:       This version uses sysfs (/sys/bus/usb/devices) only.
 
 //applet:IF_LSUSB(APPLET(lsusb, BB_DIR_USR_BIN, BB_SUID_DROP))
 
diff --git a/util-linux/mdev.c b/util-linux/mdev.c
index a59115dd4..23b6f8285 100644
--- a/util-linux/mdev.c
+++ b/util-linux/mdev.c
@@ -9,62 +9,62 @@
  */
 
 //config:config MDEV
-//config:       bool "mdev"
+//config:       bool "mdev (16 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         mdev is a mini-udev implementation for dynamically creating device
-//config:         nodes in the /dev directory.
+//config:       mdev is a mini-udev implementation for dynamically creating device
+//config:       nodes in the /dev directory.
 //config:
-//config:         For more information, please see docs/mdev.txt
+//config:       For more information, please see docs/mdev.txt
 //config:
 //config:config FEATURE_MDEV_CONF
 //config:       bool "Support /etc/mdev.conf"
 //config:       default y
 //config:       depends on MDEV
 //config:       help
-//config:         Add support for the mdev config file to control ownership and
-//config:         permissions of the device nodes.
+//config:       Add support for the mdev config file to control ownership and
+//config:       permissions of the device nodes.
 //config:
-//config:         For more information, please see docs/mdev.txt
+//config:       For more information, please see docs/mdev.txt
 //config:
 //config:config FEATURE_MDEV_RENAME
 //config:       bool "Support subdirs/symlinks"
 //config:       default y
 //config:       depends on FEATURE_MDEV_CONF
 //config:       help
-//config:         Add support for renaming devices and creating symlinks.
+//config:       Add support for renaming devices and creating symlinks.
 //config:
-//config:         For more information, please see docs/mdev.txt
+//config:       For more information, please see docs/mdev.txt
 //config:
 //config:config FEATURE_MDEV_RENAME_REGEXP
 //config:       bool "Support regular expressions substitutions when renaming device"
 //config:       default y
 //config:       depends on FEATURE_MDEV_RENAME
 //config:       help
-//config:         Add support for regular expressions substitutions when renaming
-//config:         device.
+//config:       Add support for regular expressions substitutions when renaming
+//config:       device.
 //config:
 //config:config FEATURE_MDEV_EXEC
 //config:       bool "Support command execution at device addition/removal"
 //config:       default y
 //config:       depends on FEATURE_MDEV_CONF
 //config:       help
-//config:         This adds support for an optional field to /etc/mdev.conf for
-//config:         executing commands when devices are created/removed.
+//config:       This adds support for an optional field to /etc/mdev.conf for
+//config:       executing commands when devices are created/removed.
 //config:
-//config:         For more information, please see docs/mdev.txt
+//config:       For more information, please see docs/mdev.txt
 //config:
 //config:config FEATURE_MDEV_LOAD_FIRMWARE
 //config:       bool "Support loading of firmwares"
 //config:       default y
 //config:       depends on MDEV
 //config:       help
-//config:         Some devices need to load firmware before they can be usable.
+//config:       Some devices need to load firmware before they can be usable.
 //config:
-//config:         These devices will request userspace look up the files in
-//config:         /lib/firmware/ and if it exists, send it to the kernel for
-//config:         loading into the hardware.
+//config:       These devices will request userspace look up the files in
+//config:       /lib/firmware/ and if it exists, send it to the kernel for
+//config:       loading into the hardware.
 
 //applet:IF_MDEV(APPLET(mdev, BB_DIR_SBIN, BB_SUID_DROP))
 
diff --git a/util-linux/mesg.c b/util-linux/mesg.c
index 45c13b8e0..c4371eb24 100644
--- a/util-linux/mesg.c
+++ b/util-linux/mesg.c
@@ -8,23 +8,23 @@
  */
 
 //config:config MESG
-//config:       bool "mesg"
+//config:       bool "mesg (1.2 kb)"
 //config:       default y
 //config:       help
-//config:         Mesg controls access to your terminal by others. It is typically
-//config:         used to allow or disallow other users to write to your terminal
+//config:       Mesg controls access to your terminal by others. It is typically
+//config:       used to allow or disallow other users to write to your terminal
 //config:
 //config:config FEATURE_MESG_ENABLE_ONLY_GROUP
 //config:       bool "Enable writing to tty only by group, not by everybody"
 //config:       default y
 //config:       depends on MESG
 //config:       help
-//config:         Usually, ttys are owned by group "tty", and "write" tool is
-//config:         setgid to this group. This way, "mesg y" only needs to enable
-//config:         "write by owning group" bit in tty mode.
+//config:       Usually, ttys are owned by group "tty", and "write" tool is
+//config:       setgid to this group. This way, "mesg y" only needs to enable
+//config:       "write by owning group" bit in tty mode.
 //config:
-//config:         If you set this option to N, "mesg y" will enable writing
-//config:         by anybody at all. This is not recommended.
+//config:       If you set this option to N, "mesg y" will enable writing
+//config:       by anybody at all. This is not recommended.
 
 //applet:IF_MESG(APPLET(mesg, BB_DIR_USR_BIN, BB_SUID_DROP))
 
diff --git a/util-linux/mkfs_ext2.c b/util-linux/mkfs_ext2.c
index 4a7a878ac..8434dd6ad 100644
--- a/util-linux/mkfs_ext2.c
+++ b/util-linux/mkfs_ext2.c
@@ -8,18 +8,18 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config MKE2FS
-//config:       bool "mke2fs"
+//config:       bool "mke2fs (9.7 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         Utility to create EXT2 filesystems.
+//config:       Utility to create EXT2 filesystems.
 //config:
 //config:config MKFS_EXT2
-//config:       bool "mkfs.ext2"
+//config:       bool "mkfs.ext2 (9.8 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         Alias to "mke2fs".
+//config:       Alias to "mke2fs".
 
 //                    APPLET_ODDNAME:name       main       location     suid_type     help
 //applet:IF_MKE2FS(   APPLET_ODDNAME(mke2fs,    mkfs_ext2, BB_DIR_SBIN, BB_SUID_DROP, mkfs_ext2))
diff --git a/util-linux/mkfs_minix.c b/util-linux/mkfs_minix.c
index 0dfe34705..88647e9d8 100644
--- a/util-linux/mkfs_minix.c
+++ b/util-linux/mkfs_minix.c
@@ -67,18 +67,18 @@
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         The minix filesystem is a nice, small, compact, read-write filesystem
-//config:         with little overhead. If you wish to be able to create minix
-//config:         filesystems this utility will do the job for you.
+//config:       The minix filesystem is a nice, small, compact, read-write filesystem
+//config:       with little overhead. If you wish to be able to create minix
+//config:       filesystems this utility will do the job for you.
 //config:
 //config:config FEATURE_MINIX2
 //config:       bool "Support Minix fs v2 (fsck_minix/mkfs_minix)"
 //config:       default y
 //config:       depends on FSCK_MINIX || MKFS_MINIX
 //config:       help
-//config:         If you wish to be able to create version 2 minix filesystems, enable
-//config:         this. If you enabled 'mkfs_minix' then you almost certainly want to
-//config:         be using the version 2 filesystem support.
+//config:       If you wish to be able to create version 2 minix filesystems, enable
+//config:       this. If you enabled 'mkfs_minix' then you almost certainly want to
+//config:       be using the version 2 filesystem support.
 
 //                     APPLET_ODDNAME:name        main        location     suid_type     help
 //applet:IF_MKFS_MINIX(APPLET_ODDNAME(mkfs.minix, mkfs_minix, BB_DIR_SBIN, BB_SUID_DROP, mkfs_minix))
diff --git a/util-linux/mkfs_reiser.c b/util-linux/mkfs_reiser.c
index d01119f7f..c7d99b018 100644
--- a/util-linux/mkfs_reiser.c
+++ b/util-linux/mkfs_reiser.c
@@ -11,8 +11,8 @@
 //config:       default n
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         Utility to create ReiserFS filesystems.
-//config:         Note: this applet needs a lot of testing and polishing.
+//config:       Utility to create ReiserFS filesystems.
+//config:       Note: this applet needs a lot of testing and polishing.
 
 //applet:IF_MKFS_REISER(APPLET_ODDNAME(mkfs.reiser, mkfs_reiser, BB_DIR_SBIN, BB_SUID_DROP, mkfs_reiser))
 
diff --git a/util-linux/mkfs_vfat.c b/util-linux/mkfs_vfat.c
index 1fc943430..f9768ed56 100644
--- a/util-linux/mkfs_vfat.c
+++ b/util-linux/mkfs_vfat.c
@@ -8,18 +8,18 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config MKDOSFS
-//config:       bool "mkdosfs"
+//config:       bool "mkdosfs (6.8 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         Utility to create FAT32 filesystems.
+//config:       Utility to create FAT32 filesystems.
 //config:
 //config:config MKFS_VFAT
-//config:       bool "mkfs.vfat"
+//config:       bool "mkfs.vfat (6.8 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         Alias to "mkdosfs".
+//config:       Alias to "mkdosfs".
 
 //                    APPLET_ODDNAME:name       main       location     suid_type     help
 //applet:IF_MKDOSFS(  APPLET_ODDNAME(mkdosfs,   mkfs_vfat, BB_DIR_SBIN, BB_SUID_DROP, mkfs_vfat))
diff --git a/util-linux/mkswap.c b/util-linux/mkswap.c
index 954a1948d..e44e13c0d 100644
--- a/util-linux/mkswap.c
+++ b/util-linux/mkswap.c
@@ -6,24 +6,24 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config MKSWAP
-//config:       bool "mkswap"
+//config:       bool "mkswap (5.8 kb)"
 //config:       default y
 //config:       help
-//config:         The mkswap utility is used to configure a file or disk partition as
-//config:         Linux swap space. This allows Linux to use the entire file or
-//config:         partition as if it were additional RAM, which can greatly increase
-//config:         the capability of low-memory machines. This additional memory is
-//config:         much slower than real RAM, but can be very helpful at preventing your
-//config:         applications being killed by the Linux out of memory (OOM) killer.
-//config:         Once you have created swap space using 'mkswap' you need to enable
-//config:         the swap space using the 'swapon' utility.
+//config:       The mkswap utility is used to configure a file or disk partition as
+//config:       Linux swap space. This allows Linux to use the entire file or
+//config:       partition as if it were additional RAM, which can greatly increase
+//config:       the capability of low-memory machines. This additional memory is
+//config:       much slower than real RAM, but can be very helpful at preventing your
+//config:       applications being killed by the Linux out of memory (OOM) killer.
+//config:       Once you have created swap space using 'mkswap' you need to enable
+//config:       the swap space using the 'swapon' utility.
 //config:
 //config:config FEATURE_MKSWAP_UUID
 //config:       bool "UUID support"
 //config:       default y
 //config:       depends on MKSWAP
 //config:       help
-//config:         Generate swap spaces with universally unique identifiers.
+//config:       Generate swap spaces with universally unique identifiers.
 
 //applet:IF_MKSWAP(APPLET(mkswap, BB_DIR_SBIN, BB_SUID_DROP))
 
diff --git a/util-linux/more.c b/util-linux/more.c
index a032a1e7f..fafc80403 100644
--- a/util-linux/more.c
+++ b/util-linux/more.c
@@ -14,14 +14,14 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config MORE
-//config:       bool "more"
+//config:       bool "more (6.7 kb)"
 //config:       default y
 //config:       help
-//config:         more is a simple utility which allows you to read text one screen
-//config:         sized page at a time. If you want to read text that is larger than
-//config:         the screen, and you are using anything faster than a 300 baud modem,
-//config:         you will probably find this utility very helpful. If you don't have
-//config:         any need to reading text files, you can leave this disabled.
+//config:       more is a simple utility which allows you to read text one screen
+//config:       sized page at a time. If you want to read text that is larger than
+//config:       the screen, and you are using anything faster than a 300 baud modem,
+//config:       you will probably find this utility very helpful. If you don't have
+//config:       any need to reading text files, you can leave this disabled.
 
 //applet:IF_MORE(APPLET(more, BB_DIR_BIN, BB_SUID_DROP))
 
diff --git a/util-linux/mount.c b/util-linux/mount.c
index 5fcc7958c..1a39da2db 100644
--- a/util-linux/mount.c
+++ b/util-linux/mount.c
@@ -18,44 +18,44 @@
 //
 
 //config:config MOUNT
-//config:       bool "mount"
+//config:       bool "mount (30 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         All files and filesystems in Unix are arranged into one big directory
-//config:         tree. The 'mount' utility is used to graft a filesystem onto a
-//config:         particular part of the tree. A filesystem can either live on a block
-//config:         device, or it can be accessible over the network, as is the case with
-//config:         NFS filesystems. Most people using BusyBox will also want to enable
-//config:         the 'mount' utility.
+//config:       All files and filesystems in Unix are arranged into one big directory
+//config:       tree. The 'mount' utility is used to graft a filesystem onto a
+//config:       particular part of the tree. A filesystem can either live on a block
+//config:       device, or it can be accessible over the network, as is the case with
+//config:       NFS filesystems. Most people using BusyBox will also want to enable
+//config:       the 'mount' utility.
 //config:
 //config:config FEATURE_MOUNT_FAKE
 //config:       bool "Support option -f"
 //config:       default y
 //config:       depends on MOUNT
 //config:       help
-//config:         Enable support for faking a file system mount.
+//config:       Enable support for faking a file system mount.
 //config:
 //config:config FEATURE_MOUNT_VERBOSE
 //config:       bool "Support option -v"
 //config:       default y
 //config:       depends on MOUNT
 //config:       help
-//config:         Enable multi-level -v[vv...] verbose messages. Useful if you
-//config:         debug mount problems and want to see what is exactly passed
-//config:         to the kernel.
+//config:       Enable multi-level -v[vv...] verbose messages. Useful if you
+//config:       debug mount problems and want to see what is exactly passed
+//config:       to the kernel.
 //config:
 //config:config FEATURE_MOUNT_HELPERS
 //config:       bool "Support mount helpers"
 //config:       default n
 //config:       depends on MOUNT
 //config:       help
-//config:         Enable mounting of virtual file systems via external helpers.
-//config:         E.g. "mount obexfs#-b00.11.22.33.44.55 /mnt" will in effect call
-//config:         "obexfs -b00.11.22.33.44.55 /mnt"
-//config:         Also "mount -t sometype [-o opts] fs /mnt" will try
-//config:         "sometype [-o opts] fs /mnt" if simple mount syscall fails.
-//config:         The idea is to use such virtual filesystems in /etc/fstab.
+//config:       Enable mounting of virtual file systems via external helpers.
+//config:       E.g. "mount obexfs#-b00.11.22.33.44.55 /mnt" will in effect call
+//config:       "obexfs -b00.11.22.33.44.55 /mnt"
+//config:       Also "mount -t sometype [-o opts] fs /mnt" will try
+//config:       "sometype [-o opts] fs /mnt" if simple mount syscall fails.
+//config:       The idea is to use such virtual filesystems in /etc/fstab.
 //config:
 //config:config FEATURE_MOUNT_LABEL
 //config:       bool "Support specifying devices by label or UUID"
@@ -63,9 +63,9 @@
 //config:       depends on MOUNT
 //config:       select VOLUMEID
 //config:       help
-//config:         This allows for specifying a device by label or uuid, rather than by
-//config:         name. This feature utilizes the same functionality as blkid/findfs.
-//config:         This also enables label or uuid support for swapon.
+//config:       This allows for specifying a device by label or uuid, rather than by
+//config:       name. This feature utilizes the same functionality as blkid/findfs.
+//config:       This also enables label or uuid support for swapon.
 //config:
 //config:config FEATURE_MOUNT_NFS
 //config:       bool "Support mounting NFS file systems on Linux < 2.6.23"
@@ -74,43 +74,43 @@
 //config:       select FEATURE_HAVE_RPC
 //config:       select FEATURE_SYSLOG
 //config:       help
-//config:         Enable mounting of NFS file systems on Linux kernels prior
-//config:         to version 2.6.23. Note that in this case mounting of NFS
-//config:         over IPv6 will not be possible.
+//config:       Enable mounting of NFS file systems on Linux kernels prior
+//config:       to version 2.6.23. Note that in this case mounting of NFS
+//config:       over IPv6 will not be possible.
 //config:
-//config:         Note that this option links in RPC support from libc,
-//config:         which is rather large (~10 kbytes on uclibc).
+//config:       Note that this option links in RPC support from libc,
+//config:       which is rather large (~10 kbytes on uclibc).
 //config:
 //config:config FEATURE_MOUNT_CIFS
 //config:       bool "Support mounting CIFS/SMB file systems"
 //config:       default y
 //config:       depends on MOUNT
 //config:       help
-//config:         Enable support for samba mounts.
+//config:       Enable support for samba mounts.
 //config:
 //config:config FEATURE_MOUNT_FLAGS
 //config:       depends on MOUNT
 //config:       bool "Support lots of -o flags"
 //config:       default y
 //config:       help
-//config:         Without this, mount only supports ro/rw/remount. With this, it
-//config:         supports nosuid, suid, dev, nodev, exec, noexec, sync, async, atime,
-//config:         noatime, diratime, nodiratime, loud, bind, move, shared, slave,
-//config:         private, unbindable, rshared, rslave, rprivate, and runbindable.
+//config:       Without this, mount only supports ro/rw/remount. With this, it
+//config:       supports nosuid, suid, dev, nodev, exec, noexec, sync, async, atime,
+//config:       noatime, diratime, nodiratime, loud, bind, move, shared, slave,
+//config:       private, unbindable, rshared, rslave, rprivate, and runbindable.
 //config:
 //config:config FEATURE_MOUNT_FSTAB
 //config:       depends on MOUNT
 //config:       bool "Support /etc/fstab and -a"
 //config:       default y
 //config:       help
-//config:         Support mount all and looking for files in /etc/fstab.
+//config:       Support mount all and looking for files in /etc/fstab.
 //config:
 //config:config FEATURE_MOUNT_OTHERTAB
 //config:       depends on FEATURE_MOUNT_FSTAB
 //config:       bool "Support -T <alt_fstab>"
 //config:       default y
 //config:       help
-//config:         Support mount -T (specifying an alternate fstab)
+//config:       Support mount -T (specifying an alternate fstab)
 
 /* On full-blown systems, requires suid for user mounts.
  * But it's not unthinkable to have it available in non-suid flavor on some systems,
diff --git a/util-linux/mountpoint.c b/util-linux/mountpoint.c
index 8b9e1d779..b7f048196 100644
--- a/util-linux/mountpoint.c
+++ b/util-linux/mountpoint.c
@@ -9,10 +9,10 @@
  * Based on sysvinit's mountpoint
  */
 //config:config MOUNTPOINT
-//config:       bool "mountpoint"
+//config:       bool "mountpoint (4.5 kb)"
 //config:       default y
 //config:       help
-//config:         mountpoint checks if the directory is a mountpoint.
+//config:       mountpoint checks if the directory is a mountpoint.
 
 //applet:IF_MOUNTPOINT(APPLET(mountpoint, BB_DIR_BIN, BB_SUID_DROP))
 
diff --git a/util-linux/nsenter.c b/util-linux/nsenter.c
index 57b218dab..12c86b0ed 100644
--- a/util-linux/nsenter.c
+++ b/util-linux/nsenter.c
@@ -8,19 +8,19 @@
  */
 
 //config:config NSENTER
-//config:       bool "nsenter"
+//config:       bool "nsenter (8.6 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         Run program with namespaces of other processes.
+//config:       Run program with namespaces of other processes.
 //config:
 //config:config FEATURE_NSENTER_LONG_OPTS
 //config:       bool "Enable long options"
 //config:       default y
 //config:       depends on NSENTER && LONG_OPTS
 //config:       help
-//config:         Support long options for the nsenter applet. This makes
-//config:         the busybox implementation more compatible with upstream.
+//config:       Support long options for the nsenter applet. This makes
+//config:       the busybox implementation more compatible with upstream.
 
 //applet:IF_NSENTER(APPLET(nsenter, BB_DIR_USR_BIN, BB_SUID_DROP))
 
diff --git a/util-linux/pivot_root.c b/util-linux/pivot_root.c
index 9bdae506c..331038057 100644
--- a/util-linux/pivot_root.c
+++ b/util-linux/pivot_root.c
@@ -9,17 +9,17 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config PIVOT_ROOT
-//config:       bool "pivot_root"
+//config:       bool "pivot_root (898 bytes)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         The pivot_root utility swaps the mount points for the root filesystem
-//config:         with some other mounted filesystem. This allows you to do all sorts
-//config:         of wild and crazy things with your Linux system and is far more
-//config:         powerful than 'chroot'.
+//config:       The pivot_root utility swaps the mount points for the root filesystem
+//config:       with some other mounted filesystem. This allows you to do all sorts
+//config:       of wild and crazy things with your Linux system and is far more
+//config:       powerful than 'chroot'.
 //config:
-//config:         Note: This is for initrd in linux 2.4. Under initramfs (introduced
-//config:         in linux 2.6) use switch_root instead.
+//config:       Note: This is for initrd in linux 2.4. Under initramfs (introduced
+//config:       in linux 2.6) use switch_root instead.
 
 //applet:IF_PIVOT_ROOT(APPLET(pivot_root, BB_DIR_SBIN, BB_SUID_DROP))
 
diff --git a/util-linux/rdate.c b/util-linux/rdate.c
index 960df25d2..66b877e24 100644
--- a/util-linux/rdate.c
+++ b/util-linux/rdate.c
@@ -8,13 +8,13 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config RDATE
-//config:       bool "rdate"
+//config:       bool "rdate (6 kb)"
 //config:       default y
 //config:       help
-//config:         The rdate utility allows you to synchronize the date and time of your
-//config:         system clock with the date and time of a remote networked system using
-//config:         the RFC868 protocol, which is built into the inetd daemon on most
-//config:         systems.
+//config:       The rdate utility allows you to synchronize the date and time of your
+//config:       system clock with the date and time of a remote networked system using
+//config:       the RFC868 protocol, which is built into the inetd daemon on most
+//config:       systems.
 
 //applet:IF_RDATE(APPLET(rdate, BB_DIR_USR_SBIN, BB_SUID_DROP))
 
diff --git a/util-linux/rdev.c b/util-linux/rdev.c
index 0e1578e33..2ffe07688 100644
--- a/util-linux/rdev.c
+++ b/util-linux/rdev.c
@@ -9,10 +9,10 @@
  *
  */
 //config:config RDEV
-//config:       bool "rdev"
+//config:       bool "rdev (1.4 kb)"
 //config:       default y
 //config:       help
-//config:         Print the device node associated with the filesystem mounted at '/'.
+//config:       Print the device node associated with the filesystem mounted at '/'.
 
 //applet:IF_RDEV(APPLET(rdev, BB_DIR_USR_SBIN, BB_SUID_DROP))
 
diff --git a/util-linux/readprofile.c b/util-linux/readprofile.c
index 31abb6bb2..b045657d8 100644
--- a/util-linux/readprofile.c
+++ b/util-linux/readprofile.c
@@ -32,11 +32,11 @@
  * Paul Mundt <lethal@linux-sh.org>.
  */
 //config:config READPROFILE
-//config:       bool "readprofile"
+//config:       bool "readprofile (7.2 kb)"
 //config:       default y
 //config:       #select PLATFORM_LINUX
 //config:       help
-//config:         This allows you to parse /proc/profile for basic profiling.
+//config:       This allows you to parse /proc/profile for basic profiling.
 
 //applet:IF_READPROFILE(APPLET(readprofile, BB_DIR_USR_SBIN, BB_SUID_DROP))
 
diff --git a/util-linux/renice.c b/util-linux/renice.c
index 4da3394a8..23cbca88d 100644
--- a/util-linux/renice.c
+++ b/util-linux/renice.c
@@ -19,11 +19,11 @@
  *   following IDs (if any).  Multiple switches are allowed.
  */
 //config:config RENICE
-//config:       bool "renice"
+//config:       bool "renice (3.8 kb)"
 //config:       default y
 //config:       help
-//config:         Renice alters the scheduling priority of one or more running
-//config:         processes.
+//config:       Renice alters the scheduling priority of one or more running
+//config:       processes.
 
 //applet:IF_RENICE(APPLET(renice, BB_DIR_USR_BIN, BB_SUID_DROP))
 
diff --git a/util-linux/rev.c b/util-linux/rev.c
index d34838a35..b0a0c01aa 100644
--- a/util-linux/rev.c
+++ b/util-linux/rev.c
@@ -6,10 +6,10 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config REV
-//config:       bool "rev"
+//config:       bool "rev (4.5 kb)"
 //config:       default y
 //config:       help
-//config:         Reverse lines of a file or files.
+//config:       Reverse lines of a file or files.
 
 //applet:IF_REV(APPLET(rev, BB_DIR_BIN, BB_SUID_DROP))
 
diff --git a/util-linux/rtcwake.c b/util-linux/rtcwake.c
index b63164588..4c47c5369 100644
--- a/util-linux/rtcwake.c
+++ b/util-linux/rtcwake.c
@@ -23,11 +23,11 @@
  * That flag should not be needed on systems with adjtime support.
  */
 //config:config RTCWAKE
-//config:       bool "rtcwake"
+//config:       bool "rtcwake (6.4 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         Enter a system sleep state until specified wakeup time.
+//config:       Enter a system sleep state until specified wakeup time.
 
 //applet:IF_RTCWAKE(APPLET(rtcwake, BB_DIR_USR_SBIN, BB_SUID_DROP))
 
diff --git a/util-linux/script.c b/util-linux/script.c
index c5063e8a1..9eebb51a4 100644
--- a/util-linux/script.c
+++ b/util-linux/script.c
@@ -11,10 +11,10 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config SCRIPT
-//config:       bool "script"
+//config:       bool "script (8 kb)"
 //config:       default y
 //config:       help
-//config:         The script makes typescript of terminal session.
+//config:       The script makes typescript of terminal session.
 
 //applet:IF_SCRIPT(APPLET(script, BB_DIR_USR_BIN, BB_SUID_DROP))
 
diff --git a/util-linux/scriptreplay.c b/util-linux/scriptreplay.c
index 8a0c7489d..7e9850103 100644
--- a/util-linux/scriptreplay.c
+++ b/util-linux/scriptreplay.c
@@ -8,11 +8,11 @@
  *
  */
 //config:config SCRIPTREPLAY
-//config:       bool "scriptreplay"
+//config:       bool "scriptreplay (2.6 kb)"
 //config:       default y
 //config:       help
-//config:         This program replays a typescript, using timing information
-//config:         given by script -t.
+//config:       This program replays a typescript, using timing information
+//config:       given by script -t.
 
 //applet:IF_SCRIPTREPLAY(APPLET(scriptreplay, BB_DIR_BIN, BB_SUID_DROP))
 
diff --git a/util-linux/setarch.c b/util-linux/setarch.c
index e4124b044..d4b568832 100644
--- a/util-linux/setarch.c
+++ b/util-linux/setarch.c
@@ -7,28 +7,28 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config SETARCH
-//config:       bool "setarch"
+//config:       bool "setarch (3.4 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         The linux32 utility is used to create a 32bit environment for the
-//config:         specified program (usually a shell). It only makes sense to have
-//config:         this util on a system that supports both 64bit and 32bit userland
-//config:         (like amd64/x86, ppc64/ppc, sparc64/sparc, etc...).
+//config:       The linux32 utility is used to create a 32bit environment for the
+//config:       specified program (usually a shell). It only makes sense to have
+//config:       this util on a system that supports both 64bit and 32bit userland
+//config:       (like amd64/x86, ppc64/ppc, sparc64/sparc, etc...).
 //config:
 //config:config LINUX32
-//config:       bool "linux32"
+//config:       bool "linux32 (3.2 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         Alias to "setarch linux32".
+//config:       Alias to "setarch linux32".
 //config:
 //config:config LINUX64
-//config:       bool "linux64"
+//config:       bool "linux64 (3.2 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         Alias to "setarch linux64".
+//config:       Alias to "setarch linux64".
 
 //applet:IF_SETARCH(APPLET(setarch, BB_DIR_BIN, BB_SUID_DROP))
 //                  APPLET_ODDNAME:name     main     location    suid_type     help
diff --git a/util-linux/setpriv.c b/util-linux/setpriv.c
index 3d8dfea52..0f85428ab 100644
--- a/util-linux/setpriv.c
+++ b/util-linux/setpriv.c
@@ -8,41 +8,41 @@
  *
  */
 //config:config SETPRIV
-//config:       bool "setpriv"
+//config:       bool "setpriv (3.4 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       select LONG_OPTS
 //config:       help
-//config:         Run a program with different Linux privilege settings.
-//config:         Requires kernel >= 3.5
+//config:       Run a program with different Linux privilege settings.
+//config:       Requires kernel >= 3.5
 //config:
 //config:config FEATURE_SETPRIV_DUMP
 //config:       bool "Support dumping current privilege state"
 //config:       default y
 //config:       depends on SETPRIV
 //config:       help
-//config:         Enables the "--dump" switch to print out the current privilege
-//config:         state. This is helpful for diagnosing problems.
+//config:       Enables the "--dump" switch to print out the current privilege
+//config:       state. This is helpful for diagnosing problems.
 //config:
 //config:config FEATURE_SETPRIV_CAPABILITIES
 //config:       bool "Support capabilities"
 //config:       default y
 //config:       depends on SETPRIV
 //config:       help
-//config:         Capabilities can be used to grant processes additional rights
-//config:         without the necessity to always execute as the root user.
-//config:         Enabling this option enables "--dump" to show information on
-//config:         capabilities.
+//config:       Capabilities can be used to grant processes additional rights
+//config:       without the necessity to always execute as the root user.
+//config:       Enabling this option enables "--dump" to show information on
+//config:       capabilities.
 //config:
 //config:config FEATURE_SETPRIV_CAPABILITY_NAMES
 //config:       bool "Support capability names"
 //config:       default y
 //config:       depends on SETPRIV && FEATURE_SETPRIV_CAPABILITIES
 //config:       help
-//config:         Capabilities can be either referenced via a human-readble name,
-//config:         e.g. "net_admin", or using their index, e.g. "cap_12". Enabling
-//config:         this option allows using the human-readable names in addition to
-//config:         the index-based names.
+//config:       Capabilities can be either referenced via a human-readble name,
+//config:       e.g. "net_admin", or using their index, e.g. "cap_12". Enabling
+//config:       this option allows using the human-readable names in addition to
+//config:       the index-based names.
 
 //applet:IF_SETPRIV(APPLET(setpriv, BB_DIR_BIN, BB_SUID_DROP))
 
diff --git a/util-linux/setsid.c b/util-linux/setsid.c
index 143a8f8fa..60cab2fcf 100644
--- a/util-linux/setsid.c
+++ b/util-linux/setsid.c
@@ -14,10 +14,10 @@
  * - busyboxed
  */
 //config:config SETSID
-//config:       bool "setsid"
+//config:       bool "setsid (3.9 kb)"
 //config:       default y
 //config:       help
-//config:         setsid runs a program in a new session
+//config:       setsid runs a program in a new session
 
 //applet:IF_SETSID(APPLET(setsid, BB_DIR_USR_BIN, BB_SUID_DROP))
 
diff --git a/util-linux/swaponoff.c b/util-linux/swaponoff.c
index 313ea0ef9..bda0687d6 100644
--- a/util-linux/swaponoff.c
+++ b/util-linux/swaponoff.c
@@ -7,39 +7,36 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config SWAPON
-//config:       bool "swapon"
+//config:       bool "swapon (4.9 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         This option enables the 'swapon' utility.
-//config:         Once you have created some swap space using 'mkswap', you also need
-//config:         to enable your swap space with the 'swapon' utility. The 'swapoff'
-//config:         utility is used, typically at system shutdown, to disable any swap
-//config:         space. If you are not using any swap space, you can leave this
-//config:         option disabled.
+//config:       Once you have created some swap space using 'mkswap', you also need
+//config:       to enable your swap space with the 'swapon' utility. The 'swapoff'
+//config:       utility is used, typically at system shutdown, to disable any swap
+//config:       space. If you are not using any swap space, you can leave this
+//config:       option disabled.
 //config:
 //config:config FEATURE_SWAPON_DISCARD
 //config:       bool "Support discard option -d"
 //config:       default y
 //config:       depends on SWAPON
 //config:       help
-//config:         Enable support for discarding swap area blocks at swapon and/or as
-//config:         the kernel frees them. This option enables both the -d option on
-//config:         'swapon' and the 'discard' option for swap entries in /etc/fstab.
+//config:       Enable support for discarding swap area blocks at swapon and/or as
+//config:       the kernel frees them. This option enables both the -d option on
+//config:       'swapon' and the 'discard' option for swap entries in /etc/fstab.
 //config:
 //config:config FEATURE_SWAPON_PRI
 //config:       bool "Support priority option -p"
 //config:       default y
 //config:       depends on SWAPON
 //config:       help
-//config:         Enable support for setting swap device priority in swapon.
+//config:       Enable support for setting swap device priority in swapon.
 //config:
 //config:config SWAPOFF
-//config:       bool "swapoff"
+//config:       bool "swapoff (4.3 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
-//config:       help
-//config:         This option enables the 'swapoff' utility.
 
 //                  APPLET_ODDNAME:name     main         location     suid_type     help
 //applet:IF_SWAPON( APPLET_ODDNAME(swapon,  swap_on_off, BB_DIR_SBIN, BB_SUID_DROP, swapon))
diff --git a/util-linux/switch_root.c b/util-linux/switch_root.c
index f18e8a5ce..32708934e 100644
--- a/util-linux/switch_root.c
+++ b/util-linux/switch_root.c
@@ -6,24 +6,24 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config SWITCH_ROOT
-//config:       bool "switch_root"
+//config:       bool "switch_root (5.2 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         The switch_root utility is used from initramfs to select a new
-//config:         root device. Under initramfs, you have to use this instead of
-//config:         pivot_root. (Stop reading here if you don't care why.)
+//config:       The switch_root utility is used from initramfs to select a new
+//config:       root device. Under initramfs, you have to use this instead of
+//config:       pivot_root. (Stop reading here if you don't care why.)
 //config:
-//config:         Booting with initramfs extracts a gzipped cpio archive into rootfs
-//config:         (which is a variant of ramfs/tmpfs). Because rootfs can't be moved
-//config:         or unmounted*, pivot_root will not work from initramfs. Instead,
-//config:         switch_root deletes everything out of rootfs (including itself),
-//config:         does a mount --move that overmounts rootfs with the new root, and
-//config:         then execs the specified init program.
+//config:       Booting with initramfs extracts a gzipped cpio archive into rootfs
+//config:       (which is a variant of ramfs/tmpfs). Because rootfs can't be moved
+//config:       or unmounted*, pivot_root will not work from initramfs. Instead,
+//config:       switch_root deletes everything out of rootfs (including itself),
+//config:       does a mount --move that overmounts rootfs with the new root, and
+//config:       then execs the specified init program.
 //config:
-//config:         * Because the Linux kernel uses rootfs internally as the starting
-//config:         and ending point for searching through the kernel's doubly linked
-//config:         list of active mount points. That's why.
+//config:       * Because the Linux kernel uses rootfs internally as the starting
+//config:       and ending point for searching through the kernel's doubly linked
+//config:       list of active mount points. That's why.
 
 //applet:IF_SWITCH_ROOT(APPLET(switch_root, BB_DIR_SBIN, BB_SUID_DROP))
 
diff --git a/util-linux/taskset.c b/util-linux/taskset.c
index 94a07383a..9957b1a71 100644
--- a/util-linux/taskset.c
+++ b/util-linux/taskset.c
@@ -7,20 +7,20 @@
  */
 
 //config:config TASKSET
-//config:       bool "taskset"
+//config:       bool "taskset (4.1 kb)"
 //config:       default y
 //config:       help
-//config:         Retrieve or set a processes's CPU affinity.
-//config:         This requires sched_{g,s}etaffinity support in your libc.
+//config:       Retrieve or set a processes's CPU affinity.
+//config:       This requires sched_{g,s}etaffinity support in your libc.
 //config:
 //config:config FEATURE_TASKSET_FANCY
 //config:       bool "Fancy output"
 //config:       default y
 //config:       depends on TASKSET
 //config:       help
-//config:         Needed for machines with more than 32-64 CPUs:
-//config:         affinity parameter 0xHHHHHHHHHHHHHHHHHHHH can be arbitrarily long
-//config:         in this case. Otherwise, it is limited to sizeof(long).
+//config:       Needed for machines with more than 32-64 CPUs:
+//config:       affinity parameter 0xHHHHHHHHHHHHHHHHHHHH can be arbitrarily long
+//config:       in this case. Otherwise, it is limited to sizeof(long).
 
 //applet:IF_TASKSET(APPLET(taskset, BB_DIR_USR_BIN, BB_SUID_DROP))
 //kbuild:lib-$(CONFIG_TASKSET) += taskset.o
diff --git a/util-linux/uevent.c b/util-linux/uevent.c
index c22216a8a..252e8fb64 100644
--- a/util-linux/uevent.c
+++ b/util-linux/uevent.c
@@ -4,12 +4,12 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config UEVENT
-//config:       bool "uevent"
+//config:       bool "uevent (3.2 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         uevent is a netlink listener for kernel uevent notifications
-//config:         sent via netlink. It is usually used for dynamic device creation.
+//config:       uevent is a netlink listener for kernel uevent notifications
+//config:       sent via netlink. It is usually used for dynamic device creation.
 
 //applet:IF_UEVENT(APPLET(uevent, BB_DIR_SBIN, BB_SUID_DROP))
 
diff --git a/util-linux/umount.c b/util-linux/umount.c
index 0c50dc9ee..31bf671c1 100644
--- a/util-linux/umount.c
+++ b/util-linux/umount.c
@@ -8,21 +8,21 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config UMOUNT
-//config:       bool "umount"
+//config:       bool "umount (4.5 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         When you want to remove a mounted filesystem from its current mount
-//config:         point, for example when you are shutting down the system, the
-//config:         'umount' utility is the tool to use. If you enabled the 'mount'
-//config:         utility, you almost certainly also want to enable 'umount'.
+//config:       When you want to remove a mounted filesystem from its current mount
+//config:       point, for example when you are shutting down the system, the
+//config:       'umount' utility is the tool to use. If you enabled the 'mount'
+//config:       utility, you almost certainly also want to enable 'umount'.
 //config:
 //config:config FEATURE_UMOUNT_ALL
 //config:       bool "Support option -a"
 //config:       default y
 //config:       depends on UMOUNT
 //config:       help
-//config:         Support -a option to unmount all currently mounted filesystems.
+//config:       Support -a option to unmount all currently mounted filesystems.
 
 //applet:IF_UMOUNT(APPLET(umount, BB_DIR_BIN, BB_SUID_DROP))
 
diff --git a/util-linux/unshare.c b/util-linux/unshare.c
index 875e3f86e..e7b95c72b 100644
--- a/util-linux/unshare.c
+++ b/util-linux/unshare.c
@@ -7,13 +7,13 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config UNSHARE
-//config:       bool "unshare"
+//config:       bool "unshare (9.2 kb)"
 //config:       default y
 //config:       depends on !NOMMU
 //config:       select PLATFORM_LINUX
 //config:       select LONG_OPTS
 //config:       help
-//config:         Run program with some namespaces unshared from parent.
+//config:       Run program with some namespaces unshared from parent.
 
 // needs LONG_OPTS: it is awkward to exclude code which handles --propagation
 // and --setgroups based on LONG_OPTS, so instead applet requires LONG_OPTS.
diff --git a/util-linux/volume_id/exfat.c b/util-linux/volume_id/exfat.c
index 7ed13a70e..14bf9d691 100644
--- a/util-linux/volume_id/exfat.c
+++ b/util-linux/volume_id/exfat.c
@@ -25,9 +25,9 @@
 //config:       default y
 //config:       depends on VOLUMEID
 //config:       help
-//config:         exFAT (extended FAT) is a proprietary file system designed especially
-//config:         for flash drives. It has many features from NTFS, but with less
-//config:         overhead. exFAT is used on most SDXC cards for consumer electronics.
+//config:       exFAT (extended FAT) is a proprietary file system designed especially
+//config:       for flash drives. It has many features from NTFS, but with less
+//config:       overhead. exFAT is used on most SDXC cards for consumer electronics.
 
 #include "volume_id_internal.h"
 
diff --git a/util-linux/volume_id/f2fs.c b/util-linux/volume_id/f2fs.c
index 1d3bdae36..3027f178e 100644
--- a/util-linux/volume_id/f2fs.c
+++ b/util-linux/volume_id/f2fs.c
@@ -13,10 +13,10 @@
 //config:       default y
 //config:       depends on VOLUMEID
 //config:       help
-//config:         F2FS (aka Flash-Friendly File System) is a log-structured file system,
-//config:         which is adapted to newer forms of storage. F2FS also remedies some
-//config:         known issues of the older log structured file systems, such as high
-//config:         cleaning overhead.
+//config:       F2FS (aka Flash-Friendly File System) is a log-structured file system,
+//config:       which is adapted to newer forms of storage. F2FS also remedies some
+//config:       known issues of the older log structured file systems, such as high
+//config:       cleaning overhead.
 
 #include "volume_id_internal.h"
 
diff --git a/util-linux/volume_id/nilfs.c b/util-linux/volume_id/nilfs.c
index ffe919f36..9d6c57fba 100644
--- a/util-linux/volume_id/nilfs.c
+++ b/util-linux/volume_id/nilfs.c
@@ -26,16 +26,16 @@
 //config:       default y
 //config:       depends on VOLUMEID
 //config:       help
-//config:         NILFS is a New Implementation of a Log-Structured File System (LFS)
-//config:         that supports continuous snapshots. This provides features like
-//config:         versioning of the entire filesystem, restoration of files that
-//config:         were deleted a few minutes ago. NILFS keeps consistency like
-//config:         conventional LFS, so it provides quick recovery after system crashes.
+//config:       NILFS is a New Implementation of a Log-Structured File System (LFS)
+//config:       that supports continuous snapshots. This provides features like
+//config:       versioning of the entire filesystem, restoration of files that
+//config:       were deleted a few minutes ago. NILFS keeps consistency like
+//config:       conventional LFS, so it provides quick recovery after system crashes.
 //config:
-//config:         The possible use of NILFS includes versioning, tamper detection,
-//config:         SOX compliance logging, and so forth. It can serve as an alternative
-//config:         filesystem for Linux desktop environment, or as a basis of advanced
-//config:         storage appliances.
+//config:       The possible use of NILFS includes versioning, tamper detection,
+//config:       SOX compliance logging, and so forth. It can serve as an alternative
+//config:       filesystem for Linux desktop environment, or as a basis of advanced
+//config:       storage appliances.
 
 #include "volume_id_internal.h"
 
diff --git a/util-linux/volume_id/squashfs.c b/util-linux/volume_id/squashfs.c
index 6bba199cd..e3ffce35e 100644
--- a/util-linux/volume_id/squashfs.c
+++ b/util-linux/volume_id/squashfs.c
@@ -13,10 +13,10 @@
 //config:       default y
 //config:       depends on VOLUMEID && FEATURE_BLKID_TYPE
 //config:       help
-//config:         Squashfs is a compressed read-only filesystem for Linux. Squashfs is
-//config:         intended for general read-only filesystem use and in constrained block
-//config:         device/memory systems (e.g. embedded systems) where low overhead is
-//config:         needed.
+//config:       Squashfs is a compressed read-only filesystem for Linux. Squashfs is
+//config:       intended for general read-only filesystem use and in constrained block
+//config:       device/memory systems (e.g. embedded systems) where low overhead is
+//config:       needed.
 
 #include "volume_id_internal.h"
 
diff --git a/util-linux/volume_id/ubifs.c b/util-linux/volume_id/ubifs.c
index 99b0aa830..7512b84b0 100644
--- a/util-linux/volume_id/ubifs.c
+++ b/util-linux/volume_id/ubifs.c
@@ -13,8 +13,8 @@
 //config:       default y
 //config:       depends on VOLUMEID
 //config:       help
-//config:         UBIFS (Unsorted Block Image File System) is a file
-//config:         system for use with raw flash memory media.
+//config:       UBIFS (Unsorted Block Image File System) is a file
+//config:       system for use with raw flash memory media.
 
 #include "volume_id_internal.h"
 
diff --git a/util-linux/wall.c b/util-linux/wall.c
index 50658f457..e214d8c3f 100644
--- a/util-linux/wall.c
+++ b/util-linux/wall.c
@@ -7,11 +7,11 @@
  */
 
 //config:config WALL
-//config:       bool "wall"
+//config:       bool "wall (2.5 kb)"
 //config:       default y
 //config:       depends on FEATURE_UTMP
 //config:       help
-//config:         Write a message to all users that are logged in.
+//config:       Write a message to all users that are logged in.
 
 /* Needs to be run by root or be suid root - needs to write to /dev/TTY: */
 //applet:IF_WALL(APPLET(wall, BB_DIR_USR_BIN, BB_SUID_REQUIRE))