diff --git a/dev-java/icedtea/icedtea-3.6.0.ebuild b/dev-java/icedtea/icedtea-3.6.0.ebuild
index 35df1718fe7..1f79a3a4b21 100644
--- a/dev-java/icedtea/icedtea-3.6.0.ebuild
+++ b/dev-java/icedtea/icedtea-3.6.0.ebuild
@@ -6,7 +6,7 @@
 EAPI="6"
 SLOT="8"
 
-inherit check-reqs gnome2-utils java-pkg-2 java-vm-2 multiprocessing pax-utils prefix versionator
+inherit check-reqs flag-o-matic gnome2-utils java-pkg-2 java-vm-2 multiprocessing pax-utils prefix versionator
 
 ICEDTEA_VER=$(get_version_component_range 1-3)
 ICEDTEA_BRANCH=$(get_version_component_range 1-2)
@@ -246,6 +246,10 @@ src_configure() {
 	# In-tree JIT ports are available for amd64, arm, arm64, ppc64 (be&le), SPARC and x86.
 	if { use amd64 || use arm || use arm64 || use ppc64 || use sparc || use x86; }; then
 		hotspot_port="yes"
+		if use x86; then
+			# FIXME: do not do this on non-HS build like Zero
+			append-flags -mincoming-stack-boundary=2
+		fi
 	fi
 
 	# Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ...