diff --git a/editors/with-editor/Makefile b/editors/with-editor/Makefile
index 48b087a5ead6..adf06b3e5efe 100644
--- a/editors/with-editor/Makefile
+++ b/editors/with-editor/Makefile
@@ -1,63 +1,65 @@
 PORTNAME=	with-editor
 DISTVERSIONPREFIX=	v
-DISTVERSION=	3.4.9
+DISTVERSION=	3.5.0
 CATEGORIES=	editors elisp
 
 MAINTAINER=	jrm@FreeBSD.org
 COMMENT=	Use the Emacsclient as the $$EDITOR of child processes
 WWW=		https://github.com/magit/with-editor
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	compat.el>=30.1.0.0:misc/compat.el
 
 USES=		emacs:build gmake makeinfo
 USE_GITHUB=	yes
 GH_ACCOUNT=	magit
 
 CONFLICTS_INSTALL=	with-editor-devel-emacs*
 
 NO_ARCH=	yes
 
 INFO=		with-editor
-PLIST_FILES=	${EMACS_SITE_LISPDIR}/with-editor-autoloads.el \
-		${EMACS_SITE_LISPDIR}/with-editor.el
+PLIST_FILES=	${ELISPDIR}/with-editor-autoloads.el \
+		${ELISPDIR}/with-editor.el
 PORTDOCS=	README.org with-editor.html
 
 OPTIONS_DEFINE=	DOCS PDF
 
 PDF_DESC=	Build and install PDF document
 
 DOCS_BUILD_DEPENDS=	gsed:textproc/gsed
 PDF_BUILD_DEPENDS=	texi2pdf:print/texinfo
 PDF_USES=		tex
 PDF_USE=		TEX=dvipdfmx:build
 PDF_PLIST_FILES=	${DOCSDIR}/with-editor.pdf
 
+ELISPDIR=	${EMACS_SITE_LISPDIR}/${PORTNAME}
+
 do-build:
 	cd ${WRKSRC} && ${MAKE_CMD} info
 	cd ${WRKSRC}/lisp && ${MAKE_CMD} autoloads
 
 do-build-DOCS-on:
 	cd ${WRKSRC} && SED=gsed ${MAKE_CMD} html
 
 do-build-PDF-on:
 	cd ${WRKSRC} && ${MAKE_CMD} pdf
 
 do-install:
-	@${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}
+	@${MKDIR} ${STAGEDIR}${PREFIX}/${ELISPDIR}
 	${INSTALL_DATA} ${WRKSRC}/lisp/*.el \
-		${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}
+		${STAGEDIR}${PREFIX}/${ELISPDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/*.info ${STAGEDIR}${PREFIX}/${INFO_PATH}
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.org \
 		${WRKSRC}/docs/with-editor.html ${STAGEDIR}${DOCSDIR}
 
 do-install-PDF-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/with-editor.pdf ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/editors/with-editor/distinfo b/editors/with-editor/distinfo
index 612a646df26d..4f79aa1a8b37 100644
--- a/editors/with-editor/distinfo
+++ b/editors/with-editor/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1776640173
-SHA256 (magit-with-editor-v3.4.9_GH0.tar.gz) = 47ee6519666d976b16d4624cf349e68e96447ebb20ddf0d5cbb36b51d13b7702
-SIZE (magit-with-editor-v3.4.9_GH0.tar.gz) = 33896
+TIMESTAMP = 1778382836
+SHA256 (magit-with-editor-v3.5.0_GH0.tar.gz) = 9d601700acbfeb519df7f02063211024b33e1c38428d0a0ad044e35c5d230fdf
+SIZE (magit-with-editor-v3.5.0_GH0.tar.gz) = 33999