diff --git a/lang/eisl/Makefile b/lang/eisl/Makefile
index 480fb19df85e..b95e717195e0 100644
--- a/lang/eisl/Makefile
+++ b/lang/eisl/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	eisl
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.50-114
-PORTREVISION=	1
+PORTREVISION=	2
 DISTVERSIONSUFFIX=	-g1216d9e
 CATEGORIES=	lang devel
 
@@ -11,8 +11,6 @@ COMMENT=	Interpreter and compiler compatible with ISLisp standard
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/documents/license.txt
 
-BROKEN_riscv64=	hard-float 'd' ABI can't be used for a target that doesn't support the D instruction set extension (ignoring target-abi)
-
 TEST_DEPENDS=	cppcheck:devel/cppcheck
 
 USES=		gmake ncurses:port # port because tests need ncurses6-config
@@ -30,4 +28,10 @@ LDFLAGS+=	-lncursesw
 PLIST_FILES=	bin/edlis \
 		bin/eisl
 
+.include <bsd.port.options.mk>
+
+.if ${ARCH} == powerpc64 || ${ARCH} == riscv64
+EXTRA_PATCHES=	${FILESDIR}/extra-patch-makefile
+.endif
+
 .include <bsd.port.mk>
diff --git a/lang/eisl/files/extra-patch-makefile b/lang/eisl/files/extra-patch-makefile
new file mode 100644
index 000000000000..1a520e96a594
--- /dev/null
+++ b/lang/eisl/files/extra-patch-makefile
@@ -0,0 +1,19 @@
+--- makefile.orig	2022-08-01 14:01:09 UTC
++++ makefile
+@@ -42,7 +42,7 @@ ifeq ($(DEBUG),1)
+ 		LDFLAGS := -fsanitize=undefined
+ 	endif
+ else
+-	CFLAGS += -O3 -flto -DNDEBUG=1 -DWITHOUT_NANA=1
++	CFLAGS += -O3 -DNDEBUG=1 -DWITHOUT_NANA=1
+ 	SRC_CII += cii/src/mem.c
+ endif
+ OBJ_CII := $(SRC_CII:.c=.o)
+@@ -59,7 +59,6 @@ ifeq  ($(shell uname -n),raspberrypi)
+ 	CFLAGS += -D__rpi__
+ endif
+ ifneq ($(DEBUG),1)
+-	LDFLAGS += -flto
+ 	ifeq ($(OPSYS),macos)
+ 		LDFLAGS += -Wl,-S,-x
+ 	else