diff --git a/editors/lapce/Makefile b/editors/lapce/Makefile
index 054ab47e1960..8130c654882f 100644
--- a/editors/lapce/Makefile
+++ b/editors/lapce/Makefile
@@ -1,39 +1,39 @@
 PORTNAME=	lapce
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.2.5	# remove openssl-src-* from CARGO-CRATES each update
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	editors
 
 MAINTAINER=	eduardo@FreeBSD.org
 COMMENT=	Lightning-fast and Powerful Code Editor
 WWW=		https://lapce.dev/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 NOT_FOR_ARCHS=	i386
 NOT_FOR_ARCHS_REASON_i386=	doesn't build: [zstd-sys 2.0.1+zstd.1.5.2] AR_i686_unknown_freebsd = None
 
 BUILD_DEPENDS=	p5-Cairo-GObject>0:devel/p5-Cairo-GObject \
 		p5-FindBin-libs>0:devel/p5-FindBin-libs
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libgit2.so:devel/libgit2 \
 		libssh2.so:security/libssh2
 
 USES=		cargo gmake gnome localbase:ldflags perl5 pkgconfig ssl
 USE_GITHUB=	yes
 USE_GNOME=	atk gdkpixbuf2 gtk30 pango
 
 PLIST_FILES=	bin/lapce \
 		bin/lapce-proxy
 
 #patch druid manually since it's not yet patched upstream
 post-patch:
 	@${FIND} ${WRKSRC}/../druid-0b9c00fcda238e392e758382f25166cd748fd305 \
 		 -name "*.toml" -o -name "*.rs" | ${XARGS} ${REINPLACE_CMD} -i '' -e 's|openbsd|freebsd|g'
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/lapce
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/lapce-proxy
 
 .include <bsd.port.mk>
diff --git a/editors/lapce/files/patch-cargo-crates_wasmtime-runtime-1.0.2_src_traphandlers_unix.rs b/editors/lapce/files/patch-cargo-crates_wasmtime-runtime-1.0.2_src_traphandlers_unix.rs
new file mode 100644
index 000000000000..6061e8861b3d
--- /dev/null
+++ b/editors/lapce/files/patch-cargo-crates_wasmtime-runtime-1.0.2_src_traphandlers_unix.rs
@@ -0,0 +1,15 @@
+--- cargo-crates/wasmtime-runtime-1.0.2/src/traphandlers/unix.rs.orig	2023-01-13 13:01:32 UTC
++++ cargo-crates/wasmtime-runtime-1.0.2/src/traphandlers/unix.rs
+@@ -228,6 +228,12 @@ unsafe fn get_pc_and_fp(cx: *mut libc::c_void, _signum
+                 cx.uc_mcontext.mc_rip as *const u8,
+                 cx.uc_mcontext.mc_rbp as usize,
+             )
++        } else if #[cfg(all(target_os = "freebsd", target_arch = "aarch64"))] {
++            let cx = &*(cx as *const libc::mcontext_t);
++            (
++                cx.mc_gpregs.gp_elr as *const u8,
++                cx.mc_gpregs.gp_x[29] as usize,
++            )
+         } else {
+             compile_error!("unsupported platform");
+         }