diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog
index 723f534bc5..cb14281de2 100644
--- a/nuttx/ChangeLog
+++ b/nuttx/ChangeLog
@@ -3535,4 +3535,6 @@
 	* lib/math: Files now conform to coding standards.  Separated float,
 	  double, and long double versions of code into separate files so that
 	  they don't draw in so much un-necessary code when doing a dumb link.
+	* binfmt/libelf:  The ELF loader is working correctly with C++ static
+	  constructors and destructors and all.
 
diff --git a/nuttx/Documentation/NuttX.html b/nuttx/Documentation/NuttX.html
index f3f13d38a2..fc0291846c 100644
--- a/nuttx/Documentation/NuttX.html
+++ b/nuttx/Documentation/NuttX.html
@@ -452,16 +452,19 @@
   <td><br></td>
   <td>
     <p>
-      <li><a href="NuttXNxFlat.html">Loadable ELF Modules</a>.
-      Support for separately linked, loadable ELF modules.
+      <li>
+        Support for separately linked, loadable ELF modules.
+      </li>
     </p>
 </tr>
 <tr>
   <td><br></td>
   <td>
     <p>
-      <li><a href="NuttXNxFlat.html">NXFLAT</a>.
-      NXFLAT is a binary format that can be XIP from a file system.
+      <li>
+        <a href="NuttXNxFlat.html">NXFLAT</a>.
+        NXFLAT is a binary format that can be XIP from a file system.
+      </li>
     </p>
 </tr>
 <tr>
@@ -548,6 +551,14 @@
     </p>
   </td>
 </tr>
+<tr>
+  <td><br></td>
+  <td>
+    <p>
+      <li>Includes floating point math library.</li>
+    </p>
+  </td>
+</tr>
 
 <tr>
   <td valign="top" width="22"><img height="20" width="20" src="favicon.ico"></td>
@@ -571,6 +582,14 @@
     </p>
   </td>
 </tr>
+<tr>
+  <td><br></td>
+  <td>
+    <p>
+      <li>A port cJSON</li>
+    </p>
+  </td>
+</tr>
 <tr>
   <td><br></td>
   <td>
diff --git a/nuttx/configs/README.txt b/nuttx/configs/README.txt
index 7caffa2bf1..0849837c1f 100644
--- a/nuttx/configs/README.txt
+++ b/nuttx/configs/README.txt
@@ -424,10 +424,10 @@ defconfig -- This is a configuration file similar to the Linux
       than value).
     CONFIG_NXFLAT. Enable support for the NXFLAT binary format. This format
       will support execution of NuttX binaries located in a ROMFS filesystem
-      (see examples/nxflat).
+      (see apps/examples/nxflat).
     CONFIG_ELF - Enable support for the ELF binary format. This format will
       support execution of ELF binaries copied from a file system and
-      relocated into RAM.
+      relocated into RAM (see apps/examples/elf).
 
     If CONFIG_ELF is selected, then these additional options are available: