diff --git a/www/gallery-dl/Makefile b/www/gallery-dl/Makefile
index 3b8d02644c21..670ec6a3e5ad 100644
--- a/www/gallery-dl/Makefile
+++ b/www/gallery-dl/Makefile
@@ -1,7 +1,10 @@
 PORTNAME=	gallery-dl
-DISTVERSIONPREFIX=	v
 DISTVERSION=	1.30.10
+PORTREVISION=	1
 CATEGORIES=	www
+MASTER_SITES=	PYPI \
+		https://github.com/mikf/gallery-dl/releases/download/v${DISTVERSION}/
+DISTNAME=	${PORTNAME:S/-/_/}-${DISTVERSION}
 
 # Implicit approval to commit trivial version updates.
 MAINTAINER=	jbeich@FreeBSD.org
@@ -9,24 +12,21 @@ COMMENT=	Command-line program to download image galleries and collections
 WWW=		https://github.com/mikf/gallery-dl
 
 LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.11.0:www/py-requests@${PY_FLAVOR}
 
-NO_ARCH=	yes
 USES=		python
-USE_GITHUB=	yes
-USE_PYTHON=	autoplist distutils unittest
-GH_ACCOUNT=	mikf
+USE_PYTHON=	autoplist noflavors pep517 unittest
+NO_ARCH=	yes
+TEST_ARGS=	discover -s test
 
 post-patch:
 	@${REINPLACE_CMD} 's,/etc,${PREFIX}&,' \
 		${WRKSRC}/gallery_dl/config.py \
-		${WRKSRC}/scripts/man.py
-
-post-build:
-# USE_GITHUB archive doesn't have generated files
-	@${DO_MAKE_BUILD} -C ${BUILD_WRKSRC} PYTHON="${PYTHON_CMD}" man completion
+		${WRKSRC}/data/man/gallery-dl.*
 
 .include <bsd.port.mk>
diff --git a/www/gallery-dl/distinfo b/www/gallery-dl/distinfo
index 42f91b62c47d..bc02ae48a893 100644
--- a/www/gallery-dl/distinfo
+++ b/www/gallery-dl/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1760255219
-SHA256 (mikf-gallery-dl-v1.30.10_GH0.tar.gz) = e5f6c1bbf1f6478909c291042f4d763f4ba92f695d29c920bf7266fc0d65d9dc
-SIZE (mikf-gallery-dl-v1.30.10_GH0.tar.gz) = 1000053
+TIMESTAMP = 1760330310
+SHA256 (gallery_dl-1.30.10.tar.gz) = 2640816991519902e3bab1243d0f29cd6788105e62fbd7e360c1712246944c88
+SIZE (gallery_dl-1.30.10.tar.gz) = 615021