diff --git a/ChangeLog.txt b/ChangeLog.txt
index f8ba10f72..71f7da62a 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -572,3 +572,5 @@
 	  clean .dSYM files in directories where .exe may be built (2013-5-30).
 	* apps/examples/nrf35l01_term: Add an example application to demo the
 	  nRF24L01 driver.  From Laurent Latil (2013-6-1).
+	* apps/nshlib/Kconfig:  Add some missing NSH configuration values.
+	  From Lorenz Meier (2013-6-2).
diff --git a/nshlib/Kconfig b/nshlib/Kconfig
index 72041ec76..ded9f2e67 100644
--- a/nshlib/Kconfig
+++ b/nshlib/Kconfig
@@ -252,6 +252,13 @@ config NSH_LINELEN
 		The maximum length of one command line and of one output line.
 		Default: 80
 
+config NSH_MAXARGUMENTS
+	int "Maximum number of command arguments"
+	default 6
+	---help---
+		The maximum number of NSH command arguments.
+		Default: 6
+
 config NSH_NESTDEPTH
 	int "Maximum command nesting"
 	default 3
@@ -354,6 +361,16 @@ config NSH_ROMFSSECTSIZE
 		increased if the ROMFS volume were to be become large.  Any value
 		selected must be a power of 2.
 
+config NSH_ARCHROMFS
+	bool "Architecture-specific ROMFS header"
+	default n
+	depends on NSH_ROMFSETC
+	---help---
+		Enable this option to provide an architecture-specific ROMFS
+		header at <arch/board/nsh_romfsimg.h>. Note that this header
+		will be copied from nuttx/configs/<boardname>/include and should
+		be stored at this location.
+
 config NSH_FATDEVNO
 	int "FAT block device minor number"
 	default 0