diff --git a/net-im/signal-desktop/Makefile b/net-im/signal-desktop/Makefile
index 7d2d242e277a..c535cdbc833f 100644
--- a/net-im/signal-desktop/Makefile
+++ b/net-im/signal-desktop/Makefile
@@ -1,187 +1,197 @@
 PORTNAME=	signal-desktop
 DISTVERSIONPREFIX=	v
 DISTVERSION=	5.47.0
 CATEGORIES=	net-im
 MASTER_SITES=	LOCAL/mikael/signal-desktop/:yarn \
 		LOCAL/mikael/signal-desktop/:electron_gyp \
 		LOCAL/mikael/signal-desktop/:npm \
 		LOCAL/mikael/signal-desktop/:sqlite
 DISTFILES=	signal-desktop-${DISTVERSION}-yarn-cache.tar.gz:yarn \
 		signal-desktop-${DISTVERSION}-electron-gyp-cache.tar.gz:electron_gyp \
 		signal-desktop-${DISTVERSION}-npm-cache.tar.gz:npm \
 		sqlcipher.tar.gz:sqlite
 
 MAINTAINER=	mikael@FreeBSD.org
 COMMENT=	Cross-platform centralized encrypted messaging service
 
 LICENSE=	AGPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 ONLY_FOR_ARCHS=	aarch64 amd64
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libringrtc.so:multimedia/ringrtc \
 		${LOCALBASE}/lib/libsignal_node.so:net-im/libsignal-node \
 		app-builder>0:devel/app-builder \
 		electron${ELECTRON_VER_MAJOR}:devel/electron${ELECTRON_VER_MAJOR} \
 		npm:www/npm-node16 \
 		openssl>0:security/openssl \
 		vips>0:graphics/vips \
 		yarn:www/yarn-node16
 LIB_DEPENDS=	libasound.so:audio/alsa-lib \
 		libatk-bridge-2.0.so:accessibility/at-spi2-atk \
 		libatspi.so:accessibility/at-spi2-core \
 		libcups.so:print/cups \
 		libdbus-1.so:devel/dbus \
 		libdrm.so:graphics/libdrm \
 		libexpat.so:textproc/expat2 \
 		libFLAC.so:audio/flac \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libharfbuzz-subset.so:print/harfbuzz \
 		libharfbuzz.so:print/harfbuzz \
 		libnspr4.so:devel/nspr \
 		libnss3.so:security/nss \
 		libnssutil3.so:security/nss \
 		libopenh264.so:multimedia/openh264 \
 		libopus.so:audio/opus \
 		libpci.so:devel/libpci \
 		libplc4.so:devel/nspr \
 		libplds4.so:devel/nspr \
 		libpng16.so:graphics/png \
 		libsmime3.so:security/nss \
 		libsnappy.so:archivers/snappy \
 		libwebp.so:graphics/webp \
 		libwebpdemux.so:graphics/webp \
 		libwebpmux.so:graphics/webp \
 		libxkbcommon.so:x11/libxkbcommon \
 		libxshmfence.so:x11/libxshmfence
 
 USES=		desktop-file-utils gettext-runtime gl gnome jpeg xorg
 USE_GITHUB=	yes
 GH_ACCOUNT=	signalapp
 GH_PROJECT=	Signal-Desktop
 
 USE_GL=		gbm gl
 USE_GNOME=	atk cairo gdkpixbuf2 glib20 gtk30 libxml2 libxslt pango
 USE_XORG=	x11 xcb xcomposite xdamage xext xfixes xi xrandr xrender xtst
 
 PACKAGE_ENV=	SIGNAL_ENV=production
 MAKE_ENV+=	ELECTRON_OVERRIDE_DIST_PATH=${LOCALBASE}/share/electron${ELECTRON_VER_MAJOR} \
 		HOME=${WRKDIR} \
 		PLAYWRIGHT_BROWSERS_PATH=${WRKDIR}/.cache \
 		PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=true \
 		PLAYWRIGHT_SKIP_VALIDATE_HOST_REQUIREMENTS=true \
 		USE_SYSTEM_APP_BUILDER=true
 
 # Don't download electron binary distribution on electron node_modules installation
 MAKE_ENV+=	ELECTRON_SKIP_BINARY_DOWNLOAD=1
 
 # Don't create __pycache__ directory when executing node-gyp
 # This is a workaround to avoid filesystem violations during poudriere build
 MAKE_ENV+=	PYTHONDONTWRITEBYTECODE=1
 
 _BUILD_DATE=	$$(date +'%s')
 
 ELECTRON_VER_MAJOR=	19
 
 NPM_SIGNAL_DIR=		npm-@signalapp-libsignal-client-0.17.0-ffe6763d80f56148b45192bca29deb16f9a0aea8-integrity
 NPM_RINGRTC_DIR=	npm-ringrtc-2.20.10-4450aa43e0f95e09e61cf49e970d864b19fa9d50
 NPM_SQLITE3_DIR=	npm-better-sqlite3-7.5.0-3c4a7eebba3d5f5d8cb88fe83be1c01b8c0dea7d
 NPM_PLAYWRITE_DIR=	npm-playwright-core-1.17.1-a16e0f89284a0ed8ae6d77e1c905c84b8a2ba022-integrity
 NPM_ESBUILD_VERS=	0.14.28
 NPM_ESBUILD_DIR=	npm-esbuild-${NPM_ESBUILD_VERS}-7738635d2ea19e446bd319d83a1802545e6aebb8-integrity
 
