diff --git a/nettle/ChangeLog b/nettle/ChangeLog
index b4aa44d3911b710a41ea76820e153c1899bda675..5d5b04612ffbe9b30ac259fda5d1d99b7c231b1c 100644
--- a/nettle/ChangeLog
+++ b/nettle/ChangeLog
@@ -1,5 +1,9 @@
 2011-07-01  Niels Möller  <nisse@lysator.liu.se>
 
+	* cbc.c	(CBC_BUFFER_LIMIT): Reduced to 512 bytes.
+	(cbc_decrypt): For in-place operation, use overlapping memxor3 and
+	eliminate a memcpy.
+
 	* ctr.c (ctr_crypt): Reorganized to call the encryption function
 	with several blocks at a time. Handle the case of a single block
 	specially.
diff --git a/nettle/NEWS b/nettle/NEWS
index 179e3b58a29e81cb96f1b970ffcc1549cad9e547..774d201b5f59069d87e2c1e16c1a4c3513c9dfc6 100644
--- a/nettle/NEWS
+++ b/nettle/NEWS
@@ -38,6 +38,8 @@ NEWS for the 2.2 release
 	* Optimized memxor using word rather than byte operations.
           Both generic C and x86_64 assembler.
 
+	* Eliminated a memcpy for in-place CBC decrypt.
+	
 	Miscellaneous:
 
 	* In command line tools, no longer support -? for requesting
diff --git a/nettle/misc/plan.html b/nettle/misc/plan.html
index 26f642cb9b04a9fe363a7c26e56575e9b1a22188..743611f5f1c4a49cd166a8e46d97ec2fefc22b86 100644
--- a/nettle/misc/plan.html
+++ b/nettle/misc/plan.html
@@ -14,7 +14,7 @@
   <h1> Plans for the Nettle-2.1 release </h1>
   <p> This is an attempt at defining a development target for
   Nettle-2.1, inspired by similar pages for recent GMP releases.
-  [Last updated 2011-06-15]</p>
+  [Last updated 2011-07-01]</p>
   <h2> Color codes </h2>
   <p class='should'>
     This really ought to be done before release
@@ -32,17 +32,17 @@
   <p class='done'>
     Replace remaining GPLd code: serpent and blowfish.
   </p>
-  <p class='should'>
+  <p class='done'>
     Decide which flavor of LGPL to use: LGPLv2+, LGPLv3+, or dual
     license LGPLv3+ and GPLv2. Leaning towards the simplest option, LGPLv2+.
   </p>
   
   <h2> Documentation </h2>
-  <p class='should'>
+  <p class='done'>
     Update documentation regarding license change and serpent
     copyrights.
   </p>
-  <p class='should'>
+  <p class='done'>
     Update NEWS file.
   </p>
   <h2> Bug fixes </h2>