diff --git a/ChangeLog b/ChangeLog
index e6a156b1cc7..ff02f1c2cd0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2720,4 +2720,8 @@
 	  Then add CONFIG_NX_WRITEONLY which is the more generic way of saying that
 	  no NX component should try to read from the underlying graphic device (LCD
 	  or other).
+	* configs/stm3240g-eval/src/up_stmpe11.c:  Add board-specific support for the
+	  the STMPE11 I/O expander on the STM3240G-EVAL board.  Verfied that the
+	  STM3240G-EVAL touchscreen is now fully functional.
+
 
diff --git a/Documentation/NuttX.html b/Documentation/NuttX.html
index f85dcf784ac..5c9748ad967 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: April 25, 2012</p>
+      <p>Last Updated: May 8, 2012</p>
     </td>
   </tr>
 </table>
@@ -1846,7 +1846,8 @@
         The NuttX6.16 release also includes and logic for saving/restoring F4 FPU registers in context switches.
         Networking intensions include support for Telnet NSH sessions and new configurations for DHPCD and the networking test (nettest).
         A more complete port would include support for SDIO and USB OTG which are not available in NuttX 6.13.
-        The USB OTG device controller driver and function I2C driver were added in NuttX 6.17.
+        The USB OTG device controller driver, and LCD driver and a function I2C driver were added in NuttX 6.17.
+        A touchscreen driver for the STM3240G-EVAL based on the STMPE11 I/O expander was added in NuttX 6.18.
       </p>
     </ul>
   </td>
diff --git a/configs/stm3240g-eval/nxwm/defconfig b/configs/stm3240g-eval/nxwm/defconfig
index ce1be631e2f..c3d2062e7af 100644
--- a/configs/stm3240g-eval/nxwm/defconfig
+++ b/configs/stm3240g-eval/nxwm/defconfig
@@ -1261,9 +1261,12 @@ CONFIG_NX_MXCLIENTMSGS=16
 # NxWidgets / NxWM
 #
 # Use all defaults except
-# 1. Make the NxWidgets background color match the NxWM back color
-# 2. Taskbar on the left
+# 1. 16 bits-per-pixel
+# 2. Make the NxWidgets background color match the NxWM back color
+# 3. Taskbar on the left
+# 4. We do have a touchscreen
 #
+CONFIG_NXWIDGETS_BPP=16
 CONFIG_NXWIDGETS_SERVERSTACK=2048
 CONFIG_NXWIDGETS_LISTENERSTACK=2048
 CONFIG_NXWIDGETS_DEFAULT_BACKGROUNDCOLOR=MKRGB(148,189,215)
@@ -1273,6 +1276,7 @@ CONFIG_NXWIDGETS_DEFAULT_SHADOWEDGECOLOR=MKRGB(35,58,73)
 CONFIG_NXWM_TASKBAR_LEFT=y
 CONFIG_NXWM_NXCONSOLE_STACKSIZE=2048
 CONFIG_NXWM_UNITTEST=y
+CONFIG_NXWM_TOUCHSCREEN=y
 
 #
 # NxConsole Configuration Settings: