diff --git a/devel/magit/Makefile b/devel/magit/Makefile
index 8b3e69a65646..a9bb5c1470dc 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.0
+DISTVERSIONPREFIX=	v
+PORTVERSION=	3.2.1
 CATEGORIES=	devel elisp
-MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/v${PORTVERSION}/
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	yasu@utahime.org
 COMMENT=	Interface to Git for Emacs
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	dash.el${EMACS_PKGNAMESUFFIX}>=2.14.1:devel/dash.el@${EMACS_FLAVOR} \
 		ghub${EMACS_PKGNAMESUFFIX}>=3.0.0:devel/ghub@${EMACS_FLAVOR} \
 		transient${EMACS_PKGNAMESUFFIX}>=0:devel/transient@${EMACS_FLAVOR} \
 		with-editor${EMACS_PKGNAMESUFFIX}>=2.8.0:editors/with-editor@${EMACS_FLAVOR}
 RUN_DEPENDS=	dash.el${EMACS_PKGNAMESUFFIX}>=2.14.1:devel/dash.el@${EMACS_FLAVOR} \
 		ghub${EMACS_PKGNAMESUFFIX}>=3.0.0:devel/ghub@${EMACS_FLAVOR} \
 		transient${EMACS_PKGNAMESUFFIX}>=0:devel/transient@${EMACS_FLAVOR} \
 		with-editor${EMACS_PKGNAMESUFFIX}>=2.8.0: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}
 
 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 2c3d331193ec..50e2777b9c31 100644
--- a/devel/magit/distinfo
+++ b/devel/magit/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1627838229
-SHA256 (magit-3.2.0.tar.gz) = 701c876f4dccc3a67f1c8a60875ede69b84046526de7ee918fc7937d243d92ec
-SIZE (magit-3.2.0.tar.gz) = 430921
+TIMESTAMP = 1628447697
+SHA256 (magit-magit-v3.2.1_GH0.tar.gz) = 7adb0ad4eb6abdd11b2f71a21374605a3acdaa18e60133ee462051c115c22e3d
+SIZE (magit-magit-v3.2.1_GH0.tar.gz) = 619417