--- a/ChangeLog	Thu Apr 14 19:40:36 2016 +0100
+++ b/ChangeLog	Sun Apr 24 07:17:12 2016 +0100
@@ -1,3 +1,27 @@
+2016-04-23  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+	* Makefile.am:
+	(JDK_UPDATE_VERSION): Bump to 91.
+	(BUILD_VERSION): Bump to b14.
+	(CORBA_CHANGESET): Update to icedtea-3.0.1 tag.
+	(JAXP_CHANGESET): Likewise.
+	(JAXWS_CHANGESET): Likewise.
+	(JDK_CHANGESET): Likewise.
+	(LANGTOOLS_CHANGESET): Likewise.
+	(OPENJDK_CHANGESET): Likewise.
+	(NASHORN_CHANGESET): Likewise.
+	(CORBA_SHA256SUM): Likewise.
+	(JAXP_SHA256SUM): Likewise.
+	(JAXWS_SHA256SUM): Likewise.
+	(JDK_SHA256SUM): Likewise.
+	(LANGTOOLS_SHA256SUM): Likewise.
+	(OPENJDK_SHA256SUM): Likewise.
+	(NASHORN_SHA256SUM): Likewise.
+	* NEWS: Updated. Add release notes
+	for 2.6.4 and 2.6.5.
+	* configure.ac: Bump to 3.0.1.
+	* hotspot.map.in: Update to icedtea-3.0.1 tag.
+
 2016-04-09  Andrew John Hughes  <gnu_andrew@member.fsf.org>
 
 	* NEWS: Correct mistakes spotted

--- a/Makefile.am	Thu Apr 14 19:40:36 2016 +0100
+++ b/Makefile.am	Sun Apr 24 07:17:12 2016 +0100
@@ -1,24 +1,24 @@
 # Dependencies
 
-JDK_UPDATE_VERSION = 77
-BUILD_VERSION = b03
+JDK_UPDATE_VERSION = 91
+BUILD_VERSION = b14
 COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(BUILD_VERSION)
 
-CORBA_CHANGESET = 37af47894175
-JAXP_CHANGESET = 4ed5441e40e1
-JAXWS_CHANGESET = a81c04154cc5
-JDK_CHANGESET = 3334efeacd83
-LANGTOOLS_CHANGESET = dd581e8047e6
-OPENJDK_CHANGESET = 8ed8d26a3f9a
-NASHORN_CHANGESET = 697c5f792bec
-
-CORBA_SHA256SUM = d77480d5d0c9620562a66b01fda9be4de58c2881cec680b4f2682ef09087b3cc
-JAXP_SHA256SUM = 4ccce5442642561cda78116a019f5c0ea690725a374ccf5695b3af00393d26e8
-JAXWS_SHA256SUM = ef550609aaa526084256a7fdf6c326015641d6d8c80540c830c0c62302a2f076
-JDK_SHA256SUM = fa74b8aaa389495a685f3a28151a1957ff8ff88a4d4792059c5c1fb7c12eb1cd
-LANGTOOLS_SHA256SUM = e0e0e6a7cf8575506579306f76cca872b01a3f08a4880fb9b316444fb206ea86
-OPENJDK_SHA256SUM = 5b032673d74c4e2529427b9570b177285dc9a6430d016ef2e072dd2167669031
-NASHORN_SHA256SUM = b4c59d8269511f2073498518e599ec91dff11c57cadc0b97fa88af81835122c0
+CORBA_CHANGESET = a6736e860d67
+JAXP_CHANGESET = c7145fc644df
+JAXWS_CHANGESET = 412389386184
+JDK_CHANGESET = dab76de2f91c
+LANGTOOLS_CHANGESET = ad6886e3a101
+OPENJDK_CHANGESET = 6a70821528ba
+NASHORN_CHANGESET = c89dc17f7c75
+
+CORBA_SHA256SUM = 42351003e03f8893435e424e652558ac7e6e7af86a0cf01338c84184b8ab6e50
+JAXP_SHA256SUM = c0a9d523d451b895066dd747ee595eebba29f5626e9a69d9467cccd9b2df37c4
+JAXWS_SHA256SUM = e378c1f46b067c9527d174c3683f4022eca3fe17bcf0e79177fa1713197d3338
+JDK_SHA256SUM = 550556487de7fd769a9398082f26b358a2e5c07c2c1eb09724f0862667589cdd
+LANGTOOLS_SHA256SUM = 2602601152576021736028604e56cf32f8e3f5997fe220e90297132274a251ca
+OPENJDK_SHA256SUM = 8b766fffa39d67e62802a8cddd23e02b0ac2fd6aff48658b4b08fd6dbee38184
+NASHORN_SHA256SUM = e7040d55a499c002cd6edcedc44890072a2f88cb19a341950e5865c544b51edc
 
 HS_TYPE = "`$(AWK) 'version==$$1 {print $$2}' version=$(HSBUILD) $(abs_top_builddir)/hotspot.map`"
 HS_URL = "`$(AWK) 'version==$$1 {print $$3}' version=$(HSBUILD) $(abs_top_builddir)/hotspot.map`"

