diff --git a/editors/zed/Makefile b/editors/zed/Makefile
index 0412f6578f57..fe0e0d9fadaa 100644
--- a/editors/zed/Makefile
+++ b/editors/zed/Makefile
@@ -1,95 +1,98 @@
 PORTNAME=	zed
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.217.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	editors
 PKGNAMESUFFIX=	-editor
 
 MAINTAINER=	tagattie@FreeBSD.org
 COMMENT=	Code at the speed of thought
 WWW=		https://zed.dev/
 
 LICENSE=	AGPLv3 APACHE20 GPLv3
 LICENSE_COMB=	multi
 LICENSE_FILE_AGPLv3=	${WRKSRC}/LICENSE-AGPL
 LICENSE_FILE_APACHE20=	${WRKSRC}/LICENSE-APACHE
 LICENSE_FILE_GPLv3=	${WRKSRC}/LICENSE-GPL
 
 ONLY_FOR_ARCHS=	aarch64 amd64
 ONLY_FOR_ARCHS_REASON=	Some of dependent crates only support these architectures
 
 BUILD_DEPENDS=	protoc:devel/protobuf
 LIB_DEPENDS=	libzstd.so:archivers/zstd \
 		libasound.so:audio/alsa-lib \
 		libgit2.so:devel/libgit2 \
 		libcurl.so:ftp/curl \
 		libvulkan.so:graphics/vulkan-loader \
 		libwayland-client.so:graphics/wayland \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libxkbcommon.so:x11/libxkbcommon
 RUN_DEPENDS=	vulkaninfo:graphics/vulkan-tools \
 		npm${NODEJS_SUFFIX}>0:www/npm${NODEJS_SUFFIX} \
 		xdg-desktop-portal-gtk>0:x11/xdg-desktop-portal-gtk
 
 USES=		cargo cmake:indirect desktop-file-utils gettext-runtime:build \
 		llvm nodejs:lts,run ssl xorg
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	zed-industries
 
 USE_XORG=	x11 xcb
 
 CARGO_BUILD_ARGS=	--package zed --package cli --package remote_server
 CARGO_TEST_ARGS=	--workspace
 
 MAKE_ENV=	APP_CLI="zedit" \
 		APP_ICON="zed-editor" \
 		APP_ID="dev.zed.Zed" \
 		APP_NAME="Zed" \
 		APP_ARGS="%U" \
 		DO_STARTUP_NOTIFY="true" \
 		ZED_UPDATE_EXPLANATION="Please use packages/ports to update zed." \
 		RELEASE_VERSION="${DISTVERSION}"
 
+SUB_FILES=	pkg-message
+SUB_LIST=	DISTVERSION=${DISTVERSION}
+
 PLIST_FILES=	bin/zedit \
-		bin/zed-remote-server-stable-${DISTVERSION} \
+		bin/zed-remote-server-stable-${DISTVERSION}+stable \
 		libexec/zed-editor \
 		share/applications/dev.zed.Zed.desktop \
 		share/icons/hicolor/1024x1024/apps/zed-editor.png \
 		share/icons/hicolor/512x512/apps/zed-editor.png
 PORTDOCS=	CONTRIBUTING.md README.md
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 # https://github.com/RazrFalcon/fontdb/issues/61
 	@${REINPLACE_CMD} -e 's|/etc|${LOCALBASE}&|g' \
 		${WRKSRC_crate_fontdb-0.16.2}/src/lib.rs \
 		${WRKSRC_crate_fontdb-0.23.0}/src/lib.rs
 
 post-build:
 	${SETENV} ${MAKE_ENV} envsubst < \
 		${WRKSRC}/crates/zed/resources/zed.desktop.in > \
 		${WRKSRC}/crates/zed/resources/zed.desktop
 
 do-install:
 	${INSTALL_PROGRAM} ${CARGO_TARGET_DIR}/release/cli \
 		${STAGEDIR}${PREFIX}/bin/zedit
 	${INSTALL_PROGRAM} ${CARGO_TARGET_DIR}/release/remote_server \
-		${STAGEDIR}${PREFIX}/bin/zed-remote-server-stable-${DISTVERSION}
+		${STAGEDIR}${PREFIX}/bin/zed-remote-server-stable-${DISTVERSION}+stable
 	${INSTALL_PROGRAM} ${CARGO_TARGET_DIR}/release/zed \
 		${STAGEDIR}${PREFIX}/libexec/zed-editor
 	${INSTALL_DATA} ${WRKSRC}/crates/zed/resources/${PORTNAME}.desktop \
 		${STAGEDIR}${DESKTOPDIR}/dev.zed.Zed.desktop
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/512x512/apps
 	${INSTALL_DATA} ${WRKSRC}/crates/zed/resources/app-icon.png \
 		${STAGEDIR}${PREFIX}/share/icons/hicolor/512x512/apps/zed-editor.png
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/1024x1024/apps
 	${INSTALL_DATA} ${WRKSRC}/crates/zed/resources/app-icon@2x.png \
 		${STAGEDIR}${PREFIX}/share/icons/hicolor/1024x1024/apps/zed-editor.png
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_MAN} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/editors/zed/files/pkg-message.in b/editors/zed/files/pkg-message.in
new file mode 100644
index 000000000000..8f2c41981d45
--- /dev/null
+++ b/editors/zed/files/pkg-message.in
@@ -0,0 +1,37 @@
+[
+{ type: install
+  message: <<EOM
+Remote development over ssh:
+
+If you want to use remote development over ssh and a remote host runs
+FreeBSD, take the following steps:
+
+1. Create a directory for storing the remote server
+   $ ssh <remote-host> mkdir ~/.zed_server
+2. Upload the remote server to the remote host
+   $ scp %%PREFIX%%/bin/zed-remote-server-stable-%%DISTVERSION%%+stable <remote-host>:~/.zed_server
+
+Now you are all set for remote development.
+
+If your remote host runs Linux or macOS, remote development should
+work out of the box.
+
+General information on remote development is available at the
+following URL:
+- https://zed.dev/docs/remote-development
+
+Limitations on FreeBSD:
+
+Realtime collaboration features based on WebRTC are not yet
+supported. In addition, integrated terminal is very laggy (might
+depending on a user's environment).
+
+More information on Zed developments for FreeBSD is available at the
+following URLs:
+
+- https://zed.dev/docs/development/freebsd
+- https://github.com/zed-industries/zed/discussions/29550
+- https://github.com/zed-industries/zed/issues/15309
+EOM
+}
+]
diff --git a/editors/zed/pkg-message b/editors/zed/pkg-message
deleted file mode 100644
index ca8bcdc4c316..000000000000
--- a/editors/zed/pkg-message
+++ /dev/null
@@ -1,16 +0,0 @@
-[
-{ type: install
-  message: <<EOM
-Realtime collaboration features based on WebRTC are not yet
-supported. In addition, integrated terminal is very laggy (might
-depending on a user's environment).
-
-More information on Zed developments for FreeBSD is available at the
-following URLs:
-
-- https://zed.dev/docs/development/freebsd
-- https://github.com/zed-industries/zed/discussions/29550
-- https://github.com/zed-industries/zed/issues/15309
-EOM
-}
-]