--- a/ChangeLog	Mon Nov 14 07:16:04 2016 +0000
+++ b/ChangeLog	Mon Feb 06 22:53:13 2017 +0000
@@ -1,3 +1,26 @@
+2017-02-06  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+	Bump to icedtea-2.6.9pre01.
+	* Makefile.am,
+	(CORBA_CHANGESET): Update to icedtea-2.6.9pre01.
+	(JAXP_CHANGESET): Likewise.
+	(JAXWS_CHANGESET): Likewise.
+	(JDK_CHANGESET): Likewise.
+	(LANGTOOLS_CHANGESET): Likewise.
+	(OPENJDK_CHANGESET): Likewise.
+	(CORBA_SHA256SUM): Likewise.
+	(JAXP_SHA256SUM): Likewise.
+	(JAXWS_SHA256SUM): Likewise.
+	(JDK_SHA256SUM): Likewise.
+	(LANGTOOLS_SHA256SUM): Likewise.
+	(OPENJDK_SHA256SUM): Likewise.
+	(ICEDTEA_ENV): Update INFINALITY_SUPPORT
+	setting to IMPROVED_FONT_RENDERING,
+	following PR3318.
+	* NEWS: Updated.
+	* configure.ac: Bump to 2.6.9pre01.
+	* hotspot.map.in: Update to icedtea-2.6.9pre01.
+
 2016-11-13  Andrew John Hughes  <gnu_andrew@member.fsf.org>
 
 	* NEWS: Add section for 2.6.9.
@@ -144,6 +167,7 @@
 
 2016-10-27  Andrew John Hughes  <gnu_andrew@member.fsf.org>
 
+	Bump to icedtea-2.6.8pre01.
 	* Makefile.am,
 	(CORBA_CHANGESET): Update to icedtea-2.6.8pre01.
 	(JAXP_CHANGESET): Likewise.

--- a/Makefile.am	Mon Nov 14 07:16:04 2016 +0000
+++ b/Makefile.am	Mon Feb 06 22:53:13 2017 +0000
@@ -4,19 +4,19 @@
 BUILD_VERSION = b00
 COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(BUILD_VERSION)
 
-CORBA_CHANGESET = 9e002eaf26ed
-JAXP_CHANGESET = 3369fa5a875b
-JAXWS_CHANGESET = 26bcf28b3a60
-JDK_CHANGESET = 52225839bbea
-LANGTOOLS_CHANGESET = 545e512eb4de
-OPENJDK_CHANGESET = 653c2662034d
-
-CORBA_SHA256SUM = 2f728daac0ca88e7097a223f8c1ceaff8b4597e4622c5e365931edb25aa04538
-JAXP_SHA256SUM = ba1ba48e9ad9ee36df344e6e283f0f7a9f8aa9cee223c8ea2f2ee711092091fc
-JAXWS_SHA256SUM = 753093e71ac609b9350bf16daf230fdc2f873cd573428883448098e39e4c041a
-JDK_SHA256SUM = ec1118f52eb208a529e99ec1a64351b737bc0f892e05f0ffd4327b4be533e761
-LANGTOOLS_SHA256SUM = 004ec63ebdd0b6182c2bde3e190bb745a0d932ad7b05901a4376a04f06158813
-OPENJDK_SHA256SUM = e6bea22acb9e89e200fdc2a4a7a04ecee042f3ea9f9a49bab739fdd2598e4ce3
+CORBA_CHANGESET = ba84d0d43df1
+JAXP_CHANGESET = 6572cfcae345
+JAXWS_CHANGESET = 3301b643d02c
+JDK_CHANGESET = 296a14de4d24
+LANGTOOLS_CHANGESET = 4f7f0c054b2d
+OPENJDK_CHANGESET = 36a89571adf0
+
+CORBA_SHA256SUM = a2264e6fa08785b30fc4c4f224b7472abbeccae177848b392fc14a606f5de662
+JAXP_SHA256SUM = f600de4086fce75b5519e57c998b84d4785eb6496a28be7d256b4b975b2c8c11
+JAXWS_SHA256SUM = cbc47df67cac7bf68e002012e7cf002ec214b09be6c757d717592cfb699c6d35
+JDK_SHA256SUM = cd1d4e267f28b92e498a3e3b93152506bba522f4a4b24cbc8b7d25032f7c59f0
+LANGTOOLS_SHA256SUM = 20c8fa70545ca0a9d95b6b93258bd2ab3f1b93f45e3a966c5d83f066ced2815f
+OPENJDK_SHA256SUM = 354afc0c16e9813be742133d6751d46dcfdecdc58df1d941684e90f242199958
 
 DROP_URL = http://icedtea.classpath.org/download/drops
 
@@ -742,7 +742,7 @@
 
 if ENABLE_INFINALITY
 ICEDTEA_ENV += \
-       INFINALITY_SUPPORT="true"
+	IMPROVED_FONT_RENDERING="true"
 endif
 
 if USE_ALT_CACERTS_FILE

--- a/NEWS	Mon Nov 14 07:16:04 2016 +0000
+++ b/NEWS	Mon Feb 06 22:53:13 2017 +0000
@@ -12,7 +12,21 @@
 
 CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY
 
-New in release 2.6.9 (2017-01-XX):
+New in release 2.6.9 (2017-02-XX):
+
+* Backports
+  - S7102489, PR3316, RH1390708: RFE: cleanup jlong typedef on __APPLE__and _LLP64 systems.
+  - S8000351, PR3316, RH1390708: Tenuring threshold should be unsigned
+  - S8153711, PR3315, RH1284948: [REDO] JDWP: Memory Leak: GlobalRefs never deleted when processing invokeMethod command
+  - S8170888, PR3316, RH1390708: [linux] Experimental support for cgroup memory limits in container (ie Docker) environments
+* Bug fixes
+  - PR3318: Replace 'infinality' with 'improved font rendering' (--enable-improved-font-rendering)
+  - PR3318: Fix compatibility with vanilla Fontconfig
+  - PR3318: Fix glyph y advance
+  - PR3318: Always round glyph advance in 26.6 space
+  - PR3318: Simplify glyph advance handling
+* AArch64 port
+  - S8165673, PR3320: AArch64: Fix JNI floating point argument handling
 
 New in release 2.6.8 (2016-11-13):
 

--- a/configure.ac	Mon Nov 14 07:16:04 2016 +0000
+++ b/configure.ac	Mon Feb 06 22:53:13 2017 +0000
@@ -1,4 +1,4 @@
-AC_INIT([icedtea], [2.6.9pre00], [distro-pkg-dev@openjdk.java.net])
+AC_INIT([icedtea], [2.6.9pre01], [distro-pkg-dev@openjdk.java.net])
 AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
 AM_MAINTAINER_MODE([enable])
 AC_CONFIG_FILES([Makefile])

--- a/hotspot.map.in	Mon Nov 14 07:16:04 2016 +0000
+++ b/hotspot.map.in	Mon Feb 06 22:53:13 2017 +0000
@@ -1,2 +1,2 @@
 # version type(drop/hg) url changeset sha256sum
-default drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ 223f6c442d49 ca55f548f3169ba9bb6ca81265900722150953ee19b19606e4bf8e6dd50d7194
+default drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ 1d30f5a7723e 525ef3ceb9ed008650c6ced02808e90bc52643230cc5dd7f19815412c07c07a6