diff --git a/archivers/pxz/Makefile b/archivers/pxz/Makefile
index 47375cf87dd0..ea9609c4c6c0 100644
--- a/archivers/pxz/Makefile
+++ b/archivers/pxz/Makefile
@@ -1,35 +1,35 @@
 # Created by: mm
 
 PORTNAME=	pxz
-PORTVERSION=	0.20141018
-PORTREVISION=	9
+PORTVERSION=	0.20220509
 CATEGORIES=	archivers
-MASTER_SITES=	LOCAL/delphij
-DISTNAME=	pxz-git-${PORTVERSION:S/0.//}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Parallel LZMA compressor using liblzma
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-WRKSRC=		${WRKDIR}/${PORTNAME}
-
 USES=		cpe tar:xz
 PLIST_FILES=	bin/pxz share/man/man1/pxz.1.gz
 
+USE_GITHUB=	yes
+GH_ACCOUNT=	jnovy
+GH_PROJECT=	pxz
+GH_TAGNAME=	136e5c2
+
 CPE_VENDOR=	pxz_project
 
 MAKE_ENV+=	BINDIR=${PREFIX}/bin \
 		MANDIR=${PREFIX}/share/man
 
 MAKE_ARGS+=	CC="${CC}"
 
 .if !exists(/usr/include/omp.h)
 USES+=		compiler:gcc-c++11-lib
 .endif
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/pxz
 
 .include <bsd.port.mk>
diff --git a/archivers/pxz/distinfo b/archivers/pxz/distinfo
index 16c350e2a1bc..2bede1d5d3c5 100644
--- a/archivers/pxz/distinfo
+++ b/archivers/pxz/distinfo
@@ -1,2 +1,3 @@
-SHA256 (pxz-git-20141018.tar.xz) = f60882dc25981cfb7ee58bd731f4f38e4c8b033fcfec862446964c37021690ed
-SIZE (pxz-git-20141018.tar.xz) = 11324
+TIMESTAMP = 1657059037
+SHA256 (jnovy-pxz-0.20220509-136e5c2_GH0.tar.gz) = f41d1b36b4dddb5da5c1165cee2fb91f50dce76d0f5f861c3a4ce37187fb6c57
+SIZE (jnovy-pxz-0.20220509-136e5c2_GH0.tar.gz) = 12369
diff --git a/archivers/pxz/files/patch-pxz.c b/archivers/pxz/files/patch-pxz.c
index 4f09c008714b..8c70d31c3ff3 100644
--- a/archivers/pxz/files/patch-pxz.c
+++ b/archivers/pxz/files/patch-pxz.c
@@ -1,45 +1,45 @@
---- pxz.c.orig	2014-10-18 17:06:27 UTC
+--- pxz.c.orig	2022-05-09 09:16:27 UTC
 +++ pxz.c
 @@ -23,11 +23,17 @@
  
  #include <string.h>
  #include <stdio.h>
 +#ifndef __FreeBSD__
  #include <stdio_ext.h>
 +#endif
  #include <stdlib.h>
  #include <inttypes.h>
  #include <unistd.h>
 +#ifdef __FreeBSD__
 +#include <err.h>
 +#else
  #include <error.h>
 +#endif
  #include <errno.h>
  #include <sys/stat.h>
  #include <sys/mman.h>
 @@ -42,6 +48,10 @@
  #include <omp.h>
  #endif
  
 +#ifdef __FreeBSD__
 +#define error errc
 +#endif
 +
  #ifndef XZ_BINARY
  #define XZ_BINARY "xz"
  #endif
-@@ -121,6 +131,13 @@ const struct option long_opts[] = {
+@@ -131,6 +141,13 @@ const struct option long_opts[] = {
+ 	{ "version",        no_argument,       NULL,  'V' },
  	{ NULL,             0,                 NULL,   0 }
  };
- 
++
 +#ifdef __FreeBSD__
 +static size_t __fpending (FILE *fp)
 +{
 +	return (fp->_p - fp->_bf._base);
 +}
 +#endif
-+
- void __attribute__((noreturn)) run_xz( char **argv ) {
- 	execvp(XZ_BINARY, argv);
- 	error(0, errno, "execution of "XZ_BINARY" binary failed");
+ 
+ void __attribute__((noreturn)) run_xz( char **argv, char **envp ) {
+ 	execve(XZ_BINARY, argv, envp);