diff --git a/glibc.changes b/glibc.changes
index 52efc48..f5034dc 100644
--- a/glibc.changes
+++ b/glibc.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Jun 25 07:30:13 UTC 2019 - Martin Liška <mliska@suse.cz>
+
+- Set optflags for i686 after _lto_cflags is set (boo#1138807).
+
 -------------------------------------------------------------------
 Thu Jun 20 10:02:20 UTC 2019 - Martin Liška <mliska@suse.cz>
 
diff --git a/glibc.spec b/glibc.spec
index 5e333d0..bf7b90a 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -83,7 +83,6 @@ BuildRequires:  zlib-devel
 %if "%flavor" == "i686"
 ExclusiveArch:  i586 i686
 BuildArch:      i686
-%global optflags %(echo "%optflags"|sed -e s/i586/i686/) -march=i686 -mtune=generic
 %endif
 
 %define __filter_GLIBC_PRIVATE 1
@@ -557,6 +556,9 @@ find . -name configure | xargs touch
 # Disable LTO due to a usage of top-level assembler that
 #  causes LTO issues (boo#1138807).
 %define _lto_cflags %{nil}
+%if "%flavor" == "i686"
+%global optflags %(echo "%optflags"|sed -e s/i586/i686/) -march=i686 -mtune=generic
+%endif
 if [ -x /bin/uname.bin ]; then
 	/bin/uname.bin -a
 else