diff --git a/java-11-openjdk.spec b/java-11-openjdk.spec
index b02d3f4..ae7f6f5 100644
--- a/java-11-openjdk.spec
+++ b/java-11-openjdk.spec
@@ -366,7 +366,7 @@
 %global top_level_dir_name   %{origin}
 %global top_level_dir_name_backup %{top_level_dir_name}-backup
 %global buildver        10
-%global rpmrelease      5
+%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
@@ -2124,7 +2124,9 @@ for suffix in %{build_loop} ; do
 done # end of release / debug cycle loop
 
 %check
-
+%ifarch %{ix86}
+  exit 0
+%endif
 # We test debug first as it will give better diagnostics on a crash
 for suffix in %{build_loop} ; do
 
@@ -2273,6 +2275,21 @@ jdk_image=${top_dir_abs_main_build_path}/images/%{jdkimage}
 
 # Install the jdk
 mkdir -p $RPM_BUILD_ROOT%{_jvmdir}
+
+pushd ${jdk_image}
+%ifarch %{ix86}
+  for file in $(find $(pwd) | grep -e "/bin/" -e "\.so$") ; do
+    echo "deprecating $file"
+    echo '#!/bin/bash' > $file
+    echo 'echo "We are going to remove i686 jdk. Please fix your package accordingly!"' >> $file
+    echo 'echo "See https://fedoraproject.org/wiki/Changes/Drop_i686_JDKs"' >> $file
+    echo 'echo "See https://pagure.io/fesco/issue/2772"' >> $file
+    echo 'echo "See https://bugzilla.redhat.com/show_bug.cgi?id=2083750"' >> $file
+    echo 'exit 1' >> $file
+  done
+%endif
+popd
+
 cp -a ${jdk_image} $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir -- $suffix}
 
 pushd ${jdk_image}
@@ -2648,6 +2665,10 @@ end
 %endif
 
 %changelog
+* Thu Jul 14 2022 Jiri Vanek <jvanek@redhat.com> - 1:11.0.15.0.10-6
+- Replaced binaries and .so files with bash-stubs on i686 in preparation of the removal on that architecture:
+- https://fedoraproject.org/wiki/Changes/Drop_i686_JDKs
+
 * Thu Jul 14 2022 FeRD (Frank Dana) <ferdnyc@gmail.com> - 1:11.0.15.0.10-5
 - Add javaver- and origin-specific javadoc and javadoczip alternatives.