diff --git a/haskell-platform.spec b/haskell-platform.spec
index aa29ce0..7fae33e 100644
--- a/haskell-platform.spec
+++ b/haskell-platform.spec
@@ -24,7 +24,7 @@
 
 Name:           haskell-platform
 Version:        2022.1
-Release:        21%{?dist}
+Release:        22%{?dist}
 Summary:        Standard Haskell distribution
 
 License:        BSD
@@ -48,6 +48,8 @@ Source13:       https://hackage.haskell.org/package/%{casatypes}/%{casatypes}.ta
 Source20:       stack-symlink-distro-ghc
 # End cabal-rpm sources
 Patch0:         stack-2.7.5-ghc-Cabal-version-warnings.patch
+# https://github.com/commercialhaskell/stack/issues/6379
+Patch2:         stack-Setup-Platforms.patch
 
 BuildRequires:  ghc
 BuildRequires:  alex
@@ -235,7 +237,7 @@ Stack is a cross-platform program for developing Haskell projects.
 # Begin cabal-rpm setup:
 %setup -q -c -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13
 # End cabal-rpm setup
-%patch0 -p0 -b .orig
+%autopatch -p0
 
 
 %build
@@ -275,6 +277,9 @@ install -p %{SOURCE20} %{buildroot}%{_bindir}/stack-symlink-distro-ghc
 
 
 %changelog
+* Mon Jul  8 2024 Jens Petersen <petersen@redhat.com> - 2022.1-22
+- patch stack setup for ppc64le and s390x
+
 * Sun Nov 12 2023 Jens Petersen <petersen@redhat.com> - 2022.1-21
 - make stack-symlink-distro-ghc executable
 
diff --git a/stack-Setup-Platforms.patch b/stack-Setup-Platforms.patch
new file mode 100644
index 0000000..110f151
--- /dev/null
+++ b/stack-Setup-Platforms.patch
@@ -0,0 +1,11 @@
+--- stack-2.7.5/src/Stack/Setup.hs~	2024-07-08 21:24:36.825860660 +0800
++++ stack-2.7.5/src/Stack/Setup.hs	2024-07-08 21:26:16.500759387 +0800
+@@ -1261,6 +1261,8 @@
+         Platform Sparc                 Cabal.Linux   -> return "linux-sparc"
+         Platform AArch64               Cabal.OSX     -> return "macosx-aarch64"
+         Platform AArch64               Cabal.FreeBSD -> return "freebsd-aarch64"
++        Platform PPC64                 Cabal.Linux   -> pure "linux-ppc64"
++        Platform S390                  Cabal.Linux   -> pure "linux-s390"
+         Platform arch os -> throwM $ UnsupportedSetupCombo os arch
+ 
+ downloadOrUseLocal