diff --git a/Documentation/NuttX.html b/Documentation/NuttX.html
index 86ee51a755..bf0647b25f 100644
--- a/Documentation/NuttX.html
+++ b/Documentation/NuttX.html
@@ -8,7 +8,7 @@
   <tr align="center" bgcolor="#e4e4e4">
     <td>
       <h1><big><font color="#3c34ec"><i>NuttX RTOS</i></font></big></h1>
-      <p>Last Updated: January 15, 2012</p>
+      <p>Last Updated: January 16, 2012</p>
     </td>
   </tr>
 </table>
@@ -644,7 +644,7 @@
   <td><br></td>
   <td>
     <p>
-      <li>Device-dependent USB class drivers available for USB serial and for USB mass storage.</li>
+      <li>Device-dependent USB class drivers available for USB serial (CDC/ACM and a PL2303 emulation), for USB mass storage, and for a composite CDC/ACM and mass storage device.</li>
     </p>
 </tr>
 <tr>
diff --git a/Documentation/NuttxPortingGuide.html b/Documentation/NuttxPortingGuide.html
index 676e6a2e89..941599b1ae 100644
--- a/Documentation/NuttxPortingGuide.html
+++ b/Documentation/NuttxPortingGuide.html
@@ -5026,6 +5026,48 @@ build
   </li>
 </ul>
 
+<h3>USB Composite Device Configuration</h3>
+<ul>
+  <li>
+    <code>CONFIG_USBDEV_COMPOSITE</code>:
+    Enables USB composite device support
+  </li>
+  <li>
+    <code>CONFIG_CDCACM_COMPOSITE</code>:
+    Configure the CDC serial driver as part of a composite driver
+    (only if CONFIG_USBDEV_COMPOSITE is also defined)
+  </li>
+  <li>
+    <code>CONFIG_COMPOSITE_COMPOSITE</code>:
+    Configure the mass storage driver as part of a composite driver
+    (only if CONFIG_USBDEV_COMPOSITE is also defined)
+  </li>
+  <li>
+    <code>CONFIG_COMPOSITE_EP0MAXPACKET</code>:
+    Max packet size for endpoint 0
+  </li>
+  <li>
+    <code>CONFIG_COMPOSITE_VENDORID</code> and <code>CONFIG_COMPOSITE_VENDORSTR</code>:
+    The vendor ID code/string
+  </li>
+  <li>
+    <code>CONFIG_COMPOSITE_PRODUCTID</code> and <code>CONFIG_COMPOSITE_PRODUCTSTR</code>:
+    The product ID code/string
+  </li>
+  <li>
+    <code>CONFIG_COMPOSITE_SERIALSTR</code>:
+    Device serial number string
+  </li>
+  <li>
+    <code>CONFIG_COMPOSITE_CONFIGSTR</code>:
+    Configuration string
+  </li>
+  <li>
+    <code>CONFIG_COMPOSITE_VERSIONNO</code>:
+    Interface version number.
+  </li>
+</ul>
+
 <h2>USB Host-Side Support</h2>
 <h3>USB Host Controller Driver</h3>
 <ul>