diff --git a/Documentation/NuttX.html b/Documentation/NuttX.html
index 840879ef1e5..7f8f7d8d1c3 100644
--- a/Documentation/NuttX.html
+++ b/Documentation/NuttX.html
@@ -635,6 +635,8 @@ Other memory:
 
 0.2.9 2007-xx-xx Gregory Nutt <spudmonkey@racsa.co.cr>
 
+	* Imported uIP into the tree (see
+	   http://www.sics.se/~adam/uip/index.php/Main_Page)
 </pre></ul>
 
 <table width ="100%">
diff --git a/Documentation/NuttxPortingGuide.html b/Documentation/NuttxPortingGuide.html
index 38ab0c31e99..26bf1105565 100644
--- a/Documentation/NuttxPortingGuide.html
+++ b/Documentation/NuttxPortingGuide.html
@@ -1294,6 +1294,72 @@ The system can be re-made subsequently by just typing <code>make</code>.
   </li>
 </ul>
 
+<h2>Network Support</h2>
+<h3>TCP/IP support via uIP</h2>
+<ul>
+  <li>
+    <code>CONFIG_NET_UIP</code>: Enable or disable all uIP features
+  </li>
+  <li>
+    <code>CONFIG_NET_UIP_IPv6</code>: Build in support for IPv6
+  </li>
+  <li>
+    <code>CONFIG_UIP_MAX_CONNECTIONS</code>: Maximum number of TCP connections
+  </li>
+  <li>
+    <code>CONFIG_UIP_MAX_LISTENPORTS</code>: Maximum number of listening TCP ports
+  </li>
+  <li>
+    <code>CONFIG_UIP_BUFFER_SIZE</code>: uIP buffer size
+  </li>
+  <li>
+    <code>CONFIG_UIP_LOGGING</code>: Logging on or off
+  </li>
+  <li>
+    <code>CONFIG_UIP_UDP</code>: UDP support on or off
+  </li>
+  <li>
+    <code>CONFIG_UIP_UDP_CHECKSUMS</code>: UDP checksums on or off
+  </li>
+  <li>
+    <code>CONFIG_UIP_UDP_CONNS</code>: The maximum amount of concurrent UDP connections
+  </li>
+  <li>
+    <code>CONFIG_UIP_STATISTICS</code>: uIP statistics on or off
+  </li>
+  <li>
+    <code>CONFIG_UIP_PINGADDRCONF</code>: Use "ping" packet for setting IP address
+  </li>
+  <li>
+    <code>CONFIG_UIP_RECEIVE_WINDOW</code>: The size of the advertised receiver's window
+  </li>
+  <li>
+    <code>CONFIG_UIP_ARPTAB_SIZE</code>: The size of the ARP table
+  </li>
+  <li>
+    <code>CONFIG_UIP_BROADCAST</code>: Broadcast support
+  </li>
+  <li>
+    <code>CONFIG_UIP_LLH_LEN</code>: The link level header length
+  </li>
+  <li>
+    <code>CONFIG_UIP_EXTERNAL_BUFFER</code>: Incoming packet buffer (uip_buf) is defined externally
+  </li>
+  <li>
+    <code>CONFIG_UIP_FWCACHE_SIZE</code>: number of packets to remember when looking for duplicates
+  </li>
+</ul>
+
+<h3>UIP Network Utilities</h3>
+<ul>
+  <li>
+    <code>CONFIG_UIP_DHCP_LIGHT</code>: Reduces size of DHCP
+  </li>
+  <li>
+    <code>CONFIG_UIP_RESOLV_ENTRIES</code>: Number of resolver entries
+  </li>
+</ul>
+
 <h2>Stack and heap information</h2>
 
 <ul>