diff --git a/misc/emacs-libvterm/Makefile b/misc/emacs-libvterm/Makefile
index 187045d9f648..2c04f901c7ee 100644
--- a/misc/emacs-libvterm/Makefile
+++ b/misc/emacs-libvterm/Makefile
@@ -1,36 +1,34 @@
 PORTNAME=	emacs-libvterm
 DISTVERSION=	g20251119
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	misc elisp
 
 MAINTAINER=	tslight@pm.me
 COMMENT=	Emacs libvterm integration
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libvterm.so:devel/libvterm
 
 USES=		cmake:noninja emacs
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	akermu
 GH_TAGNAME=	a01a2894a1c1e81a39527835a9169e35b7ec5dec
 
 CONFLICTS_INSTALL=	emacs-libvterm-emacs_*
 
+SUB_FILES=	pkg-message
+SUB_LIST+=	EMACS_SITE_LISPDIR=${EMACS_SITE_LISPDIR}
+
 do-install:
-	@${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/etc
-	@${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/vterm
+	@${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/vterm/etc
 	${INSTALL_DATA} ${WRKSRC}/vterm.el \
 		${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/vterm
 	${INSTALL_LIB} ${WRKSRC}/vterm-module.so \
 		${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/vterm
-	${INSTALL_DATA} ${WRKSRC}/etc/emacs-vterm-bash.sh \
-		${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/etc/
-	${INSTALL_DATA} ${WRKSRC}/etc/emacs-vterm-zsh.sh \
-		${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/etc/
-	${INSTALL_DATA} ${WRKSRC}/etc/emacs-vterm.fish \
-		${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/etc/
+	${INSTALL_DATA} ${WRKSRC}/etc/* \
+		${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/vterm/etc/
 
 .include <bsd.port.mk>
diff --git a/misc/emacs-libvterm/files/pkg-message.in b/misc/emacs-libvterm/files/pkg-message.in
new file mode 100644
index 000000000000..b705eed14ffd
--- /dev/null
+++ b/misc/emacs-libvterm/files/pkg-message.in
@@ -0,0 +1,26 @@
+[
+{
+  type: install
+  message: <<EOT
+Final emacs-libvterm setup instructions:
+
+Add (require 'vterm) to your Emacs configuration.
+
+M-x 'vterm' to open a new terminal.
+EOT
+}
+{
+  type: upgrade
+  maximum_version: "g20251119_2"
+  message: <<EOM
+The emacs-libvterm shell-integration scripts have moved:
+
+old:  %%PREFIX%%/%%EMACS_SITE_LISPDIR%%/etc/
+new:  %%PREFIX%%/%%EMACS_SITE_LISPDIR%%/vterm/etc/
+
+If you source emacs-vterm-bash.sh, emacs-vterm-zsh.sh, or
+emacs-vterm.fish from your shell startup file (e.g. .bashrc, .zshrc, or
+config.fish), update the path accordingly.
+EOM
+}
+]
diff --git a/misc/emacs-libvterm/pkg-message b/misc/emacs-libvterm/pkg-message
deleted file mode 100644
index 347c507b1041..000000000000
--- a/misc/emacs-libvterm/pkg-message
+++ /dev/null
@@ -1,12 +0,0 @@
-[
-{
-message: <<EOT
-Final emacs-libvterm setup instructions:
-
-Add (require 'vterm) to your Emacs configuration.
-
-M-x 'vterm' to open a new terminal.
-EOT
-  type: install
-}
-]
diff --git a/misc/emacs-libvterm/pkg-plist b/misc/emacs-libvterm/pkg-plist
index 93f271e3f797..7be334f16075 100644
--- a/misc/emacs-libvterm/pkg-plist
+++ b/misc/emacs-libvterm/pkg-plist
@@ -1,5 +1,5 @@
-%%EMACS_SITE_LISPDIR%%/etc/emacs-vterm-bash.sh
-%%EMACS_SITE_LISPDIR%%/etc/emacs-vterm-zsh.sh
-%%EMACS_SITE_LISPDIR%%/etc/emacs-vterm.fish
+%%EMACS_SITE_LISPDIR%%/vterm/etc/emacs-vterm-bash.sh
+%%EMACS_SITE_LISPDIR%%/vterm/etc/emacs-vterm-zsh.sh
+%%EMACS_SITE_LISPDIR%%/vterm/etc/emacs-vterm.fish
 %%EMACS_SITE_LISPDIR%%/vterm/vterm-module.so
 %%EMACS_SITE_LISPDIR%%/vterm/vterm.el