diff --git a/.gitignore b/.gitignore
index 67fbe3b..18fa5b4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-SOURCES/jdk-updates-jdk11u-jdk-11.0.11+5-4curve.tar.xz
+SOURCES/jdk-updates-jdk11u-jdk-11.0.11+6-4curve.tar.xz
 SOURCES/tapsets-icedtea-6.0.0pre00-c848b93a8598.tar.xz
diff --git a/.java-11-openjdk.metadata b/.java-11-openjdk.metadata
index 83e100c..3091fe9 100644
--- a/.java-11-openjdk.metadata
+++ b/.java-11-openjdk.metadata
@@ -1,2 +1,2 @@
-feddfe9b79d22e9ca4a7c5a49a250f3b49919036 SOURCES/jdk-updates-jdk11u-jdk-11.0.11+5-4curve.tar.xz
+0b0975515f9e01aeb4d78c8ea50aa0c465797980 SOURCES/jdk-updates-jdk11u-jdk-11.0.11+6-4curve.tar.xz
 c8281ee37b77d535c9c1af86609a531958ff7b34 SOURCES/tapsets-icedtea-6.0.0pre00-c848b93a8598.tar.xz
diff --git a/SOURCES/NEWS b/SOURCES/NEWS
index c97f19e..93e0f8c 100644
--- a/SOURCES/NEWS
+++ b/SOURCES/NEWS
@@ -94,6 +94,7 @@ Live versions of these release notes can be found at:
   - JDK-8249588: libwindowsaccessbridge issues on 64bit Windows
   - JDK-8249749: modify a primitive array through a stream and a for cycle causes jre crash
   - JDK-8249787: Make TestGCLocker more resilient with concurrent GCs
+  - JDK-8249867: xml declaration is not followed by a newline
   - JDK-8250911: [windows] os::pd_map_memory() error detection broken
   - JDK-8251255: [linux] Add process-memory information to hs-err and VM.info
   - JDK-8251359: Shenandoah: filter null oops before calling enqueue/SATB barrier
@@ -107,6 +108,7 @@ Live versions of these release notes can be found at:
   - JDK-8255368: Math.exp() gives wrong result for large values on x86 32-bit platforms
   - JDK-8255401: Shenandoah: Allow oldval and newval registers to overlap in cmpxchg_oop()
   - JDK-8253404: C2: assert(C->live_nodes() <= C->max_node_limit()) failed: Live Node limit exceeded limit
+  - JDK-8253409: Double-rounding possibility in float fma
   - JDK-8253476: TestUseContainerSupport.java fails on some Linux kernels w/o swap limit capabilities
   - JDK-8253524: C2: Refactor code that clones predicates during loop unswitching
   - JDK-8253644: C2: assert(skeleton_predicate_has_opaque(iff)) failed: unexpected
@@ -288,6 +290,37 @@ using the `--ignore-missing-deps` option for a non-modular
 application. Such an application, running on the custom image, might
 fail at runtime when missing dependence errors are suppressed.
 
+xml/jaxp:
+
+JDK-8249867 XML declaration is not followed by a newline
+========================================================
+
+The DOM Load and Save `LSSerializer` does not have an explicit control
+for whether or not the XML Declaration ends with a newline. In this
+release, a JDK implementation specific property
+`http://www.oracle.com/xml/jaxp/properties/isStandalone` and
+corresponding System property `jdk.xml.isStandalone` are added to
+control the addition of a newline and act independently without
+having to set the pretty-print property. This property can be used to
+reverse the incompatible change introduced in Java SE 7 Update 4 with
+an update of Xalan 2.7.1 where a newline is omitted when pretty-print
+is required.
+
+For details, please refer to the bug report and the java.xml module-summary.
+
+Usage:
+
+// to set the property, get an instance of LSSerializer and set it along with pretty-print
+LSSerializer ser = impl.createLSSerializer();
+ser.getDomConfig().setParameter("format-pretty-print", true);
+ser.getDomConfig().setParameter("http://www.oracle.com/xml/jaxp/properties/isStandalone", true);
+
+// to use the System property, set it before initializing a LSSerializer
+System.setProperty("jdk.xml.isStandalone", “true”);
+
+// to clear the property, place the line anywhere after the LSSerializer is initialized
+System.clearProperty("jdk.xml.isStandalone");
+
 New in release OpenJDK 11.0.10 (2021-01-19):
 =============================================
 Live versions of these release notes can be found at:
diff --git a/SPECS/java-11-openjdk.spec b/SPECS/java-11-openjdk.spec
index c8e5177..f631f79 100644
--- a/SPECS/java-11-openjdk.spec
+++ b/SPECS/java-11-openjdk.spec
@@ -338,7 +338,7 @@
 %global origin_nice     OpenJDK
 %global top_level_dir_name   %{origin}
 %global top_level_dir_name_backup %{top_level_dir_name}-backup
-%global buildver        5
+%global buildver        6
 %global rpmrelease      2
 #%%global tagsuffix     %%{nil}
 # Priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit
@@ -2343,6 +2343,11 @@ end
 %endif
 
 %changelog
+* Mon Apr 12 2021 Andrew Hughes <gnu.andrew@redhat.com> - 1:11.0.11.0.6-0.2.ea
+- Update to jdk-11.0.11.0+6
+- Update release notes to 11.0.11.0+6
+- Resolves: rhbz#1942310
+
 * Sat Apr 10 2021 Andrew Hughes <gnu.andrew@redhat.com> - 1:11.0.11.0.5-0.2.ea
 - Update to jdk-11.0.11.0+5
 - Update release notes to 11.0.11.0+5