diff --git a/devel/magit-devel/Makefile b/devel/magit-devel/Makefile
index b8b7424f97fd..33bafa49368f 100644
--- a/devel/magit-devel/Makefile
+++ b/devel/magit-devel/Makefile
@@ -1,73 +1,72 @@
 PORTNAME=	magit
 DISTVERSIONPREFIX=	v
-DISTVERSION=	3.3.0-133
-DISTVERSIONSUFFIX=	-g846d153a
-PORTREVISION=	1
+DISTVERSION=	3.3.0-184
+DISTVERSIONSUFFIX=	-g0f96d398
 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} \
 		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} \
 		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" \
 		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 264e4b1288e9..4025f40718d4 100644
--- a/devel/magit-devel/distinfo
+++ b/devel/magit-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1643664221
-SHA256 (magit-magit-v3.3.0-133-g846d153a_GH0.tar.gz) = c6ced178a1423e15f0e7c53e8b34a906d3e71c42ef02205154d65b30ef1ab696
-SIZE (magit-magit-v3.3.0-133-g846d153a_GH0.tar.gz) = 637518
+TIMESTAMP = 1646062193
+SHA256 (magit-magit-v3.3.0-184-g0f96d398_GH0.tar.gz) = fd82c54d6e3bf41b6b3ca6c608de1a1db785667fec1061d708ce207683273895
+SIZE (magit-magit-v3.3.0-184-g0f96d398_GH0.tar.gz) = 641397
diff --git a/devel/magit-devel/pkg-plist b/devel/magit-devel/pkg-plist
index 3a476c77e6bb..e202561b7702 100644
--- a/devel/magit-devel/pkg-plist
+++ b/devel/magit-devel/pkg-plist
@@ -1,102 +1,100 @@
 %%ELISPDIR%%/git-commit.el
 %%ELISPDIR%%/git-commit.elc
 %%ELISPDIR%%/git-rebase.el
 %%ELISPDIR%%/git-rebase.elc
 %%ELISPDIR%%/magit-apply.el
 %%ELISPDIR%%/magit-apply.elc
 %%ELISPDIR%%/magit-autoloads.el
 %%ELISPDIR%%/magit-autorevert.el
 %%ELISPDIR%%/magit-autorevert.elc
+%%ELISPDIR%%/magit-base.el
+%%ELISPDIR%%/magit-base.elc
 %%ELISPDIR%%/magit-bundle.el
 %%ELISPDIR%%/magit-bundle.elc
 %%ELISPDIR%%/magit-bisect.el
 %%ELISPDIR%%/magit-bisect.elc
 %%ELISPDIR%%/magit-blame.el
 %%ELISPDIR%%/magit-blame.elc
 %%ELISPDIR%%/magit-bookmark.el
 %%ELISPDIR%%/magit-bookmark.elc
 %%ELISPDIR%%/magit-branch.el
 %%ELISPDIR%%/magit-branch.elc
 %%ELISPDIR%%/magit-clone.el
 %%ELISPDIR%%/magit-clone.elc
 %%ELISPDIR%%/magit-commit.el
 %%ELISPDIR%%/magit-commit.elc
 %%ELISPDIR%%/magit-core.el
 %%ELISPDIR%%/magit-core.elc
 %%ELISPDIR%%/magit-diff.el
 %%ELISPDIR%%/magit-diff.elc
 %%ELISPDIR%%/magit-ediff.el
 %%ELISPDIR%%/magit-ediff.elc
 %%ELISPDIR%%/magit-extras.el
 %%ELISPDIR%%/magit-extras.elc
 %%ELISPDIR%%/magit-fetch.el
 %%ELISPDIR%%/magit-fetch.elc
 %%ELISPDIR%%/magit-files.el
 %%ELISPDIR%%/magit-files.elc
 %%ELISPDIR%%/magit-git.el
 %%ELISPDIR%%/magit-git.elc
 %%ELISPDIR%%/magit-gitignore.el
 %%ELISPDIR%%/magit-gitignore.elc
-%%ELISPDIR%%/magit-imenu.el
-%%ELISPDIR%%/magit-imenu.elc
 %%LIBEGIT2%%%%ELISPDIR%%/magit-libgit.el
 %%LIBEGIT2%%%%ELISPDIR%%/magit-libgit.elc
 %%ELISPDIR%%/magit-log.el
 %%ELISPDIR%%/magit-log.elc
 %%ELISPDIR%%/magit-margin.el
 %%ELISPDIR%%/magit-margin.elc
 %%ELISPDIR%%/magit-merge.el
 %%ELISPDIR%%/magit-merge.elc
 %%ELISPDIR%%/magit-mode.el
 %%ELISPDIR%%/magit-mode.elc
 %%ELISPDIR%%/magit-notes.el
 %%ELISPDIR%%/magit-notes.elc
 %%ELISPDIR%%/magit-obsolete.el
 %%ELISPDIR%%/magit-obsolete.elc
 %%ELISPDIR%%/magit-patch.el
 %%ELISPDIR%%/magit-patch.elc
 %%ELISPDIR%%/magit-process.el
 %%ELISPDIR%%/magit-process.elc
 %%ELISPDIR%%/magit-pull.el
 %%ELISPDIR%%/magit-pull.elc
 %%ELISPDIR%%/magit-push.el
 %%ELISPDIR%%/magit-push.elc
 %%ELISPDIR%%/magit-reflog.el
 %%ELISPDIR%%/magit-reflog.elc
 %%ELISPDIR%%/magit-refs.el
 %%ELISPDIR%%/magit-refs.elc
 %%ELISPDIR%%/magit-remote.el
 %%ELISPDIR%%/magit-remote.elc
 %%ELISPDIR%%/magit-repos.el
 %%ELISPDIR%%/magit-repos.elc
 %%ELISPDIR%%/magit-reset.el
 %%ELISPDIR%%/magit-reset.elc
 %%ELISPDIR%%/magit-section.el
 %%ELISPDIR%%/magit-section.elc
 %%ELISPDIR%%/magit-sequence.el
 %%ELISPDIR%%/magit-sequence.elc
 %%ELISPDIR%%/magit-sparse-checkout.el
 %%ELISPDIR%%/magit-sparse-checkout.elc
 %%ELISPDIR%%/magit-stash.el
 %%ELISPDIR%%/magit-stash.elc
 %%ELISPDIR%%/magit-status.el
 %%ELISPDIR%%/magit-status.elc
 %%ELISPDIR%%/magit-submodule.el
 %%ELISPDIR%%/magit-submodule.elc
 %%ELISPDIR%%/magit-subtree.el
 %%ELISPDIR%%/magit-subtree.elc
 %%ELISPDIR%%/magit-tag.el
 %%ELISPDIR%%/magit-tag.elc
 %%ELISPDIR%%/magit-transient.el
 %%ELISPDIR%%/magit-transient.elc
-%%ELISPDIR%%/magit-utils.el
-%%ELISPDIR%%/magit-utils.elc
 %%ELISPDIR%%/magit-version.el
 %%ELISPDIR%%/magit-wip.el
 %%ELISPDIR%%/magit-wip.elc
 %%ELISPDIR%%/magit-worktree.el
 %%ELISPDIR%%/magit-worktree.elc
 %%ELISPDIR%%/magit.el
 %%ELISPDIR%%/magit.elc
 %%PDF%%%%DOCSDIR%%/magit-section.pdf
 %%PDF%%%%DOCSDIR%%/magit.pdf