--- a/ChangeLog	Tue Feb 14 10:38:30 2012 +0000
+++ b/ChangeLog	Wed Feb 15 14:27:59 2012 +0000
@@ -1,9 +1,14 @@
-2012-10-14  Andrew John Hughes  <ahughes@redhat.com>
+2012-02-15  Andrew John Hughes  <ahughes@redhat.com>
+
+	* NEWS: Add 2.0.1 and 2.1.0 release notes.
+	* configure.ac: Bump to 2.2pre.
+
+2012-02-14  Andrew John Hughes  <ahughes@redhat.com>
 
 	* NEWS: Update with OpenJDK fixes and
 	add release date for 2.1.
 
-2012-10-14  Andrew John Hughes  <ahughes@redhat.com>
+2012-02-14  Andrew John Hughes  <ahughes@redhat.com>
 
 	(HOTSPOT_CHANGESET): Add latest fixes:
 	7140882, 7049339 and 7091528.
@@ -24,20 +29,20 @@
 	to work with latest OpenJDK ALT_HOTSPOT_IMPORT_PATH functionality.
 	* patches/cacao/version.patch: Removed, replaced by upstream CACAO changeset 30edcde287d9.
 
-2012-10-08  Andrew John Hughes  <ahughes@redhat.com>
+2012-02-08  Andrew John Hughes  <ahughes@redhat.com>
 
 	(HOTSPOT_CHANGESET): Bump to fix HotSpot merge
 	issue.
 	(HOTSPOT_SHA256SUM): Likewise.
 
-2012-10-08  Andrew John Hughes  <ahughes@redhat.com>
+2012-02-08  Andrew John Hughes  <ahughes@redhat.com>
 
 	* Makefile.am:
 	Move JDK_UPDATE_VERSION and COMBINED_VERSION
 	to top of file with OPENJDK_VERSION.
 	(JDK_UPDATE_VERSION): Set to 02 for u2.
 
-2012-10-08  Andrew John Hughes  <ahughes@redhat.com>
+2012-02-08  Andrew John Hughes  <ahughes@redhat.com>
 
 	* Makefile.am:
 	(CORBA_CHANGESET): Updated.

--- a/NEWS	Tue Feb 14 10:38:30 2012 +0000
+++ b/NEWS	Wed Feb 15 14:27:59 2012 +0000
@@ -10,8 +10,20 @@
 
 CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY
 
+New in release 2.2 (2012-XX-XX):
+
 New in release 2.1 (2012-02-14):
 
+* Security fixes
+  - S7082299, CVE-2011-3571: Fix in AtomicReferenceArray
+  - S7088367, CVE-2011-3563: Fix issues in java sound
+  - S7110683, CVE-2012-0502: Issues with some KeyboardFocusManager method
+  - S7110687, CVE-2012-0503: Issues with TimeZone class
+  - S7110700, CVE-2012-0505: Enhance exception throwing mechanism in ObjectStreamClass
+  - S7110704, CVE-2012-0506: Issues with some method in corba
+  - S7112642, CVE-2012-0497: Incorrect checking for graphics rendering object
+  - S7118283, CVE-2012-0501: Better input parameter checking in zip file processing
+  - S7126960, CVE-2011-5035: Add property to limit number of request headers to the HTTP Server
 * Bug fixes
   - S4909150: WindowsTreeUI can cause NullPointerException occasionally
   - S4965777: GC changes to support use of discovered field for pending references
@@ -320,6 +332,21 @@
   - Add OpenBSD/sparc to list of recognised hosts.
   - Handle 'g' when specifying memory + extra checks.
 
+New in release 2.0.1 (2012-02-14):
+
+* Security fixes
+  - S7082299, CVE-2011-3571: Fix in AtomicReferenceArray
+  - S7088367, CVE-2011-3563: Fix issues in java sound
+  - S7110683, CVE-2012-0502: Issues with some KeyboardFocusManager method
+  - S7110687, CVE-2012-0503: Issues with TimeZone class
+  - S7110700, CVE-2012-0505: Enhance exception throwing mechanism in ObjectStreamClass
+  - S7110704, CVE-2012-0506: Issues with some method in corba
+  - S7112642, CVE-2012-0497: Incorrect checking for graphics rendering object
+  - S7118283, CVE-2012-0501: Better input parameter checking in zip file processing
+  - S7126960, CVE-2011-5035: Add property to limit number of request headers to the HTTP Server
+* Bug fixes
+  - S7103610: _NET_WM_PID and WM_CLIENT_MACHINE are not set
+
 New in release 2.0 (2011-10-19):
 
 * Security fixes

--- a/configure.ac	Tue Feb 14 10:38:30 2012 +0000
+++ b/configure.ac	Wed Feb 15 14:27:59 2012 +0000
@@ -1,4 +1,4 @@
-AC_INIT([icedtea], [2.1pre], [distro-pkg-dev@openjdk.java.net])
+AC_INIT([icedtea], [2.2pre], [distro-pkg-dev@openjdk.java.net])
 AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
 AC_CONFIG_FILES([Makefile])