diff --git a/SPECS/java-11-openjdk.spec b/SPECS/java-11-openjdk.spec
index 531df1b..1b5a86c 100644
--- a/SPECS/java-11-openjdk.spec
+++ b/SPECS/java-11-openjdk.spec
@@ -311,7 +311,7 @@
 %global origin_nice     OpenJDK
 %global top_level_dir_name   %{origin}
 %global buildver        9
-%global rpmrelease      4
+%global rpmrelease      6
 #%%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
 %if %is_system_jdk
@@ -400,6 +400,14 @@
 
 %global rpm_state_dir %{_localstatedir}/lib/rpm-state/
 
+# For flatpack builds hard-code /usr/sbin/alternatives,
+# otherwise use %%{_sbindir} relative path.
+%if 0%{?flatpak}
+%global alternatives_requires /usr/sbin/alternatives
+%else
+%global alternatives_requires %{_sbindir}/alternatives
+%endif
+
 %if %{with_systemtap}
 # Where to install systemtap tapset (links)
 # We would like these to be in a package specific sub-dir,
@@ -986,11 +994,11 @@ Requires: cups-libs
 # for FIPS PKCS11 provider
 Requires: nss
 # Post requires alternatives to install tool alternatives
-Requires(post):   %{_sbindir}/alternatives
+Requires(post):   %{alternatives_requires}
 # in version 1.7 and higher for --family switch
 Requires(post):   chkconfig >= 1.7
 # Postun requires alternatives to uninstall tool alternatives
-Requires(postun): %{_sbindir}/alternatives
+Requires(postun): %{alternatives_requires}
 # in version 1.7 and higher for --family switch
 Requires(postun):   chkconfig >= 1.7
 # for optional support of kernel stream control, card reader and printing bindings
@@ -1016,11 +1024,11 @@ Provides: java-headless%{?1} = %{epoch}:%{version}-%{release}
 Requires:         %{name}%{?1}%{?_isa} = %{epoch}:%{version}-%{release}
 OrderWithRequires: %{name}-headless%{?1}%{?_isa} = %{epoch}:%{version}-%{release}
 # Post requires alternatives to install tool alternatives
-Requires(post):   %{_sbindir}/alternatives
+Requires(post):   %{alternatives_requires}
 # in version 1.7 and higher for --family switch
 Requires(post):   chkconfig >= 1.7
 # Postun requires alternatives to uninstall tool alternatives
-Requires(postun): %{_sbindir}/alternatives
+Requires(postun): %{alternatives_requires}
 # in version 1.7 and higher for --family switch
 Requires(postun):   chkconfig >= 1.7
 
@@ -1069,11 +1077,11 @@ Provides: java-demo%{?1} = %{epoch}:%{version}-%{release}
 %define java_javadoc_rpo() %{expand:
 OrderWithRequires: %{name}-headless%{?1}%{?_isa} = %{epoch}:%{version}-%{release}
 # Post requires alternatives to install javadoc alternative
-Requires(post):   %{_sbindir}/alternatives
+Requires(post):   %{alternatives_requires}
 # in version 1.7 and higher for --family switch
 Requires(post):   chkconfig >= 1.7
 # Postun requires alternatives to uninstall javadoc alternative
-Requires(postun): %{_sbindir}/alternatives
+Requires(postun): %{alternatives_requires}
 # in version 1.7 and higher for --family switch
 Requires(postun):   chkconfig >= 1.7
 
@@ -1362,7 +1370,7 @@ Group:   Development/Tools
 %{java_devel_rpo -- %{debug_suffix_unquoted}}
 
 %description devel-slowdebug
-The %{origin_nice} ${featurever} development tools.
+The %{origin_nice} %{featurever} development tools.
 %{debug_warning}
 %endif
 
@@ -2265,6 +2273,14 @@ end
 %endif
 
 %changelog
+* Mon Feb 22 2021 Stephan Bergmann <sbergman@redhat.com> - 1:11.0.10.0.9-6
+- Hardcode /usr/sbin/alternatives for Flatpak builds
+- Resolves: rhbz#1930370
+
+* Mon Jan 18 2021 Andrew Hughes <gnu.andrew@redhat.com> - 1:11.0.10.0.9-5
+- Fix accidental use of $ instead of % for variable reference.
+- Resolves: rhbz#1908972
+
 * Mon Jan 18 2021 Andrew Hughes <gnu.andrew@redhat.com> - 1:11.0.10.0.9-4
 - Move setup of JavaSecuritySystemConfiguratorAccess to Security class so it always occurs.
 - Resolves: rhbz#1915071