diff --git a/lang/guile/Makefile b/lang/guile/Makefile
index 85ba27157bca..fbe30cd86534 100644
--- a/lang/guile/Makefile
+++ b/lang/guile/Makefile
@@ -1,57 +1,64 @@
 # Created by: jseger@FreeBSD.org
 #    $MCom: ports/lang/guile/Makefile,v 1.1 2006/09/12 14:57:06 ahze Exp $
 
 PORTNAME=	guile
 PORTVERSION=	3.0.7
 CATEGORIES=	lang scheme
 MASTER_SITES=	GNU
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	GNU Ubiquitous Intelligent Language for Extension
 
 LICENSE=	GPLv3 LGPL3
 LICENSE_COMB=	multi
 
 LIB_DEPENDS=	libffi.so:devel/libffi \
 		libgmp.so:math/gmp \
 		libltdl.so:devel/libltdl \
 		libunistring.so:devel/libunistring
 
 USES=		charsetfix compiler:c11 cpe gmake iconv libtool makeinfo pathfix pkgconfig \
 	readline tar:lz
 USE_LDCONFIG=	yes
 
 CPE_VENDOR=	gnu
 
 CONFLICTS_INSTALL=	guile1 guile2
 
 MAKE_JOBS_UNSAFE=	yes
 
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 
 INFO=		guile r5rs
 
 PLIST_SUB=	GUILE_VER=${PORTVERSION:R}
 
 OPTIONS_DEFINE=	NLS THREADS
 OPTIONS_DEFAULT=NLS THREADS
 OPTIONS_SUB=	yes
 
 NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=	gettext
 
 THREADS_CONFIGURE_WITH=	threads
 THREADS_LIB_DEPENDS=	libgc-threaded.so:devel/boehm-gc-threaded
 THREADS_LIB_DEPENDS_OFF=	libgc.so:devel/boehm-gc
 
+.include <bsd.port.options.mk>
+
+.if ${ARCH} == powerpc
+EXTRA_PATCHES=	${FILESDIR}/extra-patch-bootstrap_Makefile.in
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|sys/time.h sys/timeb.h|sys/time.h |g' \
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|-i -e|-i.bak -e|' \
 		${WRKSRC}/libguile/Makefile.in
+	@${RM} -r ${WRKSRC}/prebuilt/32-bit-big-endian
 
 post-patch-THREADS-on:
 	@${REINPLACE_CMD} -e 's|bdw-gc|bdw-gc-threaded|g' ${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/lang/guile/files/extra-patch-bootstrap_Makefile.in b/lang/guile/files/extra-patch-bootstrap_Makefile.in
new file mode 100644
index 000000000000..b5c56900c963
--- /dev/null
+++ b/lang/guile/files/extra-patch-bootstrap_Makefile.in
@@ -0,0 +1,11 @@
+--- bootstrap/Makefile.in.orig	2022-02-02 15:41:58 UTC
++++ bootstrap/Makefile.in
+@@ -1751,7 +1751,7 @@ top_builddir_absolute = @top_builddir_absolute@
+ top_srcdir = @top_srcdir@
+ top_srcdir_absolute = @top_srcdir_absolute@
+ GUILE_WARNINGS = -W0
+-GUILE_OPTIMIZATIONS = -O1
++GUILE_OPTIMIZATIONS = -O1 -Oresolve-primitives -Ocps
+ GOBJECTS = $(SOURCES:%.scm=%.go)
+ nobase_noinst_DATA = $(GOBJECTS)
+ CLEANFILES = $(GOBJECTS)