diff --git a/mail/py-offlineimap3/Makefile b/mail/py-offlineimap3/Makefile
index 7304ae0a6aed..3b2f5da1bba7 100644
--- a/mail/py-offlineimap3/Makefile
+++ b/mail/py-offlineimap3/Makefile
@@ -1,92 +1,90 @@
 PORTNAME=	offlineimap3
 DISTVERSIONPREFIX=	v
-DISTVERSION=	8.0.0-78
-DISTVERSIONSUFFIX=	-g${GH_TAGNAME}
+DISTVERSION=	8.0.1
 CATEGORIES=	mail python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	dereks@lifeofadishwasher.com
 COMMENT=	Two-way synchronization of local Maildir and IMAP folders
 WWW=		https://github.com/OfflineIMAP/offlineimap3
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}imaplib2>=3.5:mail/py-imaplib2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}distro>=0:sysutils/py-distro@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}imaplib2>=3.5:mail/py-imaplib2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}keyring>0:security/py-keyring@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}rfc6555>=0:mail/py-rfc6555@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}urllib3>=1.25.9:net/py-urllib3@${PY_FLAVOR}
 
 USES=		python
 
 # Project is currently not publishing to pypi sdist.  pypi/naming status:
 # https://github.com/OfflineIMAP/offlineimap3/issues/111
 USE_GITHUB=	yes
 GH_ACCOUNT=	OfflineIMAP
-GH_TAGNAME=	db347452273bb0f1b1a8ea952f6fb46cf95fedbf
 
 USE_PYTHON=	autoplist concurrent distutils pytest
 TEST_ARGS=	"-k not TestBasicFunctions or test_01_MappedImap"
 
 CONFLICTS_INSTALL=	mail/py-offlineimap
 
 NO_ARCH=	yes
 
 PORTDOCS=	*
 PORTEXAMPLES=	offlineimap.conf
 
 OPTIONS_DEFINE=		DOCS EXAMPLES GSSAPI KEYRING MANPAGES
 OPTIONS_DEFAULT=	KEYRING MANPAGES
 
 KEYRING_DESC=		GNOME keyring support
 
 COMMON_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}rfc6555>=0:mail/py-rfc6555@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR} \
 			a2x:textproc/asciidoc \
 			gmake:devel/gmake
 
 DOCS_BUILD_DEPENDS=	${COMMON_BUILD_DEPENDS} \
 			${PYTHON_PKGNAMEPREFIX}sphinx>=0:textproc/py-sphinx@${PY_FLAVOR}
 
 GSSAPI_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gssapi>=1.6.9:security/py-gssapi@${PY_FLAVOR}
 
 KEYRING_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}keyring>0:security/py-keyring@${PY_FLAVOR}
 
 MANPAGES_BUILD_DEPENDS=	${COMMON_BUILD_DEPENDS}
 MANPAGES_PLIST_FILES+=	share/man/man1/offlineimap.1.gz \
 			share/man/man7/offlineimapui.7.gz
 
 # In concurrent env. sphinx-build is only exist for py38 add "-${PYTHON_VER}" to command
 post-patch:
 	cd ${WRKSRC} && \
 	${REINPLACE_CMD} '/^SPHINXBUILD = sphinx-build$$/s/$$/-${PYTHON_VER}/' \
 		docs/Makefile
 
 post-build-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/docs && ${GMAKE} docs && \
 	cd html && \
 	${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} \
 		'! ( -name .lock -or -name .buildinfo )'
 
 post-build-MANPAGES-on:
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/man/man7/
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/man/man1/
 	cd ${WRKSRC}/docs && ${GMAKE} man && \
 	${INSTALL_MAN} offlineimapui.7 ${STAGEDIR}${PREFIX}/share/man/man7/ && \
 	${INSTALL_MAN} offlineimap.1 ${STAGEDIR}${PREFIX}/share/man/man1/
 
 post-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/offlineimap.conf ${STAGEDIR}${EXAMPLESDIR}
 
 pre-test:
 	cd ${WRKSRC} && \
 	${CP} test/credentials.conf.sample test/credentials.conf
 
 .include <bsd.port.mk>
diff --git a/mail/py-offlineimap3/distinfo b/mail/py-offlineimap3/distinfo
index 72a531bf6f22..1b7f4c5ea08f 100644
--- a/mail/py-offlineimap3/distinfo
+++ b/mail/py-offlineimap3/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1760295184
-SHA256 (OfflineIMAP-offlineimap3-v8.0.0-78-gdb347452273bb0f1b1a8ea952f6fb46cf95fedbf-db347452273bb0f1b1a8ea952f6fb46cf95fedbf_GH0.tar.gz) = 0f44eee350bff1ff232426f192defcdfc01bcaf5aa5beb310aa232ef7370362d
-SIZE (OfflineIMAP-offlineimap3-v8.0.0-78-gdb347452273bb0f1b1a8ea952f6fb46cf95fedbf-db347452273bb0f1b1a8ea952f6fb46cf95fedbf_GH0.tar.gz) = 706499
+TIMESTAMP = 1761725040
+SHA256 (OfflineIMAP-offlineimap3-v8.0.1_GH0.tar.gz) = 82ce54136465ea1cce62f4e961e8c155ac3eee2149fa812763629448902d7d69
+SIZE (OfflineIMAP-offlineimap3-v8.0.1_GH0.tar.gz) = 706574