diff --git a/glibc.changes b/glibc.changes
index b9a7d0b..a0b2b98 100644
--- a/glibc.changes
+++ b/glibc.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Oct 17 12:00:11 UTC 2023 - Andreas Schwab <schwab@suse.de>
+
+- Avoid use of SSE in i586 build
+
 -------------------------------------------------------------------
 Mon Oct  9 08:50:18 UTC 2023 - Andreas Schwab <schwab@suse.de>
 
diff --git a/glibc.spec b/glibc.spec
index d345bd2..922896a 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -630,6 +630,14 @@ for opt in $tmp; do
 done
 %if "%flavor" == "i686"
 BuildFlags+=" -march=i686 -mtune=generic"
+%else
+%if !%{build_cross}
+%ifarch i586
+# workaround for unaligned stack in java-11-openjdk and mariadb
+# by avoiding use of SSE
+BuildFlags+=" -march=i586"
+%endif
+%endif
 %endif
 %if 0%{?with_gcc:1}
 BuildCC="gcc-%{with_gcc}"