diff --git a/Documentation/NuttxPortingGuide.html b/Documentation/NuttxPortingGuide.html
index 140c5838639..305a44ce214 100644
--- a/Documentation/NuttxPortingGuide.html
+++ b/Documentation/NuttxPortingGuide.html
@@ -12,7 +12,7 @@
       <h1><big><font color="#3c34ec">
         <i>NuttX RTOS Porting Guide</i>
       </font></big></h1>
-      <p>Last Updated: July 18, 2009</p>
+      <p>Last Updated: September 11, 2009</p>
     </td>
   </tr>
 </table>
@@ -2362,15 +2362,15 @@ extern void up_ledoff(int led);
     <code>CONFIG_THTTPD_SERVER_SOFTWARE</code>: SERVER_SOFTWARE: response
   </li>
   <li>
-    <code>CONFIG_THTTPD_PATH</code>: Server working directory
+    <code>CONFIG_THTTPD_PATH</code>: Server working directory. Default: <code>/mnt/www</code>.
   </li>
   <li>
-    <code>CONFIG_THTTPD_CGI_PATH</code>: Path to CGI executables
+    <code>CONFIG_THTTPD_CGI_PATH</code>: Path to CGI executables.  Default: <code>/mnt/www/cgi-bin</code>.
   </li>
   <li>
-    <code>CONFIG_THTTPD_CGI_PATTERN</code>: Only CGI programs matching this
-    pattern will be executed.  In fact, if this value is not defined
-    then no CGI logic will be built.
+    <code>CONFIG_THTTPD_CGI_PATTERN</code>: Only CGI programs whose expanded paths
+    match this pattern will be executed.  In fact, if this value is not defined
+    then no CGI logic will be built. Default: <code>/mnt/www/cgi-bin/*</code>.
   </li>
   <li>
     <code>CONFIG_THTTPD_CGI_PRIORITY</code>: Provides the priority of CGI child tasks
diff --git a/configs/eagle100/thttpd/defconfig b/configs/eagle100/thttpd/defconfig
index f1036fa360d..5e7ee7c66b9 100644
--- a/configs/eagle100/thttpd/defconfig
+++ b/configs/eagle100/thttpd/defconfig
@@ -541,7 +541,7 @@ CONFIG_THTTPD_SERVER_ADDRESS="http://www.nuttx.org"
 CONFIG_THTTPD_SERVER_SOFTWARE="thttpd/2.25b 29dec2003-NuttX"
 CONFIG_THTTPD_PATH="/mnt/www"
 CONFIG_THTTPD_CGI_PATH="/mnt/www/cgi-bin"
-CONFIG_THTTPD_CGI_PATTERN="/cgi-bin/*"
+CONFIG_THTTPD_CGI_PATTERN="/mnt/www/cgi-bin/*"
 CONFIG_THTTPD_CGI_PRIORITY=50
 CONFIG_THTTPD_CGI_STACKSIZE=1024
 CONFIG_THTTPD_CGI_BYTECOUNT=20000
diff --git a/configs/ntosd-dm320/thttpd/defconfig b/configs/ntosd-dm320/thttpd/defconfig
index 8ccf8f9c4c4..179523247e5 100644
--- a/configs/ntosd-dm320/thttpd/defconfig
+++ b/configs/ntosd-dm320/thttpd/defconfig
@@ -586,7 +586,7 @@ CONFIG_THTTPD_IPADDR=(10<<24|0<<16|0<<8|2)
 CONFIG_THTTPD_SERVER_ADDRESS="http://www.nuttx.org"
 CONFIG_THTTPD_SERVER_SOFTWARE="thttpd/2.25b 29dec2003-NuttX"
 CONFIG_THTTPD_CGI_PATH="/mnt/www/cgi-bin"
-CONFIG_THTTPD_CGI_PATTERN="/cgi-bin/*"
+CONFIG_THTTPD_CGI_PATTERN="/mnt/www/cgi-bin/*"
 CONFIG_THTTPD_CGI_PRIORITY=50
 CONFIG_THTTPD_CGI_STACKSIZE=1024
 CONFIG_THTTPD_CGI_BYTECOUNT=20000
diff --git a/netutils/thttpd/config.h b/netutils/thttpd/config.h
index b63320c7d9f..349c739685b 100644
--- a/netutils/thttpd/config.h
+++ b/netutils/thttpd/config.h
@@ -102,12 +102,12 @@
 #    define CONFIG_THTTPD_CGI_PATH "/mnt/www/cgi-bin"
 #  endif
 
-/* Only CGI programs matching this pattern will be executed.  In fact,
+/* Only CGI programs whose fully expanded pathes match this pattern will be executed.  In fact,
  * if this value is not defined then no CGI logic will be built.
  */
 
 #  ifndef CONFIG_THTTPD_CGI_PATTERN
-#    define CONFIG_THTTPD_CGI_PATTERN "/cgi-bin/*"
+#    define CONFIG_THTTPD_CGI_PATTERN "/mnt/www/cgi-bin/*"
 #  endif
 
 /* These provide the priority and stack size of the CGI child tasks */