--- a/NEWS	Thu Apr 14 19:40:36 2016 +0100
+++ b/NEWS	Sun Apr 24 07:17:12 2016 +0100
@@ -10,6 +10,59 @@
 
 CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY
 
+New in release 3.0.1 (2016-04-23):
+
+* Security fixes
+  - S8129952, CVE-2016-0686: Ensure thread consistency
+  - S8132051, CVE-2016-0687: Better byte behavior
+  - S8138593, CVE-2016-0695: Make DSA more fair
+  - S8139008: Better state table management
+  - S8143167, CVE-2016-3425: Better buffering of XML strings
+  - S8143945, CVE-2016-3426: Better GCM validation
+  - S8144430, CVE-2016-3427: Improve JMX connections
+  - S8146494: Better ligature substitution
+  - S8146498: Better device table adjustments
+* Import of OpenJDK 8 u91 build 14
+  - S8002116: This JdbReadTwiceTest.sh gets an exit 1
+  - S8007890: [TESTBUG] JcmdWithNMTDisabled.java fails when invoked with NMT explicitly turned on
+  - S8036132: Tab characters in test/com/sun/jdi files
+  - S8038963: com/sun/jdi tests fail because cygwin's ps sometimes misses processes
+  - S8044419: TEST_BUG: com/sun/jdi/JdbReadTwiceTest.sh fails when run under root
+  - S8059661: Test SoftReference and OOM behavior
+  - S8067422: Lambda method names are unnecessarily unstable
+  - S8073735: [TEST_BUG] compiler/loopopts/CountedLoopProblem.java got OOME
+  - S8074146: [TEST_BUG] jdb has succeded to read an unreadable file
+  - S8130212: Thread::current() might access freed memory on Solaris
+  - S8132890: Text Overlapping on Dot Matrix Printers
+  - S8134297: NPE in GSSNameElement nameType check
+  - S8134650: Xsl transformation gives different results in 8u66
+  - S8134828: Scrollbar thumb disappears with Nimbus L&F
+  - S8138589: Correct limits on unlimited cryptography
+  - S8138811: Construction of static protection domains
+  - S8140268: Generate link to specification license for JavaDoc API documentation
+  - S8141229: [Parfait] Null pointer dereference in cmsstrcasecmp of cmserr.c
+  - S8143002: [Parfait] JNI exception pending in fontpath.c:1300
+  - S8143959: Certificates requiring blacklisting
+  - S8146477: [TEST_BUG] ClientJSSEServerJSSE.java failing again
+  - S8146518: Zero interpreter broken with better byte behaviour
+  - S8146967: [TEST_BUG] javax/security/auth/SubjectDomainCombiner/Optimize.java should use 4-args ProtectionDomain constructor
+  - S8147567: InterpreterRuntime::post_field_access not updated for boolean in JDK-8132051
+  - S8148446: (tz) Support tzdata2016a
+  - S8148475: Missing SA Bytecode updates.
+  - S8148487: PPC64: Better byte behavior
+  - S8148522: Backout JDK-8138811 from 2016 Apr CPU repo
+  - S8149170: Better byte behavior for native arguments
+  - S8149367: PolicyQualifierInfo/index_Ctor JCk test fails with IOE: Invalid encoding for PolicyQualifierInfo
+  - S8150012: Better byte behavior for reflection
+  - S8150790: 8u75 L10n resource file translation update
+* Backports
+  - S8148752, PR2943: Compiled StringBuilder code throws StringIndexOutOfBoundsException
+  - S8154210: Zero: Better byte behaviour
+  - S8154413: AArch64: Better byte behaviour
+* Bug fixes
+  - PR2933: Support ccache 3.2 and later
+  - PR2934: SunEC provider throwing KeyException with current NSS
+
 New in release 3.0.0 (2016-04-08):
 
 * Rebase on jdk8u77-b03
