diff --git a/devel/magit-devel/Makefile b/devel/magit-devel/Makefile
index 1fbdd6f03eb8..df02d0424ab1 100644
--- a/devel/magit-devel/Makefile
+++ b/devel/magit-devel/Makefile
@@ -1,73 +1,74 @@
 PORTNAME=	magit
 DISTVERSIONPREFIX=	v
-DISTVERSION=	3.3.0-249
-PORTREVISION=	1
-DISTVERSIONSUFFIX=	-g6a5c79fd
+DISTVERSION=	3.3.0-300
+DISTVERSIONSUFFIX=	-g2235876d
 CATEGORIES=	devel elisp
 PKGNAMESUFFIX=	-devel${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	yasu@FreeBSD.org
 COMMENT=	Interface to Git for Emacs (Development Version)
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	dash.el${EMACS_PKGNAMESUFFIX}>=2.19.1:devel/dash.el@${EMACS_FLAVOR} \
+BUILD_DEPENDS=	compat.el${EMACS_PKGNAMESUFFIX}>=28.1.1.0:misc/compat.el@${EMACS_FLAVOR} \
+		dash.el${EMACS_PKGNAMESUFFIX}>=2.19.1:devel/dash.el@${EMACS_FLAVOR} \
 		transient${EMACS_PKGNAMESUFFIX}>=0.3.7:devel/transient@${EMACS_FLAVOR} \
 		with-editor${EMACS_PKGNAMESUFFIX}>=3.0.5:editors/with-editor@${EMACS_FLAVOR}
-RUN_DEPENDS=	dash.el${EMACS_PKGNAMESUFFIX}>=2.19.1:devel/dash.el@${EMACS_FLAVOR} \
+RUN_DEPENDS=	compat.el${EMACS_PKGNAMESUFFIX}>=28.1.1.0:misc/compat.el@${EMACS_FLAVOR} \
+		dash.el${EMACS_PKGNAMESUFFIX}>=2.19.1:devel/dash.el@${EMACS_FLAVOR} \
 		transient${EMACS_PKGNAMESUFFIX}>=0.3.7:devel/transient@${EMACS_FLAVOR} \
 		with-editor${EMACS_PKGNAMESUFFIX}>=3.0.5:editors/with-editor@${EMACS_FLAVOR}
 
 USES=		emacs gmake makeinfo
 USE_GITHUB=	yes
 
 MAKE_ENV+=	docdir=${DOCSDIR} \
 		infodir=${PREFIX}/${INFO_PATH} \
 		INSTALL_INFO=install-info \
 		lispdir=${PREFIX}/${ELISPDIR} \
-		LOAD_PATH="-L ${WRKSRC}/lisp -L ${PREFIX}/${EMACS_SITE_LISPDIR} -L ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR} -L ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/ghub" \
+		LOAD_PATH="-L ${WRKSRC}/lisp -L ${PREFIX}/${EMACS_SITE_LISPDIR} -L ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR} -L ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/compat -L ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/ghub" \
 		VERSION=${PORTVERSION}
 # Parallel build fails if Emacs is built with native compilation enabled
 MAKE_JOBS_UNSAFE=	yes
 ALL_TARGET=	lisp info
 INSTALL_TARGET=	install-lisp install-info
 
 CONFLICTS_INSTALL=	magit-emacs*
 
 NO_ARCH=	yes
 
 INFO=		magit magit-section
 PLIST_SUB+=	ELISPDIR=${ELISPDIR}
 PORTDOCS=	*.html *.md RelNotes/*
 
 OPTIONS_DEFINE=	DOCS LIBEGIT2 PDF
 OPTIONS_SUB=	yes
 
 LIBEGIT2_DESC=	Use libegit2 as backend (EXPERIMENTAL)
 PDF_DESC=	Build and install PDF document
 
 DOCS_BUILD_DEPENDS=		gsed:textproc/gsed
 DOCS_ALL_TARGET=		html
 DOCS_BINARY_ALIAS=		sed=gsed
 LIBEGIT2_BUILD_DEPENDS=		libegit2${EMACS_PKGNAMESUFFIX}>=g20200515:devel/libegit2@${EMACS_FLAVOR}
 LIBEGIT2_BUILD_DEPENDS_OFF=	git:devel/git
 LIBEGIT2_RUN_DEPENDS=		libegit2${EMACS_PKGNAMESUFFIX}>=g20200515:devel/libegit2@${EMACS_FLAVOR}
 LIBEGIT2_RUN_DEPENDS_OFF=	git:devel/git
 LIBEGIT2_VARS=			MAKE_ENV+=BUILD_MAGIT_LIBGIT=true
 PDF_BUILD_DEPENDS=		texi2pdf:print/texinfo
 PDF_USE=			TEX=dvipdfmx:build
 PDF_ALL_TARGET=			pdf
 
 ELISPDIR=	${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/RelNotes
 	${INSTALL_DATA} ${WRKSRC}/docs/*.md ${STAGEDIR}${DOCSDIR}
 	${COPYTREE_SHARE} ${WRKSRC}/docs/RelNotes ${STAGEDIR}${DOCSDIR}/RelNotes
 
 do-install-PDF-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/*.pdf ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/devel/magit-devel/distinfo b/devel/magit-devel/distinfo
index 9fcf8b0d62a6..068a41407e08 100644
--- a/devel/magit-devel/distinfo
+++ b/devel/magit-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1648774105
-SHA256 (magit-magit-v3.3.0-249-g6a5c79fd_GH0.tar.gz) = 4395c40cb5f57b3d005c94d0c711686fdf8e602e8f2165d39abab221d49093a1
-SIZE (magit-magit-v3.3.0-249-g6a5c79fd_GH0.tar.gz) = 648516
+TIMESTAMP = 1651317833
+SHA256 (magit-magit-v3.3.0-300-g2235876d_GH0.tar.gz) = faa1c1cb49ae8fbff637fcd19ebe9295827e761a60dceab66bdbd3e43a7ce974
+SIZE (magit-magit-v3.3.0-300-g2235876d_GH0.tar.gz) = 644669