--- a/ChangeLog	Tue Feb 14 10:38:30 2012 +0000
+++ b/ChangeLog	Wed Feb 15 10:49:47 2012 +0000
@@ -1,9 +1,30 @@
-2012-10-14  Andrew John Hughes  <ahughes@redhat.com>
+2012-02-15  Andrew John Hughes  <ahughes@redhat.com>
+
+	Move to 2.1 release branch.
+	* Makefile.am:
+	(CORBA_CHANGESET): Updated.
+	(HOTSPOT_CHANGESET): Likewise.
+	(JAXP_CHANGESET): Likewise.
+	(JAXWS_CHANGESET): Likewise.
+	(JDK_CHANGESET): Likewise.
+	(LANGTOOLS_CHANGESET): Likewise.
+	(OPENJDK_CHANGESET): Likewise.
+	(CORBA_SHA256SUM): Likewise.
+	(HOTSPOT_SHA256SUM): Likewise.
+	(JAXP_SHA256SUM): Likewise.
+	(JAXWS_SHA256SUM): Likewise.
+	(JDK_SHA256SUM): Likewise.
+	(LANGTOOLS_SHA256SUM): Likewise.
+	(OPENJDK_SHA256SUM): Likewise.
+	(ICEDTEA_PREFIX): Set to 2.1.
+	(ICEDTEA_HG_URL): Use release tree.
+
+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.

--- a/Makefile.am	Tue Feb 14 10:38:30 2012 +0000
+++ b/Makefile.am	Wed Feb 15 10:49:47 2012 +0000
@@ -4,21 +4,21 @@
 JDK_UPDATE_VERSION = 02
 COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)
 
-CORBA_CHANGESET = 78cd4b4fcb75
-HOTSPOT_CHANGESET = f8f4d3f9b165
-JAXP_CHANGESET = 7300d2ab9fb2
-JAXWS_CHANGESET = d26ff33070cb
-JDK_CHANGESET = afdcedc27c23
-LANGTOOLS_CHANGESET = 58f6a950cd72
-OPENJDK_CHANGESET = a66b58021165
+CORBA_CHANGESET = 5617f6c5cc94
+HOTSPOT_CHANGESET = 0e651e004747
+JAXP_CHANGESET = 1cf75c0e2c96
+JAXWS_CHANGESET = 7edfbfe974f2
+JDK_CHANGESET = 50f6f276a06c
+LANGTOOLS_CHANGESET = b534c4c6cd9b
+OPENJDK_CHANGESET = 22cc03983e20
 
-CORBA_SHA256SUM = c25abc052d0e3041c558869ba88f80bf3ff051efbcd20e6c22b862fdd4c066d4
-HOTSPOT_SHA256SUM = 6bc2831c4c496f5a2850368fa4cacb3790e723176b7bf1ea63004c67d8371681
-JAXP_SHA256SUM = 0774d2acaa47052b8f529edae1ca868721a0164a956455958a6ea51550fa01e0
-JAXWS_SHA256SUM = 5f0a98280219fa8fe2926cfd4471fb0e98391b38a3c4b29743ad361832cea0e2
-JDK_SHA256SUM = 35ad431d5d80e9b77bdbadc5218500e8ea377c3c731ddab0db7179bc5860075f
-LANGTOOLS_SHA256SUM = 3e66400ba51c5de4bf79be50dff41f47134ba2fcdbea845fb1ed0f492cfb0efb
-OPENJDK_SHA256SUM = 714a000514e273bae755f4cc90df839a298583b38bb93518d6cf805dede99b6d
+CORBA_SHA256SUM = 963915483530f311ff313635f79ed11ea7ce5a1c0dbee5d1acb1994132857fa3
+HOTSPOT_SHA256SUM = d68455e5cdb14280cd61155a4e9d531e90b073607f4367e93ead0fcf34476ae1
+JAXP_SHA256SUM = 8ce48c704f38285207ee6dc56c45b2d214083b4d4d36be02901401b594ce701e
+JAXWS_SHA256SUM = 823ca6b8fd780bf1b1565a90cfc8ec6f0ee422a5d25ffb20b1ce0272dc4955aa
+JDK_SHA256SUM = 5f8b5edbebb358730425e64a31eaa11c346467ba10ffe1848f2d2ad2ea53bc3d
+LANGTOOLS_SHA256SUM = c77dd42d83f06d18fa8aa65c93d137608a2e02cf24b68fc10d7b1c0bcc12a93c
+OPENJDK_SHA256SUM = ada790b4754f521ebfad0dd909ea29b92b2b3c1b84b2e99d32673343727d95d7
 
 CACAO_VERSION = a567bcb7f589
 CACAO_SHA256SUM = d49f79debc131a5694cae6ab3ba2864e7f3249ee8d9dc09aae8afdd4dc6b09f9
@@ -32,8 +32,8 @@
 JAMVM_URL = $(JAMVM_BASE_URL)/jamvm-$(JAMVM_VERSION).tar.gz
 JAMVM_SRC_ZIP = jamvm-$(JAMVM_VERSION).tar.gz
 
-ICEDTEA_PREFIX = icedtea7-forest
-ICEDTEA_HG_URL = http://icedtea.classpath.org/hg/$(ICEDTEA_PREFIX)
+ICEDTEA_PREFIX = icedtea7-forest-2.1
+ICEDTEA_HG_URL = http://icedtea.classpath.org/hg/release/$(ICEDTEA_PREFIX)
 OPENJDK_HG_URL = http://hg.openjdk.java.net/jdk7/jdk7
 CVMI_HG_URL = http://hg.openjdk.java.net/cvmi/cvmi/
 CLOSURES_HG_URL = http://hg.openjdk.java.net/closures/closures/
@@ -1062,7 +1062,7 @@
 	      *.zip) $(UNZIP) -q $(OPENJDK_SRC_ZIP) ;; \
 	      *.tar.*) $(TAR) xf $(OPENJDK_SRC_ZIP) ;; \
 	    esac; \
-	    mv $(ICEDTEA_PREFIX)-$(OPENJDK_CHANGESET) openjdk ; \
+	    mv `echo $(ICEDTEA_PREFIX)|sed 's#\.#-#'`-$(OPENJDK_CHANGESET) openjdk ; \
 	  else \
 	    echo "ERROR: Couldn't extract OpenJDK"; \
 	    false; \