diff --git a/emulators/riscv-isa-sim/Makefile b/emulators/riscv-isa-sim/Makefile
index 94566275c880..e9f7b75b8330 100644
--- a/emulators/riscv-isa-sim/Makefile
+++ b/emulators/riscv-isa-sim/Makefile
@@ -1,45 +1,47 @@
 PORTNAME=	riscv-isa-sim
 DISTVERSION=	git
-PORTREVISION=	20201102
+PORTREVISION=	20211015
 CATEGORIES=	emulators
 
 MAINTAINER=	lwhsu@FreeBSD.org
 COMMENT=	Spike, a RISC-V ISA Simulator
 
 LICENSE=	BSD3CLAUSE
 
-ONLY_FOR_ARCHS=	amd64 powerpc64 powerpc64le
+NOT_FOR_ARCHS=	i386
+NOT_FOR_ARCHS_REASON=	Does not build
 
 USES=	compiler:c++11-lang gmake shebangfix
 
 GH_ACCOUNT=	riscv
-GH_TAGNAME=	641d7d0
+GH_TAGNAME=	4f12984
 
 HAS_CONFIGURE=	yes
+CONFIGURE_ARGS=	--without-boost
 SHEBANG_FILES=	scripts/vcs-version.sh
 
 USE_GITHUB=	yes
 USE_LDCONFIG=	yes
 
 CFLAGS+=	-DRISCV_ENABLE_DIRTY=1
 
 STRIP_FILES=	bin/elf2hex \
 		bin/spike \
 		bin/spike-dasm \
 		bin/spike-log-parser \
 		bin/termios-xspike \
 		bin/xspike \
 		lib/libcustomext.so \
 		lib/libsoftfloat.so
 
 post-patch:
 	${REINPLACE_CMD} -e \
 	's|[(]install_libs_dir[)]/pkgconfig|(INSTALLDIR)/libdata/pkgconfig|g' \
 	${WRKSRC}/Makefile.in
 
 post-install:
 .	for f in ${STRIP_FILES}
 		${STRIP_CMD} ${STAGEDIR}${PREFIX}/${f}
 .	endfor
 
 .include <bsd.port.mk>
diff --git a/emulators/riscv-isa-sim/distinfo b/emulators/riscv-isa-sim/distinfo
index b19a16297f2b..0efac5e1e01f 100644
--- a/emulators/riscv-isa-sim/distinfo
+++ b/emulators/riscv-isa-sim/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1604881926
-SHA256 (riscv-riscv-isa-sim-git-641d7d0_GH0.tar.gz) = 810c0567ba31459a37bd84498071c68b1a85b8dc7f891df800b02201544e5149
-SIZE (riscv-riscv-isa-sim-git-641d7d0_GH0.tar.gz) = 385330
+TIMESTAMP = 1634590527
+SHA256 (riscv-riscv-isa-sim-git-4f12984_GH0.tar.gz) = f9312a39049cb42116bd4b9425c2ad2d89cb746b08fa2d5aba76b1c07e83d320
+SIZE (riscv-riscv-isa-sim-git-4f12984_GH0.tar.gz) = 445499
diff --git a/emulators/riscv-isa-sim/pkg-plist b/emulators/riscv-isa-sim/pkg-plist
index 9e5051a29424..8da738d3812e 100644
--- a/emulators/riscv-isa-sim/pkg-plist
+++ b/emulators/riscv-isa-sim/pkg-plist
@@ -1,27 +1,29 @@
 bin/elf2hex
 bin/spike
 bin/spike-dasm
 bin/spike-log-parser
 bin/termios-xspike
 bin/xspike
+include/fesvr/byteorder.h
+include/fesvr/config.h
 include/fesvr/context.h
 include/fesvr/device.h
 include/fesvr/dtm.h
 include/fesvr/elf.h
 include/fesvr/elfloader.h
 include/fesvr/htif.h
 include/fesvr/htif_hexwriter.h
 include/fesvr/htif_pthread.h
 include/fesvr/memif.h
 include/fesvr/option_parser.h
 include/fesvr/rfb.h
 include/fesvr/syscall.h
 include/fesvr/term.h
 include/fesvr/tsi.h
 include/riscv/mmio_plugin.h
 lib/libcustomext.so
 lib/libdisasm.a
 lib/libfesvr.a
 lib/libsoftfloat.so
 libdata/pkgconfig/riscv-disasm.pc
 libdata/pkgconfig/riscv-fesvr.pc