diff --git a/ChangeLog.txt b/ChangeLog.txt
index d8ed157b2..81a5843aa 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1645,3 +1645,13 @@
 	* Add _ to front of debug macros (2016-06-16).
 	* SYSLOG: Remove llinfo(), *llwarn(), and llerr().  These are no longer
 	  supported in the redesigned syslog() logic (2016-06-20).
+	* apps/canutils/libcanard: update version.  From Paul Alexander Patience
+	  (2016-06-22).
+	* apps/examples/can: Some variables were not declared in all required
+	  cases. From Sebastien Lorquet (2016-06-23).
+	* apps/gpsutils/minmean: Fix minmea Makefile to find the libapp at the
+	  apps/.  From Alan Carvalho de Assis (2016-06-23).
+	* apps/canutils/canlib: Basic CAN utility library. From Sebastien Lorquet
+	  (2016-06-24).
+	* apps/nshlib/Kconfig:  Move NSH stuff out of nuttx/configs/Kconfig to
+	  here.  Why was it in the NuttX tree in the first place? (2016-06-24).
diff --git a/nshlib/Kconfig b/nshlib/Kconfig
index c19b304f8..9443feae0 100644
--- a/nshlib/Kconfig
+++ b/nshlib/Kconfig
@@ -509,6 +509,34 @@ config NSH_DISABLE_XD
 
 endmenu
 
+if MMCSD
+
+config NSH_MMCSDMINOR
+	int "MMC/SD minor number"
+	default 0
+	---help---
+		If board-specific NSH start-up logic needs to mount an MMC/SD device, then the
+		setting should be provided to identify the MMC/SD minor device number (i.e., the N ini
+		/dev/mmcsdN).  Default 0
+
+config NSH_MMCSDSLOTNO
+	int "MMC/SD slot number"
+	default 0
+	---help---
+		If board-specific NSH start-up supports more than one MMC/SD slot, then this setting
+		should be provided to indicate which slot should be used.  Default: 0.
+
+config NSH_MMCSDSPIPORTNO
+	int "MMC/SD SPI device number"
+	default 0
+	depends on MMCSD_SPI
+	---help---
+		If board-specif NSH start-up logic will mount an SPI-based MMC/SD volume, then this
+		setting may be needed to tell the board logic which SPI bus to use.  Default: 0
+		(meaning is board-specific).
+
+endif # MMCSD
+
 menu "Configure Command Options"
 
 config NSH_CMDOPT_DF_H