diff --git a/ghc-cassava.changes b/ghc-cassava.changes
index 359ba9c..0ed9e11 100644
--- a/ghc-cassava.changes
+++ b/ghc-cassava.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
+ 
 -------------------------------------------------------------------
 Mon Aug 31 09:34:31 UTC 2020 - psimons@suse.com
 
diff --git a/ghc-cassava.spec b/ghc-cassava.spec
index d22428a..1449332 100644
--- a/ghc-cassava.spec
+++ b/ghc-cassava.spec
@@ -41,6 +41,12 @@ BuildRequires:  ghc-text-short-devel
 BuildRequires:  ghc-transformers-devel
 BuildRequires:  ghc-unordered-containers-devel
 BuildRequires:  ghc-vector-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
@@ -86,7 +92,7 @@ Requires(postun): ghc-compiler = %{ghc_version}
 This package provides the Haskell %{pkg_name} library development files.
 
 %prep
-%setup -q -n %{pkg_name}-%{version}
+%autosetup -n %{pkg_name}-%{version}
 cp -p %{SOURCE1} %{pkg_name}.cabal
 
 %build