diff --git a/java-17-openjdk.spec b/java-17-openjdk.spec
index a8e4bc1..a4d8b5c 100644
--- a/java-17-openjdk.spec
+++ b/java-17-openjdk.spec
@@ -357,7 +357,7 @@
 %global top_level_dir_name   %{origin}
 %global top_level_dir_name_backup %{top_level_dir_name}-backup
 %global buildver        7
-%global rpmrelease      1
+%global rpmrelease      2
 # 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
 # Using 10 digits may overflow the int used for priority, so we combine the patch and build versions
@@ -474,9 +474,6 @@
 %global tapsetdir %{tapsetdirttapset}/%{stapinstall}
 %endif
 
-# x86 is no longer supported
-ExcludeArch: %{ix86}
-
 # not-duplicated scriptlets for normal/debug packages
 %global update_desktop_icons /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
@@ -811,14 +808,20 @@ exit 0
 exit 0
 }
 
+%ifarch %{ix86}
+%define files_jre() %{expand:%{_jvmdir}/%{sdkdir -- %{?1}}/gone-jre.sh}
+%else
 %define files_jre() %{expand:
 %{_datadir}/icons/hicolor/*x*/apps/java-%{javaver}-%{origin}.png
 %{_jvmdir}/%{sdkdir -- %{?1}}/lib/libsplashscreen.so
 %{_jvmdir}/%{sdkdir -- %{?1}}/lib/libawt_xawt.so
 %{_jvmdir}/%{sdkdir -- %{?1}}/lib/libjawt.so
 }
+%endif
 
-
+%ifarch %{ix86}
+%define files_jre_headless() %{expand:%{_jvmdir}/%{sdkdir -- %{?1}}/gone-headless.sh}
+%else
 %define files_jre_headless() %{expand:
 %license %{_jvmdir}/%{sdkdir -- %{?1}}/legal
 %doc %{_defaultdocdir}/%{uniquejavadocdir -- %{?1}}/NEWS
@@ -953,7 +956,11 @@ exit 0
 %ghost %{_jvmdir}/%{sdkdir -- %{?1}}/conf.rpmmoved
 %ghost %{_jvmdir}/%{sdkdir -- %{?1}}/lib/security.rpmmoved
 }
+%endif
 
+%ifarch %{ix86}
+%define files_devel() %{expand:%{_jvmdir}/%{sdkdir -- %{?1}}/gone-devel.sh}
+%else
 %define files_devel() %{expand:
 %dir %{_jvmdir}/%{sdkdir -- %{?1}}/bin
 %{_jvmdir}/%{sdkdir -- %{?1}}/bin/jar
@@ -1056,29 +1063,49 @@ exit 0
 %endif
 %endif
 }
+%endif
 
+%ifarch %{ix86}
+%define files_jmods() %{expand:%{_jvmdir}/%{sdkdir -- %{?1}}/gone-jmods.sh}
+%else
 %define files_jmods() %{expand:
 %{_jvmdir}/%{sdkdir -- %{?1}}/jmods
 }
+%endif
 
+%ifarch %{ix86}
+%define files_demo() %{expand:%{_jvmdir}/%{sdkdir -- %{?1}}/gone-demo.sh}
+%else
 %define files_demo() %{expand:
 %license %{_jvmdir}/%{sdkdir -- %{?1}}/legal
 %{_jvmdir}/%{sdkdir -- %{?1}}/demo
 %{_jvmdir}/%{sdkdir -- %{?1}}/sample
 }
+%endif
 
+%ifarch %{ix86}
+%define files_src() %{expand:%{_jvmdir}/%{sdkdir -- %{?1}}/gone-src.sh}
+%else
 %define files_src() %{expand:
 %license %{_jvmdir}/%{sdkdir -- %{?1}}/legal
 %{_jvmdir}/%{sdkdir -- %{?1}}/lib/src.zip
 }
+%endif
 
+%ifarch %{ix86}
+%define files_static_libs() %{expand:%{_jvmdir}/%{sdkdir -- %{?1}}/gone-static_libs.sh}
+%else
 %define files_static_libs() %{expand:
 %dir %{_jvmdir}/%{sdkdir -- %{?1}}/%{static_libs_root}
 %dir %{_jvmdir}/%{sdkdir -- %{?1}}/%{static_libs_arch_dir}
 %dir %{_jvmdir}/%{sdkdir -- %{?1}}/%{static_libs_install_dir}
 %{_jvmdir}/%{sdkdir -- %{?1}}/%{static_libs_install_dir}/lib*.a
 }
+%endif
 
+%ifarch %{ix86}
+%define files_javadoc() %{expand:%{_jvmdir}/%{sdkdir -- %{?1}}/gone-javadoc.sh}
+%else
 %define files_javadoc() %{expand:
 %doc %{_javadocdir}/%{uniquejavadocdir -- %{?1}}
 %license %{_jvmdir}/%{sdkdir -- %{?1}}/legal
@@ -1091,7 +1118,11 @@ exit 0
 %endif
 %endif
 }