+NODE_ARCH=		${ARCH:S/aarch64/arm64/:S/amd64/x64/}
+APP_OUT_DIR=		linux-${ARCH:S/aarch64/arm64-/:S/amd64//}unpacked
+
+PLIST_SUB=		NODE_ARCH=${NODE_ARCH} \
+			SHARP_ARCH=${ARCH:S/aarch64/arm64v8/:S/amd64/x64/}
+
 post-patch:
 	${REINPLACE_CMD} "s#%%EPOCH%%#${_BUILD_DATE}#" \
 		${WRKSRC}/ts/scripts/get-expire-time.ts
 
 do-build:
 	${ECHO_CMD} 'yarn-offline-mirror "../yarn-cache"' > ${WRKSRC}/.yarnrc
 
 # electron-builder is stupid and tries to open ${LOCALBASE}/share/electron19/electron with WRITE priv
 # copy ${LOCALBASE}/share/electron19 in WRKDIR
 # it's needed for the do-install phase, it's here because of this issue
 # https://github.com/MikaelUrankar/signal-desktop/issues/6 (I don't know why it fails though)
+	@${RM} -r ${WRKDIR}/electron${ELECTRON_VER_MAJOR}
 	@${CP} -pR ${LOCALBASE}/share/electron${ELECTRON_VER_MAJOR} ${WRKDIR}/electron${ELECTRON_VER_MAJOR}
 	${CHMOD} -R a+w ${WRKDIR}/electron${ELECTRON_VER_MAJOR}
 
 	# Install libsignal_node.so and libringrtc.so binaries in the yarn cache
-	${MKDIR} ${WRKDIR}/.cache/yarn/v6/${NPM_SIGNAL_DIR}/node_modules/@signalapp/libsignal-client/prebuilds/freebsd-x64 \
+	${MKDIR} ${WRKDIR}/.cache/yarn/v6/${NPM_SIGNAL_DIR}/node_modules/@signalapp/libsignal-client/prebuilds/freebsd-${NODE_ARCH} \
 		 ${WRKDIR}/.cache/yarn/v6/${NPM_RINGRTC_DIR}/node_modules/ringrtc/build/freebsd
 	${CP} ${LOCALBASE}/lib/libsignal_node.so \
-		${WRKDIR}/.cache/yarn/v6/${NPM_SIGNAL_DIR}/node_modules/@signalapp/libsignal-client/prebuilds/freebsd-x64/node.napi.node
+		${WRKDIR}/.cache/yarn/v6/${NPM_SIGNAL_DIR}/node_modules/@signalapp/libsignal-client/prebuilds/freebsd-${NODE_ARCH}/node.napi.node
 	${CP} ${LOCALBASE}/lib/libringrtc.so \
-		${WRKDIR}/.cache/yarn/v6/${NPM_RINGRTC_DIR}/node_modules/ringrtc/build/freebsd/libringrtc-x64.node
+		${WRKDIR}/.cache/yarn/v6/${NPM_RINGRTC_DIR}/node_modules/ringrtc/build/freebsd/libringrtc-${NODE_ARCH}.node
 
 	# sqlcipher.tar.gz requires git-lfs to fetch, just copy a previously downloaded one (I've had to use ubuntu for that,
 	# as I didn't manage to do it with FreeBSD, see https://github.com/signalapp/Signal-Desktop/blob/development/CONTRIBUTING.md for instructions)
 	${MKDIR} ${WRKDIR}/.cache/yarn/v6/${NPM_SQLITE3_DIR}/node_modules/better-sqlite3/deps
 	${CP} ${DISTDIR}/sqlcipher.tar.gz \
 		${WRKDIR}/.cache/yarn/v6/${NPM_SQLITE3_DIR}/node_modules/better-sqlite3/deps/sqlcipher.tar.gz
 
 	# patch-package can't patch playwright-core, patch the yarn cache instead
 	${CP} ${FILESDIR}/playwrigth-registry.js \
 	 	${WRKDIR}/.cache/yarn/v6/${NPM_PLAYWRITE_DIR}/node_modules/playwright-core/lib/utils/registry.js
 
+	# patch-package can't patch sqlite3 on aarch64, patch the yarn cache instead
+	cd ${WRKDIR}/.cache/yarn/v6 && ${PATCH} -s -N -i ${FILESDIR}/sqlite3.gyp.diff
+
 	${MKDIR} ${WRKDIR}/esbuild-freebsd-64-${NPM_ESBUILD_VERS}
 	${TAR} -xf ${WRKDIR}/yarn-cache/esbuild-freebsd-64-${NPM_ESBUILD_VERS}.tgz -C ${WRKDIR}/esbuild-freebsd-64-${NPM_ESBUILD_VERS}
 	${CP} ${WRKDIR}/esbuild-freebsd-64-${NPM_ESBUILD_VERS}/package/bin/esbuild \
 		${WRKDIR}/.cache/yarn/v6/${NPM_ESBUILD_DIR}/node_modules/esbuild/lib/downloaded-esbuild-freebsd-64-esbuild
 
 # 	# For online build
 #	${RM} ${WRKDIR}/.npmrc
 #	cd ${WRKSRC} && \
 #		${SETENV} ${MAKE_ENV} yarn install --frozen-lockfile --ignore-optional
 #	cd ${WRKSRC} && \
 #		${SETENV} ${MAKE_ENV} yarn generate
 #	cd ${WRKSRC} && \
 #		${SETENV} ${MAKE_ENV} yarn build:webpack
 
  	# For offline build
 	${ECHO_CMD} offline=true > ${WRKDIR}/.npmrc
 	cd ${WRKSRC} && \
 		${SETENV} ${MAKE_ENV} yarn install --frozen-lockfile --ignore-optional --offline
 	cd ${WRKSRC} && \
 		${SETENV} ${MAKE_ENV} yarn --offline generate
 	cd ${WRKSRC} && \
 		${SETENV} ${MAKE_ENV} yarn --offline build:webpack
 
 do-install:
 # taken from https://github.com/tagattie/FreeBSD-Electron/blob/master/Mk/Uses/electron.mk#L387
 # and editors/vscode
 	cd ${WRKSRC} && \
 		${SETENV} ${MAKE_ENV} ${PACKAGE_ENV} yarn run electron-builder \
 			--linux --dir --config.npmRebuild=false \
 			--config.electronVersion=${ELECTRON_VER_MAJOR} \
 			--config.electronDist=${WRKDIR}/electron${ELECTRON_VER_MAJOR}
 
 	${MKDIR} ${STAGEDIR}${DATADIR}
-	cd ${BUILD_WRKSRC}/dist/linux-unpacked && \
+	cd ${BUILD_WRKSRC}/dist/${APP_OUT_DIR} && \
 		${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}
 
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps
 	${INSTALL_DATA} ${WRKSRC}/images/signal-logo-desktop-linux.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps/signal-desktop.png
 	${INSTALL_DATA} ${FILESDIR}/${PORTNAME}.desktop \
 		${STAGEDIR}${PREFIX}/share/applications
 
 .for f in chromedriver mksnapshot v8_context_snapshot_generator
 	${RM} ${STAGEDIR}${DATADIR}/${f}
 .endfor
 	${RM} -r ${STAGEDIR}${DATADIR}/gen
 	${RM} -r ${STAGEDIR}${DATADIR}/node_headers
 	${RM} -r ${STAGEDIR}${DATADIR}/resources/completions
 	${RLN} ${STAGEDIR}${DATADIR}/signal-desktop ${STAGEDIR}${PREFIX}/bin
 
 create-caches-tarball:
 	# do some cleanup first
 	${RM} -r  ${WRKDIR}/.npm/_logs ${WRKDIR}/.npm/_update-notifier-last-checked ${WRKDIR}/.cache/yarn/v6/.tmp
 	${FIND} ${WRKDIR}/.cache -type f -perm 755 -exec file {} \; | ${EGREP} "ELF|PE32+|Mach-O" | ${AWK} -F ':' '{print $$1}' | ${XARGS} ${RM}
 
 	cd ${WRKDIR} && \
 		${TAR} czf signal-desktop-${DISTVERSION}-yarn-cache.tar.gz .cache yarn-cache
 	cd ${WRKDIR} && \
 		${TAR} czf signal-desktop-${DISTVERSION}-electron-gyp-cache.tar.gz .electron-gyp
 	cd ${WRKDIR} && \
 		${TAR} czf signal-desktop-${DISTVERSION}-npm-cache.tar.gz .npm
 
 .include <bsd.port.mk>
diff --git a/net-im/signal-desktop/files/patch-patches_better-sqlite3+7.5.0.patch b/net-im/signal-desktop/files/patch-patches_better-sqlite3+7.5.0.patch
deleted file mode 100644
index 3b02e7399c4b..000000000000
--- a/net-im/signal-desktop/files/patch-patches_better-sqlite3+7.5.0.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- patches/better-sqlite3+7.5.0.patch.orig	2021-05-16 17:14:17 UTC
-+++ patches/better-sqlite3+7.5.0.patch
-@@ -0,0 +1,17 @@
-+--- a/node_modules/better-sqlite3/deps/sqlite3.gyp.orig
-++++ b/node_modules/better-sqlite3/deps/sqlite3.gyp
-+@@ -95,6 +95,14 @@
-+             ]
-+           }
-+         },
-++        'OS == "freebsd"', {
-++          'link_settings': {
-++            'libraries': [
-++              # This statically links libcrypto, whereas -lcrypto would dynamically link it
-++              '/usr/local/lib/libcrypto.a'
-++            ]
-++          }
-++        },
-+         { # Linux
-+           'link_settings': {
-+             'libraries': [
diff --git a/net-im/signal-desktop/files/patch-patches_electron-builder+23.0.1.patch b/net-im/signal-desktop/files/patch-patches_electron-builder+23.0.8.patch
similarity index 86%
rename from net-im/signal-desktop/files/patch-patches_electron-builder+23.0.1.patch
rename to net-im/signal-desktop/files/patch-patches_electron-builder+23.0.8.patch
index d0de11b7c8c7..1dbd00a2200f 100644
--- a/net-im/signal-desktop/files/patch-patches_electron-builder+23.0.1.patch
+++ b/net-im/signal-desktop/files/patch-patches_electron-builder+23.0.8.patch
@@ -1,16 +1,16 @@
---- patches/electron-builder+23.0.1.patch.orig	2022-02-24 13:03:47 UTC
-+++ patches/electron-builder+23.0.1.patch
+--- patches/electron-builder+23.0.8.patch.orig	2022-02-24 13:03:47 UTC
++++ patches/electron-builder+23.0.8.patch
 @@ -0,0 +1,13 @@
 +diff --git a/node_modules/electron-builder/out/cli/install-app-deps.js b/node_modules/electron-builder/out/cli/install-app-deps.js
 +index 0c58564..2b6f9a5 100644
 +--- a/node_modules/electron-builder/out/cli/install-app-deps.js
 ++++ b/node_modules/electron-builder/out/cli/install-app-deps.js
 +@@ -23,7 +23,7 @@ function configureInstallAppDepsCommand(yargs) {
 +         "camel-case-expansion": false,
 +     })
 +         .option("platform", {
 +-        choices: ["linux", "darwin", "win32"],
 ++        choices: ["freebsd", "linux", "darwin", "win32"],
 +         default: process.platform,
 +         description: "The target platform",
 +     })
diff --git a/net-im/signal-desktop/files/sqlite3.gyp.diff b/net-im/signal-desktop/files/sqlite3.gyp.diff
new file mode 100644
index 000000000000..81f31a90fa68
--- /dev/null
+++ b/net-im/signal-desktop/files/sqlite3.gyp.diff
@@ -0,0 +1,17 @@
+--- npm-better-sqlite3-7.5.0-3c4a7eebba3d5f5d8cb88fe83be1c01b8c0dea7d/node_modules/better-sqlite3/deps/sqlite3.gyp.orig	2022-07-02 14:34:04 UTC
++++ npm-better-sqlite3-7.5.0-3c4a7eebba3d5f5d8cb88fe83be1c01b8c0dea7d/node_modules/better-sqlite3/deps/sqlite3.gyp
+@@ -95,6 +95,14 @@
+             ]
+           }
+         },
++        'OS == "freebsd"', {
++          'link_settings': {
++            'libraries': [
++              # This statically links libcrypto, whereas -lcrypto would dynamically link it
++              '/usr/local/lib/libcrypto.a'
++            ]
++          }
++        },
+         { # Linux
+           'link_settings': {
+             'libraries': [
diff --git a/net-im/signal-desktop/pkg-plist b/net-im/signal-desktop/pkg-plist
index be1863b8bd50..48b8204f269d 100644
--- a/net-im/signal-desktop/pkg-plist
+++ b/net-im/signal-desktop/pkg-plist
@@ -1,94 +1,94 @@
 bin/signal-desktop
 share/applications/signal-desktop.desktop
 share/pixmaps/signal-desktop.png
 %%DATADIR%%/LICENSE.electron.txt
 %%DATADIR%%/LICENSES.chromium.html
 %%DATADIR%%/chrome_100_percent.pak
 %%DATADIR%%/chrome_200_percent.pak
 %%DATADIR%%/icudtl.dat
 %%DATADIR%%/libEGL.so
 %%DATADIR%%/libGLESv2.so
 %%DATADIR%%/libffmpeg.so
 %%DATADIR%%/libvk_swiftshader.so
 %%DATADIR%%/libvulkan.so
 %%DATADIR%%/locales/af.pak
 %%DATADIR%%/locales/am.pak
 %%DATADIR%%/locales/ar.pak
 %%DATADIR%%/locales/az.pak
 %%DATADIR%%/locales/bg.pak
 %%DATADIR%%/locales/bn.pak
 %%DATADIR%%/locales/ca.pak
 %%DATADIR%%/locales/cs.pak
 %%DATADIR%%/locales/cy.pak
 %%DATADIR%%/locales/da.pak
 %%DATADIR%%/locales/de.pak
 %%DATADIR%%/locales/el.pak
 %%DATADIR%%/locales/en-GB.pak
 %%DATADIR%%/locales/en-US.pak
 %%DATADIR%%/locales/eo.pak
 %%DATADIR%%/locales/es-419.pak
 %%DATADIR%%/locales/es.pak
 %%DATADIR%%/locales/et.pak
 %%DATADIR%%/locales/eu.pak
 %%DATADIR%%/locales/fa.pak
 %%DATADIR%%/locales/fi.pak
 %%DATADIR%%/locales/fil.pak
 %%DATADIR%%/locales/fr.pak
 %%DATADIR%%/locales/gd.pak
 %%DATADIR%%/locales/gu.pak
 %%DATADIR%%/locales/he.pak
 %%DATADIR%%/locales/hi.pak
 %%DATADIR%%/locales/hr.pak
 %%DATADIR%%/locales/hu.pak
 %%DATADIR%%/locales/id.pak
 %%DATADIR%%/locales/is.pak
 %%DATADIR%%/locales/it.pak
 %%DATADIR%%/locales/ja.pak
 %%DATADIR%%/locales/km.pak
 %%DATADIR%%/locales/kn.pak
 %%DATADIR%%/locales/ko.pak
 %%DATADIR%%/locales/ku.pak
 %%DATADIR%%/locales/lo.pak
 %%DATADIR%%/locales/lt.pak
 %%DATADIR%%/locales/lv.pak
 %%DATADIR%%/locales/mk.pak
 %%DATADIR%%/locales/ml.pak
 %%DATADIR%%/locales/mr.pak
 %%DATADIR%%/locales/ms.pak
 %%DATADIR%%/locales/nb.pak
 %%DATADIR%%/locales/nl.pak
 %%DATADIR%%/locales/nn.pak
 %%DATADIR%%/locales/no.pak
 %%DATADIR%%/locales/pa.pak
 %%DATADIR%%/locales/pl.pak
 %%DATADIR%%/locales/ps.pak
 %%DATADIR%%/locales/pt-BR.pak
 %%DATADIR%%/locales/pt-PT.pak
 %%DATADIR%%/locales/ro.pak
 %%DATADIR%%/locales/ru.pak
 %%DATADIR%%/locales/sk.pak
 %%DATADIR%%/locales/sl.pak
 %%DATADIR%%/locales/sq.pak
 %%DATADIR%%/locales/sr.pak
 %%DATADIR%%/locales/sv.pak
 %%DATADIR%%/locales/sw.pak
 %%DATADIR%%/locales/ta.pak
 %%DATADIR%%/locales/te.pak
 %%DATADIR%%/locales/th.pak
 %%DATADIR%%/locales/tr.pak
 %%DATADIR%%/locales/ug.pak
 %%DATADIR%%/locales/uk.pak
 %%DATADIR%%/locales/ur.pak
 %%DATADIR%%/locales/vi.pak
 %%DATADIR%%/locales/zh-CN.pak
 %%DATADIR%%/locales/zh-TW.pak
 %%DATADIR%%/resources.pak
 %%DATADIR%%/resources/app.asar
-%%DATADIR%%/resources/app.asar.unpacked/node_modules/@signalapp/libsignal-client/prebuilds/freebsd-x64/node.napi.node
+%%DATADIR%%/resources/app.asar.unpacked/node_modules/@signalapp/libsignal-client/prebuilds/freebsd-%%NODE_ARCH%%/node.napi.node
 %%DATADIR%%/resources/app.asar.unpacked/node_modules/better-sqlite3/build/Release/better_sqlite3.node
-%%DATADIR%%/resources/app.asar.unpacked/node_modules/ringrtc/build/freebsd/libringrtc-x64.node
-%%DATADIR%%/resources/app.asar.unpacked/node_modules/sharp/build/Release/sharp-freebsd-x64.node
+%%DATADIR%%/resources/app.asar.unpacked/node_modules/ringrtc/build/freebsd/libringrtc-%%NODE_ARCH%%.node
+%%DATADIR%%/resources/app.asar.unpacked/node_modules/sharp/build/Release/sharp-freebsd-%%SHARP_ARCH%%.node
 @(,,755) %%DATADIR%%/signal-desktop
 %%DATADIR%%/snapshot_blob.bin
 %%DATADIR%%/v8_context_snapshot.bin
 %%DATADIR%%/vk_swiftshader_icd.json