diff --git a/ghc-warp.changes b/ghc-warp.changes
index c66240a..9d43597 100644
--- a/ghc-warp.changes
+++ b/ghc-warp.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:46:37 UTC 2020 - Peter Simons <psimons@suse.com>
 
diff --git a/ghc-warp.spec b/ghc-warp.spec
index 69c81d1..ffd68f2 100644
--- a/ghc-warp.spec
+++ b/ghc-warp.spec
@@ -51,6 +51,12 @@ BuildRequires:  ghc-vault-devel
 BuildRequires:  ghc-wai-devel
 BuildRequires:  ghc-word8-devel
 BuildRequires:  ghc-x509-devel
+# 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
 %if %{with tests}
 BuildRequires:  ghc-HUnit-devel
 BuildRequires:  ghc-QuickCheck-devel