+%endif
 
+%ifarch %{ix86}
+%define files_javadoc_zip() %{expand:%{_jvmdir}/%{sdkdir -- %{?1}}/gone-javadoc_zip.sh}
+%else
 %define files_javadoc_zip() %{expand:
 %doc %{_javadocdir}/%{uniquejavadocdir -- %{?1}}.zip
 %license %{_jvmdir}/%{sdkdir -- %{?1}}/legal
@@ -1104,6 +1135,7 @@ exit 0
 %endif
 %endif
 }
+%endif
 
 # not-duplicated requires/provides/obsoletes for normal/debug packages
 %define java_rpo() %{expand:
@@ -1421,7 +1453,9 @@ BuildRequires: pkgconfig
 BuildRequires: xorg-x11-proto-devel
 BuildRequires: zip
 BuildRequires: javapackages-filesystem
+%ifnarch %{ix86}
 BuildRequires: java-%{buildjdkver}-openjdk-devel
+%endif
 # Zero-assembler build requirement
 %ifarch %{zero_arches}
 BuildRequires: libffi-devel
@@ -1877,6 +1911,11 @@ sed -e "s:@NSS_LIBDIR@:%{NSS_LIBDIR}:g" %{SOURCE17} > nss.fips.cfg
 
 %build
 
+# x86 is deprecated
+%ifarch %{ix86}
+  exit 0
+%endif
+
 # How many CPU's do we have?
 export NUM_PROC=%(/usr/bin/getconf _NPROCESSORS_ONLN 2> /dev/null || :)
 export NUM_PROC=${NUM_PROC:-1}
@@ -2186,20 +2225,34 @@ 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
+  mkdir -p $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir -- ${suffix}}
+
+  file=/tmp/gonejdk.$$
+  echo "OpenJDK on x86 is now deprecated"
+  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
+
+  for pkgsuffix in jre headless devel demo src debugsourcefiles jmods static_libs ; do
+      cp -a ${file} $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir -- ${suffix}}/gone-${pkgsuffix}.sh
   done
-%endif
-popd
 
+  # Docs were only in the normal build
+  if ! echo $suffix | grep -q "debug" ; then
+      for pkgsuffix in javadoc javadoc_zip ; do
+	  cp -a ${file} $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir -- ${suffix}}/gone-${pkgsuffix}.sh
+      done
+  fi
+
+  rm -f ${file}
+
+%else
+
+# Install the jdk
 cp -a ${jdk_image} $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir -- $suffix}
 
 pushd ${jdk_image}
@@ -2300,16 +2353,24 @@ find $RPM_BUILD_ROOT/%{_jvmdir}/%{sdkdir -- $suffix}/ -name "*.so" -exec chmod 7
 find $RPM_BUILD_ROOT/%{_jvmdir}/%{sdkdir -- $suffix}/ -type d -exec chmod 755 {} \; ;
 find $RPM_BUILD_ROOT/%{_jvmdir}/%{sdkdir -- $suffix}/legal -type f -exec chmod 644 {} \; ;
 
+%endif
+
 # end, dual install
 done
 
 %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
 
+%ifarch %{ix86}
+
+  # Fake debugsourcefiles.list here after find-debuginfo.sh has already had a go
+  echo "%{_jvmdir}/%{sdkdir -- ${suffix}}/gone-debugsourcefiles.sh" >> debugsourcefiles.list
+  cat debugsourcefiles.list
+
+%else
+
 # Tests in the check stage are performed on the installed image
 # rpmbuild operates as follows: build -> install -> test
 export JAVA_HOME=${RPM_BUILD_ROOT}%{_jvmdir}/%{sdkdir -- $suffix}
@@ -2370,6 +2431,8 @@ $JAVA_HOME/bin/javap -l java.nio.ByteBuffer | grep "Compiled from"
 $JAVA_HOME/bin/javap -l java.nio.ByteBuffer | grep LineNumberTable
 $JAVA_HOME/bin/javap -l java.nio.ByteBuffer | grep LocalVariableTable
 
+%endif
+
 # build cycles check
 done
 
@@ -2617,6 +2680,9 @@ cjc.mainProgram(args)
 %endif
 
 %changelog
+* Tue Jul 19 2022 Andrew Hughes <gnu.andrew@redhat.com> - 1:17.0.4.0.7-0.2.ea
+- Try to build on x86 again by creating a husk of a JDK which does not depend on itself
+
 * Sat Jul 16 2022 Andrew Hughes <gnu.andrew@redhat.com> - 1:17.0.4.0.7-0.1.ea
 - Update to jdk-17.0.3.0+7
 - Update release notes to 17.0.3.0+7