diff --git a/Documentation/NuttX.html b/Documentation/NuttX.html
index 0c98d4ad2eb..be23be91d22 100644
--- a/Documentation/NuttX.html
+++ b/Documentation/NuttX.html
@@ -556,6 +556,14 @@
     </p>
   </td>
 </tr>
+<tr>
+  <td><br></td>
+  <td>
+    <p>
+      <li>Add-on <a href="http://cxx.uclibc.org/">uClibc++</a> C++ Library is available (LGPL).</li>
+    </p>
+  </td>
+</tr>
 
 <tr>
   <td valign="top" width="22"><img height="20" width="20" src="favicon.ico"></td>
diff --git a/configs/sim/cxxtest/Make.defs b/configs/sim/cxxtest/Make.defs
index 6e8de79d576..eac92e92822 100644
--- a/configs/sim/cxxtest/Make.defs
+++ b/configs/sim/cxxtest/Make.defs
@@ -51,7 +51,7 @@ ARCHWARNINGS		= -Wall -Wstrict-prototypes -Wshadow
 ARCHWARNINGSXX		= -Wall -Wshadow
 ARCHDEFINES		=
 ARCHINCLUDES		= -I. -isystem $(TOPDIR)/include
-ARCHINCLUDESXX		= -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
+ARCHINCLUDESXX		= -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx -isystem $(TOPDIR)/include/uClibc++
 ARCHSCRIPT		=
 
 ifeq ($(CONFIG_SIM_M32),y)
@@ -101,7 +101,6 @@ ifeq ($(CONFIG_SIM_M32),y)
   LDFLAGS			+= -m32
 endif
 
-
 MKDEP			= $(TOPDIR)/tools/mkdeps.sh
 
 HOSTCC			= gcc