diff --git a/archivers/upx/Makefile b/archivers/upx/Makefile
index b2ce10f6a279..1235622408cc 100644
--- a/archivers/upx/Makefile
+++ b/archivers/upx/Makefile
@@ -1,34 +1,32 @@
 # Created by: Max Khon <fjoe@FreeBSD.org>
 
 PORTNAME=	upx
 PORTVERSION=	3.96
-DISTVERSIONPREFIX=	v
+MASTER_SITES=	https://github.com/upx/upx/releases/download/v${PORTVERSION}/
 CATEGORIES=	archivers
+DISTVERSIONSUFFIX=	-src
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Ultimate Packer for eXecutables
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libucl.so:archivers/ucl
 
-USES=		cpe gmake perl5
+USES=		cpe gmake perl5 tar:xz
 USE_PERL5=	build
 
 MAKE_ENV=	UPX_UCLDIR=${LOCALBASE} \
 		target=freebsd
 
 PLIST_FILES=	bin/upx \
 		man/man1/upx.1.gz
 
 CPE_VENDOR=	upx_project
 
-GH_TUPLE=	upx:upx-lzma-sdk:v${PORTVERSION}:lzma/src/lzma-sdk
-USE_GITHUB=	yes
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/upx.out ${STAGEDIR}${PREFIX}/bin/upx
 	${INSTALL_MAN} ${WRKSRC}/doc/upx.1 ${STAGEDIR}${PREFIX}/man/man1
 
 .include <bsd.port.mk>
diff --git a/archivers/upx/distinfo b/archivers/upx/distinfo
index f3a5a57cb041..874481cd115e 100644
--- a/archivers/upx/distinfo
+++ b/archivers/upx/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1638556458
-SHA256 (upx-upx-v3.96_GH0.tar.gz) = 6882b4ea89c7a0ed74b86d3c0f1d07814b492eaf649b43ab8b4dfefa9e2d7387
-SIZE (upx-upx-v3.96_GH0.tar.gz) = 1676172
-SHA256 (upx-upx-lzma-sdk-v3.96_GH0.tar.gz) = e465670abe0900a0995f7e6166bff86caed06b253f6ff02d6490df6263aecc67
-SIZE (upx-upx-lzma-sdk-v3.96_GH0.tar.gz) = 109692
+TIMESTAMP = 1643382492
+SHA256 (upx-3.96-src.tar.xz) = 47774df5c958f2868ef550fb258b97c73272cb1f44fe776b798e393465993714
+SIZE (upx-3.96-src.tar.xz) = 792524