diff --git a/print/paps/Makefile b/print/paps/Makefile
index 50d69803b789..2afeb28c7921 100644
--- a/print/paps/Makefile
+++ b/print/paps/Makefile
@@ -1,35 +1,31 @@
 PORTNAME=	paps
-PORTVERSION=	0.8.0
-DISTVERSIONPREFIX=	v
+DISTVERSION=	0.8.0
 PORTREVISION=	3
 CATEGORIES=	print
+MASTER_SITES=	https://github.com/dov/${PORTNAME}/releases/download/v${DISTVERSION}/
 
-PATCH_SITES=	${WWW}/commit/
-PATCHFILES+=	e9270aaac5e0b8018a6fad9a562ee48e7b2c3113.patch:-p1 # https://github.com/dov/paps/pull/71
+PATCH_SITES=	https://github.com/dov/paps/commit/
+PATCHFILES=	e9270aaac5e0b8018a6fad9a562ee48e7b2c3113.patch:-p1 \
+		a26a20d7ca3feb08476a8a19fd97c3ececcc1e2e.patch:-p1
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	UTF-8 to PostScript converter using Pango
-WWW=		https://github.com/${GH_ACCOUNT}/${GH_PROJECT}
+WWW=		https://github.com/dov/paps
 
 LICENSE=	LGPL20
 LICENSE_FILE=	${WRKSRC}/COPYING.LIB
 
 BROKEN_i386=	compilation fails, see https://github.com/dov/paps/issues/60
 
 LIB_DEPENDS=	libfmt.so:devel/libfmt
 
-USES=		cmake:indirect compiler:c++17-lang meson gnome pkgconfig python:env shebangfix
-USE_CXXSTD=	c++17
-USE_GITHUB=	yes
-GH_ACCOUNT=	dov
-USE_GNOME=	cairo pango
-
+USES=		compiler:c++17-lang meson gnome pkgconfig python:env,run shebangfix
 SHEBANG_FILES=	${WRKSRC}/scripts/src-to-paps
+USE_GNOME=	cairo pango
 
-PLIST_FILES=	bin/paps share/man/man1/paps.1.gz
-
-post-install:
-	${ECHO_CMD} "bin/src-to-paps" >> ${TMPPLIST}
-	${ECHO_CMD} "share/paps/pango_markup.outlang" >> ${TMPPLIST}
+PLIST_FILES=	bin/paps \
+		bin/src-to-paps \
+		share/man/man1/paps.1.gz \
+		share/paps/pango_markup.outlang
 
 .include <bsd.port.mk>
diff --git a/print/paps/distinfo b/print/paps/distinfo
index 45fc12eeb69f..fce676bd92d0 100644
--- a/print/paps/distinfo
+++ b/print/paps/distinfo
@@ -1,5 +1,7 @@
-TIMESTAMP = 1736611510
-SHA256 (dov-paps-v0.8.0_GH0.tar.gz) = 8fd8db04e6f8c5c164806d2c1b5fea6096daf583f83f06d1e4813ea61edc291f
-SIZE (dov-paps-v0.8.0_GH0.tar.gz) = 75685
+TIMESTAMP = 1760402841
+SHA256 (paps-0.8.0.tar.gz) = bb5a826db364117a5ae79c833c4a000197f3b5b3eff10e31fb1513a583f96ff2
+SIZE (paps-0.8.0.tar.gz) = 224643
 SHA256 (e9270aaac5e0b8018a6fad9a562ee48e7b2c3113.patch) = ed97ae7128f774b2f4d2f6ee31212ac53ba9c2c6d60379bf4486c61e3f347365
 SIZE (e9270aaac5e0b8018a6fad9a562ee48e7b2c3113.patch) = 1846
+SHA256 (a26a20d7ca3feb08476a8a19fd97c3ececcc1e2e.patch) = c477a86e961adaf5f8b1c7e53aeb7f5a08c9c1a2ee64c5729dc2b4a141f0b344
+SIZE (a26a20d7ca3feb08476a8a19fd97c3ececcc1e2e.patch) = 1042