diff --git a/ChangeLog b/ChangeLog
index 8aacbb0b2d6..6ef755bde06 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6942,5 +6942,7 @@
 	  winbuild) with the latest Kconfig files (2014-3-6).
 	* configs/viewtool-stm32f107:  Refresh all configurations with the
 	  latest Kconfig files (2014-3-6).
-	* configs/16z, mikroe-stm32f4, olimex-lpc1766stk, sim, and
-	  stm32f429i-disco: Refresh all configurations (2014-3-6).
+	* configs/16z, mikroe-stm32f4, olimex-lpc1766stk, px4fmu-v2_upstream,
+	  sim, and stm32f429i-disco: Refresh all configurations (2014-3-6).
+	* Documentation/NuttShell.html:  Update per recommendations from Max\
+	  Kriegleder (2014-3-6).
diff --git a/Documentation/NuttShell.html b/Documentation/NuttShell.html
index 21facc51ac2..89318909641 100644
--- a/Documentation/NuttShell.html
+++ b/Documentation/NuttShell.html
@@ -4021,7 +4021,7 @@ mount -t vfat /dev/ram1 /tmp
 
 <p>
   <b>Modifying the ROMFS Image</b>.
-  The contents of the <code>/etc</code> directory are retained in the file <code>apps/nshlib/nsh_romfsimg.h</code> OR, if <code>CONFIG_NSH_ARCHROMFS</code> is defined, <code>include/arch/board/rcs.template</code>.
+  The contents of the <code>/etc</code> directory are retained in the file <code>apps/nshlib/nsh_romfsimg.h</code> OR, if <code>CONFIG_NSH_ARCHROMFS</code> is defined, <code>include/arch/board/nsh_romfsimg.h</code>.
   In order to modify the start-up behavior, there are three things to study:
 </p>
 
@@ -4065,6 +4065,10 @@ mount -t vfat /dev/ram1 /tmp
       <code><b>rcS.template</b></code>.
       The file <code>apps/nshlib/rcS.template</code> contains the general form of the <code>rcS</code> file; configured values are plugged into this template file to produce the final <code>rcS</code> file.
     </p>
+    <p>
+       To generate a custom <code>rcS</code> file a copy of <code>rcS.template</code> needs to be placed at <code>tools/</code> and changed according to the desired start-up behaviour.
+       Running <code>tools/mkromfsimg.h</code> creates <code>nsh_romfsimg.h</code> which needs to be copied to <code>apps/nhslib</code> OR if <code>CONFIG_NSH_ARCHROMFS</code> is defined to <code>configs/&lt;board&gt;/include</code>.
+    </p>
 </ol>
 
 <p>