diff --git a/common/cross-profiles/i686.sh b/common/cross-profiles/i686.sh
index beff7c05285..f794e8b31f1 100644
--- a/common/cross-profiles/i686.sh
+++ b/common/cross-profiles/i686.sh
@@ -2,5 +2,7 @@
 
 XBPS_TARGET_ARCH="i686"
 XBPS_CROSS_TRIPLET="i686-pc-linux-gnu"
-XBPS_CROSS_CFLAGS="-march=i686 -mtune=generic"
+XBPS_CFLAGS="-O2 -pipe -fstack-protector --param ssp-buffer-size=2"
+XBPS_CXXFLAGS="$XBPS_CFLAGS"
+XBPS_CROSS_CFLAGS="-march=i686"
 XBPS_CROSS_CXXFLAGS="$XBPS_CROSS_CFLAGS"