diff --git a/adjust-32bit-big-endian-build-flags.patch b/adjust-32bit-big-endian-build-flags.patch
new file mode 100644
index 0000000..d4e8f97
--- /dev/null
+++ b/adjust-32bit-big-endian-build-flags.patch
@@ -0,0 +1,16 @@
+--- a/stage0/Makefile.am
++++ b/stage0/Makefile.am
+@@ -22,7 +22,12 @@
+ 
+ 
+ GUILE_WARNINGS = -W0
+-GUILE_OPTIMIZATIONS = -O1
++$(ifeq($SCM_PREBUILT_BINARIES,"32-bit-little-endian") \
++	GUILE_OPTIMIZATIONS = -O1 -Oresolve-primitives -Ocps \
++else \
++	GUILE_OPTIMIZATIONS = -O1 \
++endif)
++
+ GUILE_BOOTSTRAP_STAGE = stage0
+ 
+ include $(top_srcdir)/am/bootstrap.am
diff --git a/guile.changes b/guile.changes
index 577b59e..d301a11 100644
--- a/guile.changes
+++ b/guile.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Mar  7 07:28:50 UTC 2022 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com>
+
+- Add patch to fix build on 32-bit big-endian targets
+  * adjust-32bit-big-endian-build-flags.patch
+- Run aclocal before %configure to regenerate aclocal.m4
+
 -------------------------------------------------------------------
 Thu Feb 24 18:24:20 UTC 2022 - Ferdinand Thiessen <rpm@fthiessen.de>
 
diff --git a/guile.spec b/guile.spec
index d7be465..89a05ce 100644
--- a/guile.spec
+++ b/guile.spec
@@ -39,6 +39,7 @@ Patch0:         guile-3.0-gc_pkgconfig_private.patch
 # The out-of-memory test is flaky, so disable it
 Patch1:         disable-test-out-of-memory.patch
 Patch2:         gcc10-x86-disable-one-test.patch
+Patch3:         adjust-32bit-big-endian-build-flags.patch
 BuildRequires:  gmp-devel
 BuildRequires:  libffi-devel
 BuildRequires:  libltdl-devel
@@ -103,6 +104,7 @@ linked in as a library when building extensible programs.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 # remove broken prebuilt objects
 rm -r prebuilt/32-bit-big-endian
@@ -113,6 +115,7 @@ echo exit 77 > test-suite/standalone/test-stack-overflow
 %endif
 
 %build
+aclocal
 %configure \
   --disable-static \
   --with-pic \