diff --git a/devel/magit/Makefile b/devel/magit/Makefile
index 67ccf77a941b..3558297fd860 100644
--- a/devel/magit/Makefile
+++ b/devel/magit/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	magit
-PORTVERSION=	2.2.0
+PORTVERSION=	2.5.0
 CATEGORIES=	devel elisp
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 
@@ -11,16 +11,18 @@ COMMENT=	Interface to Git for Emacs
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	dash.el>0:${PORTSDIR}/devel/dash.el
-RUN_DEPENDS=	dash.el>0:${PORTSDIR}/devel/dash.el
+BUILD_DEPENDS=	dash.el>=2.12.1:${PORTSDIR}/devel/dash.el \
+		with-editor-${EMACS_PORT_NAME}>=2.5.0:${PORTSDIR}/editors/with-editor
+RUN_DEPENDS=	dash.el>=2.12.1:${PORTSDIR}/devel/dash.el \
+		with-editor-${EMACS_PORT_NAME}>=2.5.0:${PORTSDIR}/editors/with-editor
 
 USE_GITHUB=	yes
 
 USES=		gmake makeinfo
-USE_EMACS=	YES
-INFO=		magit magit-popup with-editor
+USE_EMACS=	yes
+INFO=		magit magit-popup
 PORTDOCS=	AUTHORS.md
-NO_ARCH=	YES
+NO_ARCH=	yes
 
 OPTIONS_DEFINE=			DOCS GIT_SUBVERSION
 GIT_SUBVERSION_DESC=		Use devel/git-subversion as backend
@@ -33,7 +35,7 @@ GIT_SUBVERSION_RUN_DEPENDS_OFF=	git>0:${PORTSDIR}/devel/git
 
 ELISPDIR=	${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
 MAKE_ENV+=	INSTALL_INFO=install-info \
-		LOAD_PATH="-L ${WRKSRC}/lisp -L ${PREFIX}/${EMACS_SITE_LISPDIR}" \
+		LOAD_PATH="-L ${WRKSRC}/lisp -L ${PREFIX}/${EMACS_SITE_LISPDIR}  -L ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}" \
 		VERSION=${PORTVERSION} \
 		lispdir=${PREFIX}/${ELISPDIR} \
 		infodir=${PREFIX}/${INFO_PATH} \
diff --git a/devel/magit/distinfo b/devel/magit/distinfo
index 31aa50fa7a1a..160a63dfaae4 100644
--- a/devel/magit/distinfo
+++ b/devel/magit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (magit-magit-2.2.0_GH0.tar.gz) = 947c47961d5adbcbccda2ed50b7ef59e82ff91e089dedd645f14eeeb7d9acac9
-SIZE (magit-magit-2.2.0_GH0.tar.gz) = 320300
+SHA256 (magit-magit-2.5.0_GH0.tar.gz) = 3e2e3f1d915bdf86f04a29380fe3fa8a1802ea04e3a91a443de0315fcb46027c
+SIZE (magit-magit-2.5.0_GH0.tar.gz) = 362213
diff --git a/devel/magit/pkg-plist b/devel/magit/pkg-plist
index 385b54ef3f8b..20d14be73c1a 100644
--- a/devel/magit/pkg-plist
+++ b/devel/magit/pkg-plist
@@ -5,6 +5,8 @@
 %%ELISPDIR%%/magit-apply.el
 %%ELISPDIR%%/magit-apply.elc
 %%ELISPDIR%%/magit-autoloads.el
+%%ELISPDIR%%/magit-autorevert.el
+%%ELISPDIR%%/magit-autorevert.elc
 %%ELISPDIR%%/magit-bisect.el
 %%ELISPDIR%%/magit-bisect.elc
 %%ELISPDIR%%/magit-blame.el
@@ -37,6 +39,8 @@
 %%ELISPDIR%%/magit-sequence.elc
 %%ELISPDIR%%/magit-stash.el
 %%ELISPDIR%%/magit-stash.elc
+%%ELISPDIR%%/magit-submodule.el
+%%ELISPDIR%%/magit-submodule.elc
 %%ELISPDIR%%/magit-utils.el
 %%ELISPDIR%%/magit-utils.elc
 %%ELISPDIR%%/magit-version.el
@@ -44,5 +48,3 @@
 %%ELISPDIR%%/magit-wip.elc
 %%ELISPDIR%%/magit.el
 %%ELISPDIR%%/magit.elc
-%%ELISPDIR%%/with-editor.el
-%%ELISPDIR%%/with-editor.elc