diff --git a/editors/with-editor/Makefile b/editors/with-editor/Makefile
index dc418be67a03..f166fd6a7863 100644
--- a/editors/with-editor/Makefile
+++ b/editors/with-editor/Makefile
@@ -1,42 +1,41 @@
 # Created by: KIMURA Yasuhiro <yasu@utahime.org>
 
 PORTNAME=	with-editor
 DISTVERSIONPREFIX=	v
-DISTVERSION=	3.0.5
-PORTREVISION=	1
+DISTVERSION=	3.1.0
 CATEGORIES=	editors elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	yasu@FreeBSD.org
 COMMENT=	Use the Emacsclient as the $$EDITOR of child processes
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		emacs gmake makeinfo
 USE_GITHUB=	yes
 GH_ACCOUNT=	magit
 
-MAKE_ENV+=	EFLAGS="-L ${PREFIX}/${EMACS_SITE_LISPDIR}"
+ALL_TARGET=	lisp info
 
 NO_ARCH=	yes
 
 INFO=		with-editor
 PLIST_FILES=	${EMACS_VERSION_SITE_LISPDIR}/with-editor-autoloads.el \
 		${EMACS_VERSION_SITE_LISPDIR}/with-editor.el \
 		${EMACS_VERSION_SITE_LISPDIR}/with-editor.elc
 PORTDOCS=	README.md
 
 OPTIONS_DEFINE=	DOCS
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}
-	${INSTALL_DATA} ${WRKSRC}/*.el ${WRKSRC}/*.elc \
+	${INSTALL_DATA} ${WRKSRC}/lisp/*.el* \
 		${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}
+	${INSTALL_DATA} ${WRKSRC}/docs/*.info ${STAGEDIR}${PREFIX}/${INFO_PATH}
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/*.info ${STAGEDIR}${PREFIX}/${INFO_PATH}
 	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/editors/with-editor/distinfo b/editors/with-editor/distinfo
index a7ce53ee5f62..9dd18ea6b5b5 100644
--- a/editors/with-editor/distinfo
+++ b/editors/with-editor/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1633136248
-SHA256 (magit-with-editor-v3.0.5_GH0.tar.gz) = 9926e69aef982a6c857d742016c274acfa00d2cb2b07f48e01477aa57639d488
-SIZE (magit-with-editor-v3.0.5_GH0.tar.gz) = 31985
+TIMESTAMP = 1641462807
+SHA256 (magit-with-editor-v3.1.0_GH0.tar.gz) = 511841c41baba1b2793de3dc6d3af2d221d4e856cd1d4916f0fc195ea979cea8
+SIZE (magit-with-editor-v3.1.0_GH0.tar.gz) = 32068