diff --git a/ports-mgmt/portupgrade/Makefile b/ports-mgmt/portupgrade/Makefile
index 284b9f651f69..15712420b9df 100644
--- a/ports-mgmt/portupgrade/Makefile
+++ b/ports-mgmt/portupgrade/Makefile
@@ -1,53 +1,53 @@
 PORTNAME=	portupgrade
 PORTVERSION=	2.4.16
-PORTREVISION=	3
+PORTREVISION=	4
 PORTEPOCH=	2
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	LOCAL/bdrewery/${PORTNAME}/ \
 		http://mirror.shatow.net/freebsd/${PORTNAME}/ \
 		GH
 
 MAINTAINER=	bdrewery@FreeBSD.org
 COMMENT=	FreeBSD ports/packages administration and management tool suite
 WWW=		https://wiki.freebsd.org/portupgrade
 
 LICENSE=	BSD3CLAUSE
 
 OPTIONS_DEFINE=	DOCS
 
 CONFLICTS_INSTALL=	portupgrade-devel
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	freebsd
 
 DIST_SUBDIR=	${PORTNAME}
 USES=		ruby uidfix
 
 USE_LDCONFIG=	${PREFIX}/lib/compat/pkg
 
 MAKE_ARGS=	PREFIX="${PREFIX}" RUBY="${RUBY}" \
 		RUBY_SITELIBDIR="${RUBY_SITELIBDIR}" MKDIR="${MKDIR}"
 
 EXAMPLESDIR=	${PREFIX}/share/examples/pkgtools
 DOCSDIR=	${PREFIX}/share/doc/pkgtools
 
 .include <bsd.port.pre.mk>
 
 INSTALL_TARGET=		install
 .if ${PORT_OPTIONS:MDOCS}
 INSTALL_TARGET+=	install-doc
 .endif
 
 # For PKG_DBDRIVER={bdb_btree,bdb_hash}
 RUN_DEPENDS+=	${RUBY_SITEARCHLIBDIR}/bdb.so:databases/ruby-bdb
 
 .if ${RUBY_VERSION_CODE:U} >= 320
 post-patch:
 	cd ${WRKSRC} && ${FIND} bin etc lib -type f |\
 		${XARGS} ${REINPLACE_CMD} 's/File\.exists\?/File.exist?/'
 .endif
 
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/compat/pkg
 
 .include <bsd.port.post.mk>
diff --git a/ports-mgmt/portupgrade/files/patch-pkg-compression-format b/ports-mgmt/portupgrade/files/patch-pkg-compression-format
new file mode 100644
index 000000000000..982d92160dab
--- /dev/null
+++ b/ports-mgmt/portupgrade/files/patch-pkg-compression-format
@@ -0,0 +1,20 @@
+--- bin/portupgrade	2025-01-15 11:54:51.384343000 -0500
++++ bin/portupgrade	2025-01-15 12:07:01.082999000 -0500
+@@ -1077,7 +1077,7 @@ 
+     end
+ 
+     if $pkgdb.with_pkgng?
+-      system!(PkgDB::command(:pkg), 'create', '-o', $packages_dir, '-f', $portsdb.pkg_sufx, pkgname)
++      system!(PkgDB::command(:pkg), 'create', '-o', $packages_dir, pkgname)
+     else
+       system!(PkgDB::command(:pkg_create), '-vb', pkgname,
+               File.join($packages_dir, pkgname + $portsdb.pkg_sufx))
+@@ -2084,7 +2084,7 @@ 
+ 
+   if $pkgdb.with_pkgng?
+     backup_pkgfile = File.join($tmpdir, pkgname + $portsdb.pkg_sufx)
+-    backquote!(PkgDB::command(:pkg), 'create', '-o', $tmpdir, '-f', $portsdb.pkg_sufx, pkgname)
++    backquote!(PkgDB::command(:pkg), 'create', '-o', $tmpdir, pkgname)
+   else
+     if str = backquote!(PkgDB::command(:pkg_create), '-vb', pkgname,
+                         File.join($tmpdir, pkgname + $portsdb.pkg_sufx))