--- a/ChangeLog	Sun Jan 25 20:35:44 2015 +0000
+++ b/ChangeLog	Tue Mar 31 15:08:53 2015 +0100
@@ -1,3 +1,8 @@
+2015-03-26  Andrew John Hughes  <gnu.andrew@redhat.com>
+
+	* NEWS:
+	Add 1.13.6 release notes.
+
 2015-01-25  Andrew John Hughes  <gnu.andrew@redhat.com>
 
 	* Makefile.am:

--- a/NEWS	Sun Jan 25 20:35:44 2015 +0000
+++ b/NEWS	Tue Mar 31 15:08:53 2015 +0100
@@ -14,6 +14,20 @@
 
 New in release 1.14.0 (201X-XX-XX):
 
+* Backports
+  - S6611637: NullPointerException in sun.font.GlyphLayout$EngineRecord.init
+  - S6727719: Performance of TextLayout.getBounds()
+  - S6745225: Memory leak while drawing Attributed String
+  - S6904962: GlyphVector.getVisualBounds should not be affected by leading or trailing white space.
+  - S7151089: PS NUMA: NUMA allocator should not attempt to free pages when using SHM large pages
+  - S8013057: Detect mmap() commit failures in Linux and Solaris os::commit_memory() impls and call vm_exit_out_of_memory()
+  - S8026887: Make issues due to failed large pages allocations easier to debug
+* Bug fixes
+  - PR1886: IcedTea does not checksum supplied tarballs
+  - PR2083: Add support for building Zero on AArch64
+
+New in release 1.13.6 (2015-01-23):
+
 * Security fixes
   - S8046656: Update protocol support
   - S8047125, CVE-2015-0395: (ref) More phantom object references
@@ -168,34 +182,27 @@
   - OJ52, PR2185: Application of 6786276 introduces compatibility issue
   - OJ53, PR2181: strict-aliasing warnings issued on PPC32
   - OJ54, PR2182: 6911104 reintroduces test fragment removed in existing 6964018 backport
-  - S6611637: NullPointerException in sun.font.GlyphLayout$EngineRecord.init
-  - S6727719: Performance of TextLayout.getBounds()
   - S6730740, PR2186: Fix for 6729881 has apparently broken several 64 bit tests:  "Bad address"
-  - S6745225: Memory leak while drawing Attributed String
-  - S6904962: GlyphVector.getVisualBounds should not be affected by leading or trailing white space.
   - S7031830, PR2183: bad_record_mac failure on TLSv1.2 enabled connection with SSLEngine
-  - S7151089: PS NUMA: NUMA allocator should not attempt to free pages when using SHM large pages
   - S8000897, PR2173, RH1155012: VM crash in CompileBroker
-  - S8013057: Detect mmap() commit failures in Linux and Solaris os::commit_memory() impls and call vm_exit_out_of_memory()
   - S8020190, PR2174, RH1176718: Fatal: Bug in native code: jfieldID must match object
-  - S8026887: Make issues due to failed large pages allocations easier to debug
   - S8028623, PR2177, RH1168693: SA: hash codes in SymbolTable mismatching java_lang_String::hash_code for extended characters.
   - S8061785, PR2177: [TEST_BUG] serviceability/sa/jmap-hashcode/Test8028623.java has utf8 character corrupted by earlier merge
 * Bug fixes
   - PR1831: Drop version requirement for LCMS 2
   - PR1832, RH1022017: Report elliptic curves supported by NSS, not the SunEC library
-  - PR1886: IcedTea does not checksum supplied tarballs
   - PR2033: patches/ecj/jaxws-getdtdtype.patch no longer applies since removal of JAXWS drop
   - PR2062: Unset OS before running OpenJDK build
   - PR2070: Type-punning warnings still evident on RHEL 5
   - PR2082: Cast should use same type as GCDrainStackTargetSize (uintx).
-  - PR2083: Add support for building Zero on AArch64
   - PR2096, RH1163501: 2048-bit DH upper bound too small for Fedora infrastructure
   - PR2125: Synchronise elliptic curves in sun.security.ec.NamedCurve with those listed by NSS
   - PR2179: Avoid x86 workaround when running Zero rather than a JIT
   - PR2180: Old autotools dislike $(builddir)/fsg.sh
 * CACAO
-  - PR2184: CACAO lacks JVM_FindClassFromCaller introduced by security patch in 2.5.3
+  - PR2184: CACAO lacks JVM_FindClassFromCaller introduced by security patch in 1.13.5
+* JamVM
+  - PR2190: JamVM lacks JVM_FindClassFromCaller introduced by security patch in 1.13.5
 
 New in release 1.13.5 (2014-10-14):