diff --git a/ChangeLog b/ChangeLog
index d99b180f5209613b709459e2e1c08516c184b8be..993b71c924939d0315271f93dd4a3273d1918414 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -347,8 +347,12 @@
 	  Ubuntu where /bin/sh is a link to dash.
 	* Z8Encore! port verified on ZDS-II instruction set/chip simulator.
 
-0.3.10 2008-xx-xx Gregory Nutt <spudmonkey@racsa.co.cr>
+0.3.10 2008-05-15 Gregory Nutt <spudmonkey@racsa.co.cr>
 
 	* Add support for the ZiLOG EZ80Acclaim microcontrooler (EZ80F91 chip).
 	* Add configuration for the ZiLOG z8f64200100kit development kit, Z8F6423 part.
 	* Add configuration for the ZiLOG ez80f0910200kitg development kit, EZ80F091 part.
+	* Correct critical list handling errors in task shutdown logic: One in timer
+	  deletion logic (timer_delete.c) and one in stream logic (lib_init.c).
+
+0.3.11 2008-xx-xx Gregory Nutt <spudmonkey@racsa.co.cr>
diff --git a/Documentation/NuttX.html b/Documentation/NuttX.html
index 75e7843615abb5f9365da03d4c85ad3d8b5284ce..a0f552e8d7d675105a045c89b25ebf624288828c 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: March 15, 2008</p>
+      <p>Last Updated: May 15, 2008</p>
     </td>
   </tr>
 </table>
@@ -456,7 +456,7 @@
 </table>
 
 <p>
-  The 21st release of NuttX (nuttx-0.3.9) is available for download
+  The 22nd release of NuttX (nuttx-0.3.11) is available for download
   from the <a href="http://sourceforge.net/project/showfiles.php?group_id=189573">SourceForge</a>
   website.
   The change log associated with the release is available <a href="#currentrelease">here</a>.
@@ -464,13 +464,17 @@
   These unreleased changes are listed <a href="#pendingchanges">here</a>.
 </p>
 <p>
-  nuttx-0.3.9 is a minor feature enhancement release.
-  This release includes support for the ZiLOG Z8Encore! microcontroller.
-  Also included is the initial framework for support for the Z80,
-  <a href="http://www.tim-mann.org/xtrs.html">XTRS</a> platform.
+  nuttx-0.3.10 is an important bug fix release.
+  This release incorporates fixes to correct critical list handling errors
+  in task shutdown logic: One in timer deletion logic (timer_delete.c) and one
+  in stream logic (lib_init.c).
+</p>
+<p>
+  Additional, minor enhancements includes support to ZiLOG EZ80Acclaim
+  microcontrooler (EZ80F91 chip) and configurations fot the ZiLOG z8f64200100kit (Z8F6423)
+  and ez80f0910200kitg (EZ80F091) development kit.
 </p>
 <p>
-  This released has been verified only on the ZiLOG ZDS-II Z8Encore! chip simulation.
   As usual, any feedback about bugs or suggestions for improvement would be greatly appreciated.
 </p>
 
@@ -969,18 +973,13 @@ Other memory:
 </table>
 
 <pre><ul>
-nuttx-0.3.9 2008-03-09 Gregory Nutt &lt;spudmonkey@racsa.co.cr&gt;
-
-	* Began adding support for the ZiLOG Z8Encore! microcontroller for the Z8Encore000ZCO
-	  development board and the Z8F6403 part.
-	* Fix broken 'clean' target on z80sim configurations
-	* Re-structure arch/z80 to provide support for all ZiLOG 8-bit microcontrollers (ez8
-	  in particular for now).
-	* Add support for TRS80-Model 3 based on the xtrs emulation (http://www.tim-mann.org/xtrs.html)
-	  Per patch from Jacques Pelletier.
-	* In all shell scripts, change #!/bin/sh to #!/bin/bash to resolve problems in
-	  Ubuntu where /bin/sh is a link to dash.
-	* Z8Encore! port verified on ZDS-II instruction set/chip simulator.
+nuttx-0.3.10 2008-05-15 Gregory Nutt &lt;spudmonkey@racsa.co.cr&gt;
+
+	* Add support for the ZiLOG EZ80Acclaim microcontrooler (EZ80F91 chip).
+	* Add configuration for the ZiLOG z8f64200100kit development kit, Z8F6423 part.
+	* Add configuration for the ZiLOG ez80f0910200kitg development kit, EZ80F091 part.
+	* Correct critical list handling errors in task shutdown logic: One in timer
+	  deletion logic (timer_delete.c) and one in stream logic (lib_init.c).
 
 pascal-0.1.2 2008-02-10 Gregory Nutt <spudmonkey@racsa.co.cr>
 
@@ -1006,11 +1005,7 @@ buildroot-0.1.0 2007-03-09 &lt;spudmonkey@racsa.co.cr&gt
 </table>
 
 <pre><ul>
-nuttx-0.3.10 2008-xx-xx Gregory Nutt &lt;spudmonkey@racsa.co.cr&gt;
-
-	* Add support for the ZiLOG EZ80Acclaim microcontrooler (EZ80F91 chip).
-	* Add configuration for the ZiLOG z8f64200100kit development kit, Z8F6423 part.
-	* Add configuration for the ZiLOG ez80f0910200kitg development kit, EZ80F091 part.
+nuttx-0.3.11 2008-xx-xx Gregory Nutt &lt;spudmonkey@racsa.co.cr&gt;
 
 pascal-0.1.3 2008-xx-xx Gregory Nutt &lt;spudmonkey@racsa.co.cr&gt;
 
diff --git a/ReleaseNotes b/ReleaseNotes
index f18f6586491cb757892f5d4bc7d2ecda083d4f51..a1859cb3ce6e20e436570b64449e670387e8aa33 100644
--- a/ReleaseNotes
+++ b/ReleaseNotes
@@ -441,3 +441,15 @@ This released has been verified only on the ZiLOG ZDS-II Z8Encore!
 chip simulation.
 
 This tarball contains a complete CVS snapshot from March 9, 2008.
+
+nuttx-0.3.10
+^^^^^^^^^^^^
+
+This is the 22nd release of NuttX.  This is an important bug fix release.
+This release incorporates fixes to correct critical list handling errors
+in task shutdown logic: One in timer deletion logic (timer_delete.c) and one
+in stream logic (lib_init.c).  This release also includes support to ZiLOG EZ80Acclaim
+microcontrooler (EZ80F91 chip) and configurations fot the ZiLOG z8f64200100kit (Z8F6423)
+and ez80f0910200kitg (EZ80F091) development kit.
+
+