diff --git a/mail/py-flanker/Makefile b/mail/py-flanker/Makefile
index 85766fa0e063..b6ed6409981c 100644
--- a/mail/py-flanker/Makefile
+++ b/mail/py-flanker/Makefile
@@ -1,36 +1,45 @@
 PORTNAME=	flanker
-PORTVERSION=	0.9.11
-PORTREVISION=	1
+PORTVERSION=	0.9.16
+DISTVERSIONPREFIX=	v
 CATEGORIES=	mail python
-MASTER_SITES=	PYPI
+#MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Email address and MIME parsing library
 WWW=		https://github.com/mailgun/flanker
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}attrs>=0:devel/py-attrs@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}chardet>=1.0.1,1:textproc/py-chardet@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}idna>=2.5:dns/py-idna@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ply>=3.10:devel/py-ply@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}regex>=0.1.20110315:textproc/py-regex@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tld>=0:dns/py-tld@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}webob>=0.9.8:www/py-webob@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent cryptography pep517
 
 NO_ARCH=	yes
 
+USE_GITHUB=	yes
+GH_ACCOUNT=	mailgun
+
 OPTIONS_DEFINE=	CCHARDET
 CCHARDET_DESC=	Character encoding detection via cchardet
 
 CCHARDET_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cchardet>=0.3.5:textproc/py-cchardet@${PY_FLAVOR}
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PYTHON_REL} >= 31300
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}standard-imghdr>=3.13.0<3.13.0_99:devel/py-standard-imghdr@${PY_FLAVOR}
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/mail/py-flanker/distinfo b/mail/py-flanker/distinfo
index f63945880af1..22bcd24fbb30 100644
--- a/mail/py-flanker/distinfo
+++ b/mail/py-flanker/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1601996446
-SHA256 (flanker-0.9.11.tar.gz) = 974418e5b498fd3bcb3859c22e22d26495257f9cf98b744c17f2335aca86e001
-SIZE (flanker-0.9.11.tar.gz) = 105180
+TIMESTAMP = 1784005264
+SHA256 (mailgun-flanker-v0.9.16_GH0.tar.gz) = df9df81eada6035a857ff49f3a131c372b3519baa40f57949ef6f377936f7be4
+SIZE (mailgun-flanker-v0.9.16_GH0.tar.gz) = 9926005
diff --git a/mail/py-flanker/files/patch-setup.py b/mail/py-flanker/files/patch-setup.py
new file mode 100644
index 000000000000..ab9e4c70c615
--- /dev/null
+++ b/mail/py-flanker/files/patch-setup.py
@@ -0,0 +1,20 @@
+--- setup.py.orig	2026-04-08 18:48:56 UTC
++++ setup.py
+@@ -28,7 +28,7 @@ setup(name='flanker',
+       author_email='admin@mailgunhq.com',
+       url='https://www.mailgun.com/',
+       license='Apache 2',
+-      packages=find_packages(exclude=['tests']),
++      packages=find_packages(exclude=['tests', 'tests.*']),
+       include_package_data=True,
+       zip_safe=True,
+       tests_require=tests_require,
+@@ -40,7 +40,7 @@ setup(name='flanker',
+           'ply>=3.10',
+           'regex>=0.1.20110315',
+           'six',
+-          'standard-imghdr==3.13.0',
++          'standard-imghdr==3.13.0; python_version >= "3.13"',
+           'tld',
+           'WebOb>=0.9.8'],
+       extras_require={