diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec
index 1259532..1a3f041 100644
--- a/java-1.8.0-openjdk.spec
+++ b/java-1.8.0-openjdk.spec
@@ -67,6 +67,11 @@
 %global multilib_arches %{power64} sparc64 x86_64
 %global jit_arches      %{ix86} x86_64 sparcv9 sparc64 %{aarch64} %{power64}
 
+# https://bugs.gentoo.org/647954
+%ifarch %ix86
+%global optflags %{optflags} -mincoming-stack-boundary=2
+%endif
+
 %ifnarch %{jit_arches}
 # Disable hardened build on non-jit arches. Work-around for RHBZ#1290936.
 %undefine _hardened_build
@@ -886,7 +891,7 @@ Obsoletes: java-1.7.0-openjdk-accessibility%{?1} < %{EVRD}
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{updatever}
-Release: 1.%{buildver}.5
+Release: 1.%{buildver}.6
 # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons,
 # and this change was brought into RHEL-4.  java-1.5.0-ibm packages
 # also included the epoch in their virtual provides.  This created a