diff --git a/mail/py-offlineimap/Makefile b/mail/py-offlineimap/Makefile
index 32fd1f8b3853..1acc8ca776db 100644
--- a/mail/py-offlineimap/Makefile
+++ b/mail/py-offlineimap/Makefile
@@ -1,83 +1,84 @@
 PORTNAME=	offlineimap
-DISTVERSION=	8.0.2
+DISTVERSION=	8.0.3
 CATEGORIES=	mail python
 MASTER_SITES=	PYPI
 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}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}urllib3>=1.25.9:net/py-urllib3@${PY_FLAVOR}
 
 USES=		python
 
 USE_PYTHON=	autoplist concurrent pep517 pytest
 TEST_ARGS=	"-k not TestBasicFunctions or test_01_MappedImap"
 
 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}distro>=0:sysutils/py-distro@${PY_FLAVOR} \
 			${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-offlineimap/distinfo b/mail/py-offlineimap/distinfo
index 82d7d56a4695..fdd3f08fa72b 100644
--- a/mail/py-offlineimap/distinfo
+++ b/mail/py-offlineimap/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1776035904
-SHA256 (offlineimap-8.0.2.tar.gz) = 73c0a3e2a88df7c8600fe5e42dd2a34502304c4ea560522e21fb541fc8ad3f12
-SIZE (offlineimap-8.0.2.tar.gz) = 221404
+TIMESTAMP = 1781470703
+SHA256 (offlineimap-8.0.3.tar.gz) = f7abf1c8962ed16926c870c91b6b132df3f22650f5aaaf44925d5630e3a08cf6
+SIZE (offlineimap-8.0.3.tar.gz) = 224924
diff --git a/mail/py-offlineimap/files/patch-offlineimap_imapserver.py b/mail/py-offlineimap/files/patch-offlineimap_imapserver.py
deleted file mode 100644
index 9655d920c7f8..000000000000
--- a/mail/py-offlineimap/files/patch-offlineimap_imapserver.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- offlineimap/imapserver.py.orig	2022-02-27 05:55:01 UTC
-+++ offlineimap/imapserver.py
-@@ -879,7 +879,7 @@ class IdleThread:
-             while not success:
-                 imapobj = self.parent.acquireconnection()
-                 try:
--                    imapobj.select(self.folder)
-+                    imapobj.select(imaputil.foldername_to_imapname(self.folder))
-                 except OfflineImapError as e:
-                     if e.severity == OfflineImapError.ERROR.FOLDER_RETRY:
-                         # Connection closed, release connection and retry.