diff --git a/ghc-heaps.changes b/ghc-heaps.changes
index ccc664e..fed9773 100644
--- a/ghc-heaps.changes
+++ b/ghc-heaps.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Oct 17 12:20:00 UTC 2020 - Ondřej Súkup <mimi.vx@gmail.com>
+ 
+- force i686 arch on i586
+ 
 -------------------------------------------------------------------
 Tue Aug 18 10:44:59 UTC 2020 - Peter Simons <psimons@suse.com>
 
diff --git a/ghc-heaps.spec b/ghc-heaps.spec
index 6f6589b..5d2d85e 100644
--- a/ghc-heaps.spec
+++ b/ghc-heaps.spec
@@ -26,6 +26,12 @@ URL:            https://hackage.haskell.org/package/%{pkg_name}
 Source0:        https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz
 BuildRequires:  ghc-Cabal-devel
 BuildRequires:  ghc-rpm-macros
+# GHC dont support i586
+%ifarch %{ix86}
+ExclusiveArch:  i586 i686
+ExclusiveArch:  i686
+%{expand:%%global optflags %(echo "%{optflags}"|sed -e s/i586/i686/) -march=i686 -mtune=generic}
+%endif
 
 %description
 Asymptotically optimal Brodal/Okasaki bootstrapped skew-binomial heaps from the