diff --git a/SOURCES/jdk8250861-rh1895274-crash_in_MinINode_Ideal.patch b/SOURCES/jdk8250861-rh1895274-crash_in_MinINode_Ideal.patch
new file mode 100644
index 0000000..b00022f
--- /dev/null
+++ b/SOURCES/jdk8250861-rh1895274-crash_in_MinINode_Ideal.patch
@@ -0,0 +1,32 @@
+
+# HG changeset patch
+# User thartmann
+# Date 1604482955 -3600
+# Node ID 27723943c0dd65a191cbefe031cec001521e4b13
+# Parent  e9d90c9daf895b469b461b727b6887e7780b4ac2
+8250861: Crash in MinINode::Ideal(PhaseGVN*, bool)
+Summary: Added missing NULL checks.
+Reviewed-by: kvn, chagedorn
+
+diff -r e9d90c9daf89 -r 27723943c0dd src/hotspot/share/opto/addnode.cpp
+--- a/src/hotspot/share/opto/addnode.cpp	Mon Nov 02 20:20:05 2020 +0100
++++ b/src/hotspot/share/opto/addnode.cpp	Wed Nov 04 10:42:35 2020 +0100
+@@ -917,7 +917,7 @@
+ 
+     // Transform MIN2(x + c0, MIN2(x + c1, z)) into MIN2(x + MIN2(c0, c1), z)
+     // if x == y and the additions can't overflow.
+-    if (phase->eqv(x,y) &&
++    if (phase->eqv(x,y) && tx != NULL &&
+         !can_overflow(tx, x_off) &&
+         !can_overflow(tx, y_off)) {
+       return new MinINode(phase->transform(new AddINode(x, phase->intcon(MIN2(x_off, y_off)))), r->in(2));
+@@ -925,7 +925,7 @@
+   } else {
+     // Transform MIN2(x + c0, y + c1) into x + MIN2(c0, c1)
+     // if x == y and the additions can't overflow.
+-    if (phase->eqv(x,y) &&
++    if (phase->eqv(x,y) && tx != NULL &&
+         !can_overflow(tx, x_off) &&
+         !can_overflow(tx, y_off)) {
+       return new AddINode(x,phase->intcon(MIN2(x_off,y_off)));
+
diff --git a/SPECS/java-11-openjdk.spec b/SPECS/java-11-openjdk.spec
index b3b999c..f38b9ab 100644
--- a/SPECS/java-11-openjdk.spec
+++ b/SPECS/java-11-openjdk.spec
@@ -307,7 +307,7 @@
 %global top_level_dir_name   %{origin}
 %global minorver        0
 %global buildver        11
-%global rpmrelease      2
+%global rpmrelease      3
 #%%global tagsuffix     %%{nil}
 # priority must be 8 digits in total; untill openjdk 1.8 we were using 18..... so when moving to 11 we had to add another digit
 %if %is_system_jdk
@@ -900,7 +900,7 @@ exit 0
 
 %define files_javadoc() %{expand:
 %doc %{_javadocdir}/%{uniquejavadocdir -- %{?1}}
-%license %{buildoutputdir -- %{?1}}/images/%{jdkimage}/legal
+%license %{_jvmdir}/%{sdkdir -- %{?1}}/legal
 %if %is_system_jdk
 %if %{is_release_build -- %{?1}}
 %ghost %{_javadocdir}/java
@@ -910,7 +910,7 @@ exit 0
 
 %define files_javadoc_zip() %{expand:
 %doc %{_javadocdir}/%{uniquejavadocdir -- %{?1}}.zip
-%license %{buildoutputdir -- %{?1}}/images/%{jdkimage}/legal
+%license %{_jvmdir}/%{sdkdir -- %{?1}}/legal
 %if %is_system_jdk
 %if %{is_release_build -- %{?1}}
 %ghost %{_javadocdir}/java-zip
@@ -1215,6 +1215,8 @@ Patch8: s390-8214206_fix.patch
 Patch9: jdk8254177-tzdata2020b.patch
 # JDK-8236512: PKCS11 Connection closed after Cipher.doFinal and NoPadding
 Patch10: jdk8236512-pkcs11_incorrrect_session_closure.patch
+# JDK-8250861, RH1895274: Crash in MinINode::Ideal(PhaseGVN*, bool)
+Patch12: jdk8250861-rh1895274-crash_in_MinINode_Ideal.patch
 
 BuildRequires: autoconf
 BuildRequires: automake
@@ -1581,6 +1583,7 @@ pushd %{top_level_dir_name}
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
+%patch12 -p1
 popd # openjdk
 
 %patch1000
@@ -1694,9 +1697,11 @@ bash ../configure \
 %ifarch %{ppc64le}
     --with-jobs=1 \
 %endif
-    --with-version-build=%{buildver} \
+    --with-version-build=1 \
     --with-version-pre="%{ea_designator}" \
     --with-version-opt=%{lts_designator} \
+    --with-version-patch=1 \
+    --with-version-date="2020-11-04" \
     --with-vendor-version-string="%{vendor_version_string}" \
     --with-vendor-name="%{oj_vendor}" \
     --with-vendor-url="%{oj_vendor_url}" \
@@ -1941,7 +1946,8 @@ if ! echo $suffix | grep -q "debug" ; then
   # Install Javadoc documentation
   install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}
   cp -a %{buildoutputdir $suffix}/images/docs $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir $suffix}
-  built_doc_archive=jdk-%{newjavaver}%{ea_designator_zip}+%{buildver}%{lts_designator_zip}-docs.zip
+  #built_doc_archive=jdk-%{newjavaver}%{ea_designator_zip}+%{buildver}%{lts_designator_zip}-docs.zip
+  built_doc_archive=jdk-11.0.9.1+1%{lts_designator_zip}-docs.zip
   cp -a %{buildoutputdir -- $suffix}/bundles/${built_doc_archive} $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix}.zip
 fi
 
@@ -2239,6 +2245,21 @@ end
 %endif
 
 %changelog
+* Wed Nov 11 2020 Andrew Hughes <gnu.andrew@redhat.com> - 1:11.0.9.11-3
+- Fix typo of build_doc_archive/built_doc_archive
+- Resolves: rhbz#1895274
+
+* Wed Nov 04 2020 Severin Gehwolf <sgehwolf@redhat.com> - 1:11.0.9.11-3
+- Update to jdk-11.0.9.1+1
+- RPM version stays at 11.0.9.11 so as to not break upgrade path.
+- Adds a single patch for JDK-8250861.
+- Resolves: rhbz#1895274
+
+* Thu Oct 29 2020 Jiri Vanek <jvanek@redhat.com> - 1:11.0.9.11-3
+- Move all license files to NVR-specific JVM directory.
+- This bad placement was killing parallel installability and thus having a bad impact on leapp, if used.
+- Resolves: rhbz#1889481
+
 * Wed Oct 21 2020 Andrew Hughes <gnu.andrew@redhat.com> - 1:11.0.9.11-2
 - Add backport of JDK-8236512 to correct use of killSession
 - Resolves: rhbz#1889497