diff --git a/docs/Configure.help b/docs/Configure.help
index e69a28f74..8ba638b68 100644
--- a/docs/Configure.help
+++ b/docs/Configure.help
@@ -31,15 +31,58 @@
 # option.
 #
 
+Show verbose applets usage message
+CONFIG_FEATURE_VERBOSE_USAGE
+  All BusyBox applets will show more verbose help messages when
+  busybox is invoked with --help.  This will add lots 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.
+
+Enable automatic symlink creation for BusyBox built-in applets
+CONFIG_FEATURE_INSTALLER
+  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.  This feature requires the
+  /proc filesystem.
+
+Locale support
+CONFIG_LOCALE_SUPPORT
+  Enable this if your system has locale support, and you would like
+  busybox to support locale settings.
+
+Enable devfs support
+CONFIG_FEATURE_DEVFS
+  Enable if you want BusyBox to work with devfs.
+
+Clean up all memory before exiting
+CONFIG_FEATURE_CLEAN_UP
+  As a size optimization, busybox by default does not cleanup memory
+  that is dynamically allocated or close files before exiting. This
+  saves space and is usually not needed since the OS will clean up for
+  us.  Don't enable this unless you have a really good reason to clean
+  things up manually.
+
+Buffers allocation policy
+CONFIG_FEATURE_BUFFERS_USE_MALLOC
+  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.
+
 Enable the ar applet
 CONFIG_AR
-  ar is an archival utility program used to creates, modify, and
+  ar is an archival utility program used to create, modify, and
   extract contents from archives.  An archive is a single file holding
   a collection of other files in a structure that makes it possible to
-  retrieve the original individual files (called archive members).  The
-  original files' contents, mode (permissions), timestamp, owner, and
-  group are preserved in the archive, and can be restored on
-  extraction.  On an x86 system, the ar applet adds about XXX bytes.
+  retrieve the original individual files (called archive members).
+  The original files' contents, mode (permissions), timestamp, owner,
+  and group are preserved in the archive, and can be restored on
+  extraction.  
+  On an x86 system, the ar applet adds about XXX bytes.
 
   Unless you have a specific application which requires ar, you should
   probably say N here.
@@ -64,8 +107,8 @@ Enable the run-parts applet
 CONFIG_RUN_PARTS
   run-parts is an utility designed to run all the scripts in a directory.
 
-  It is useful to set up directory like cron.daily, where we have to
-  execute all the script contained.
+  It is useful to set up a directory like cron.daily, where you need to
+  execute all the scripts in that directory.
 
   This implementation of run-parts doesn't accept long options, and
   some features (like report mode) aren't implemented.
diff --git a/editors/config.in b/editors/config.in
index 81d907b0c..2d0bb3782 100644
--- a/editors/config.in
+++ b/editors/config.in
@@ -15,7 +15,7 @@ if [ "$CONFIG_VI" = "y" ]; then
     bool '  Catch signals'				CONFIG_FEATURE_VI_USE_SIGNALS
     bool '  Remember previous cmd and "." cmd'		CONFIG_FEATURE_VI_DOT_CMD
     bool '  Enable -R option and "view" mode'		CONFIG_FEATURE_VI_READONLY
-    bool '  Enable set-able options, ai ic showmatch'	CONFIG_FEATURE_VI_SETOPT
+    bool '  Enable set-able options, ai ic showmatch'	CONFIG_FEATURE_VI_SETOPTS
     bool '  Support for :set'				CONFIG_FEATURE_VI_SET
     bool '  Handle window resize'			CONFIG_FEATURE_VI_WIN_RESIZE
     bool '  Optimize cursor movement'			CONFIG_FEATURE_VI_OPTIMIZE_CURSOR
diff --git a/sysdeps/linux/config.in b/sysdeps/linux/config.in
index 479d1a3cc..cdc9018fd 100644
--- a/sysdeps/linux/config.in
+++ b/sysdeps/linux/config.in
@@ -4,6 +4,19 @@
 #
 mainmenu_name "BusyBox Configuration"
 
+mainmenu_option next_comment
+comment 'BusyBox general settings'
+bool 'Show verbose applet usage messages (increases size)'		CONFIG_FEATURE_VERBOSE_USAGE
+bool 'Support --install [-s] to install applet links at runtime' 	CONFIG_FEATURE_INSTALLER
+bool 'Enable locale support (system needs locale for this to work)'		CONFIG_LOCALE_SUPPORT
+bool 'Support for devfs'							CONFIG_FEATURE_DEVFS
+bool 'Clean up all memory before exiting (usually not needed)'		CONFIG_FEATURE_CLEAN_UP
+choice 'Buffer allocation policy' \
+    "use_malloc	CONFIG_FEATURE_BUFFERS_USE_MALLOC \
+	 on_stack	CONFIG_FEATURE_BUFFERS_GO_ON_STACK \
+	 in_bss		CONFIG_FEATURE_BUFFERS_GO_IN_BSS" use_malloc
+
+endmenu
 
 source archival/config.in
 source console-tools/config.in