@@ -229,6 +282,90 @@
   - PR2910: Add rudimentary support for OpenJDK 8 class files to CACAO
   - PR2916: Update CACAO drop to use the latest from cacao-staging
 
+New in release 2.6.5 (2016-03-24):
+
+* Security fixes
+  - S8152335, CVE-2016-0636: Improve MethodHandle consistency
+* Import of OpenJDK 7 u99 build 0
+  - S6425769, PR2858: Allow specifying an address to bind JMX remote connector
+  - S6961123: setWMClass fails to null-terminate WM_CLASS string
+  - S8145982, PR2858: JMXInterfaceBindingTest is failing intermittently
+  - S8146015, PR2858: JMXInterfaceBindingTest is failing intermittently for IPv6 addresses
+* Backports
+  - S8028727, PR2814: [parfait] warnings from b116 for jdk.src.share.native.sun.security.ec: JNI pending exceptions
+  - S8048512, PR2814: Uninitialised memory in jdk/src/share/native/sun/security/ec/ECC_JNI.cpp
+  - S8071705, PR2819, RH1182694: Java application menu misbehaves when running multiple screen stacked vertically
+  - S8150954, PR2866, RH1176206: AWT Robot not compatible with GNOME Shell
+* Bug fixes
+  - PR2803: Make system CUPS optional
+  - PR2886: Location of 'stap' executable is hard-coded
+  - PR2893: test/tapset/jstaptest.pl should be executable
+  - PR2894: Add missing test directory in make check.
+* CACAO
+  - PR2781, CA195: typeinfo.cpp: typeinfo_merge_nonarrays: Assertion `dest && result && x.any && y.any' failed
+* AArch64 port
+  - PR2852: Add support for large code cache
+  - PR2852: Apply ReservedCodeCacheSize default limiting to AArch64 only.
+  - S8081289, PR2852: aarch64: add support for RewriteFrequentPairs in interpreter
+  - S8131483, PR2852: aarch64: illegal stlxr instructions
+  - S8133352, PR2852: aarch64: generates constrained unpredictable instructions
+  - S8133842, PR2852: aarch64: C2 generates illegal instructions with int shifts >=32
+  - S8134322, PR2852: AArch64: Fix several errors in C2 biased locking implementation
+  - S8136615, PR2852: aarch64: elide DecodeN when followed by CmpP 0
+  - S8138575, PR2852: Improve generated code for profile counters
+  - S8138641, PR2852: Disable C2 peephole by default for aarch64
+  - S8138966, PR2852: Intermittent SEGV running ParallelGC
+  - S8143067, PR2852: aarch64: guarantee failure in javac
+  - S8143285, PR2852: aarch64: Missing load acquire when checking if ConstantPoolCacheEntry is resolved
+  - S8143584, PR2852: Load constant pool tag and class status with load acquire
+  - S8144201, PR2852: aarch64: jdk/test/com/sun/net/httpserver/Test6a.java fails with --enable-unlimited-crypto
+  - S8144582, PR2852: AArch64 does not generate correct branch profile data
+  - S8146709, PR2852: AArch64: Incorrect use of ADRP for byte_map_base
+  - S8147805, PR2852: aarch64: C1 segmentation fault due to inline Unsafe.getAndSetObject
+  - S8148240, PR2852: aarch64: random infrequent null pointer exceptions in javac
+* PPC & AIX port
+  - S8034797, PR2851: AIX: Fix os::naked_short_sleep() in os_aix.cpp after 8028280
+  - S8139258, PR2851: PPC64LE: argument passing problem when passing 15 floats in native call
+  - S8139421, PR2851: PPC64LE: MacroAssembler::bxx64_patchable kill register R12
+
+New in release 2.6.4 (2016-01-19):
+
+* Security fixes
+  - S8059054, CVE-2016-0402: Better URL processing
+  - S8130710, CVE-2016-0448: Better attributes processing
+  - S8132210: Reinforce JMX collector internals
+  - S8132988: Better printing dialogues
+  - S8133962, CVE-2016-0466: More general limits
+  - S8137060: JMX memory management improvements
+  - S8139012: Better font substitutions
+  - S8139017, CVE-2016-0483: More stable image decoding
+  - S8140543, CVE-2016-0494: Arrange font actions
+  - S8143185: Cleanup for handling proxies
+  - S8143941, CVE-2015-8126, CVE-2015-8472: Update splashscreen displays
+  - S8144773, CVE-2015-7575: Further reduce use of MD5 (SLOTH)
+* Import of OpenJDK 7 u95 build 0
+  - S7167988: PKIX CertPathBuilder in reverse mode doesn't work if more than one trust anchor is specified
+  - S8068761: [TEST_BUG] java/nio/channels/ServerSocketChannel/AdaptServerSocket.java failed with SocketTimeoutException
+  - S8074068: Cleanup in src/share/classes/sun/security/x509/
+  - S8075773: jps running as root fails after the fix of JDK-8050807
+  - S8081297: SSL Problem with Tomcat
+  - S8131181: Increment minor version of HSx for 7u95 and initialize the build number
+  - S8132082: Let OracleUcrypto accept RSAPrivateKey
+  - S8134605: Partial rework of the fix for 8081297
+  - S8134861: XSLT: Extension func call cause exception if namespace URI contains partial package name
+  - S8135307: CompletionFailure thrown when calling FieldDoc.type, if the field's type is missing
+  - S8138716: (tz) Support tzdata2015g
+  - S8140244: Port fix of JDK-8075773 to MacOSX
+  - S8141213: [Parfait]Potentially blocking function GetArrayLength called in JNI critical region at line 239 of jdk/src/share/native/sun/awt/image/jpeg/jpegdecoder.c in function GET_ARRAYS
+  - S8141287: Add MD5 to jdk.certpath.disabledAlgorithms - Take 2
+  - S8142928: [TEST_BUG] sun/security/provider/certpath/ReverseBuilder/ReverseBuild.java 8u71 failure
+  - S8143132: L10n resource file translation update
+  - S8144955: Wrong changes were pushed with 8143942
+  - S8145551: Test failed with Crash for Improved font lookups
+  - S8147466: Add -fno-strict-overflow to IndicRearrangementProcessor{,2}.cpp
+* Backports
+  - S8140244: Port fix of JDK-8075773 to AIX
+
 New in release 2.6.3 (2015-11-13):
 
 * Security fixes

--- a/configure.ac	Thu Apr 14 19:40:36 2016 +0100
+++ b/configure.ac	Sun Apr 24 07:17:12 2016 +0100
@@ -1,4 +1,4 @@
-AC_INIT([icedtea], [3.0.0], [distro-pkg-dev@openjdk.java.net])
+AC_INIT([icedtea], [3.0.1], [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	Thu Apr 14 19:40:36 2016 +0100
+++ b/hotspot.map.in	Sun Apr 24 07:17:12 2016 +0100
@@ -1,2 +1,2 @@
 # version url changeset md5sum
-default drop http://icedtea.classpath.org/download/drops/icedtea8/@ICEDTEA_RELEASE@ 5e587a29a6aa 76717fa6a84fde60075c19fbc261709bd9c3b849952c817c0ac6b46b757ac0d7
+default drop http://icedtea.classpath.org/download/drops/icedtea8/@ICEDTEA_RELEASE@ 7bb48ba4de4f c15794ae90ee52222b73a5c8eb0a397062226fe8215aeed72fdf28f9c26780de