diff --git a/devel/magit/Makefile b/devel/magit/Makefile
index 59928225ec46..0e8e9be02b6a 100644
--- a/devel/magit/Makefile
+++ b/devel/magit/Makefile
@@ -1,52 +1,53 @@
 # Created by: Jun Kuriyama <kuriyama@FreeBSD.org>
 
 PORTNAME=	magit
-PORTVERSION=	3.2.1
 DISTVERSIONPREFIX=	v
-PORTREVISION=	2
+DISTVERSION=	3.3.0
 CATEGORIES=	devel elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	yasu@FreeBSD.org
 COMMENT=	Interface to Git for Emacs
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	dash.el${EMACS_PKGNAMESUFFIX}>=2.18.1:devel/dash.el@${EMACS_FLAVOR} \
 		transient${EMACS_PKGNAMESUFFIX}>=0.3.6:devel/transient@${EMACS_FLAVOR} \
 		with-editor${EMACS_PKGNAMESUFFIX}>=3.0.4:editors/with-editor@${EMACS_FLAVOR}
 RUN_DEPENDS=	dash.el${EMACS_PKGNAMESUFFIX}>=2.18.1:devel/dash.el@${EMACS_FLAVOR} \
 		transient${EMACS_PKGNAMESUFFIX}>=0.3.6:devel/transient@${EMACS_FLAVOR} \
 		with-editor${EMACS_PKGNAMESUFFIX}>=3.0.4: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
 
 CONFLICTS_INSTALL=	magit-devel-emacs*
 
 NO_ARCH=	yes
 
 INFO=		magit magit-section
 PLIST_SUB+=	ELISPDIR=${_ELISPDIR}
 PORTDOCS=	AUTHORS.md
 
 OPTIONS_DEFINE=			DOCS LIBEGIT2
 OPTIONS_SUB=			yes
 LIBEGIT2_DESC=			Use libegit2 as backend (EXPERIMENTAL)
 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_OFF=		MAKE_ENV+=BUILD_MAGIT_LIBGIT=false
 
 _ELISPDIR=	${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/devel/magit/distinfo b/devel/magit/distinfo
index 50e2777b9c31..469576cec66c 100644
--- a/devel/magit/distinfo
+++ b/devel/magit/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1628447697
-SHA256 (magit-magit-v3.2.1_GH0.tar.gz) = 7adb0ad4eb6abdd11b2f71a21374605a3acdaa18e60133ee462051c115c22e3d
-SIZE (magit-magit-v3.2.1_GH0.tar.gz) = 619417
+TIMESTAMP = 1633411068
+SHA256 (magit-magit-v3.3.0_GH0.tar.gz) = 8c03f69b9f86cb515572d877b4e9677ceed7034be1abaa1b90c01904cd9bb8d6
+SIZE (magit-magit-v3.3.0_GH0.tar.gz) = 629283
diff --git a/devel/magit/pkg-plist b/devel/magit/pkg-plist
index ac90f82027cb..3b8478a113d2 100644
--- a/devel/magit/pkg-plist
+++ b/devel/magit/pkg-plist
@@ -1,96 +1,98 @@
 %%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-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-bundle.el
+%%ELISPDIR%%/magit-bundle.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-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