diff --git a/archivers/xarchiver/Makefile b/archivers/xarchiver/Makefile
index 65c9406a47f5..b43c3daca37d 100644
--- a/archivers/xarchiver/Makefile
+++ b/archivers/xarchiver/Makefile
@@ -1,68 +1,69 @@
 # Created by: Andreev Maxim
 
 PORTNAME=	xarchiver
 PORTVERSION=	0.5.4.16
+PORTREVISION=	1
 CATEGORIES=	archivers
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Desktop-agnostic GTK frontend to various archiving tools
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2
-RUN_DEPENDS=	7zr:archivers/p7zip \
+RUN_DEPENDS=	7zz:archivers/7-zip \
 		gtar:archivers/gtar \
 		gzip:archivers/gzip \
 		${LOCALBASE}/bin/unzip:archivers/unzip \
 		xdg-open:devel/xdg-utils \
 		zip:archivers/zip
 
 USES=		autoreconf desktop-file-utils gmake gnome libtool:build pkgconfig
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	ib
 
 USE_GNOME=	cairo glib20 intltool
 GNU_CONFIGURE=	yes
 
 OPTIONS_DEFINE=	DOCS NLS
 OPTIONS_GROUP=	FORMATS
 OPTIONS_GROUP_FORMATS=	ARJ LZO RAR
 OPTIONS_SINGLE=		GTK
 OPTIONS_SINGLE_GTK=	GTK2 GTK3
 OPTIONS_DEFAULT=	GTK3
 OPTIONS_SUB=	yes
 
 FORMATS_DESC=	Additional compression formats support
 ARJ_DESC=	ARJ compression support
 RAR_DESC=	RAR compression support
 
 ARJ_RUN_DEPENDS=	arj:archivers/arj
 LZO_RUN_DEPENDS=	lzop:archivers/lzop
 RAR_RUN_DEPENDS=	unrar:archivers/unrar \
 			rar:archivers/rar
 
 DOCS_USE=		GNOME=libxslt
 DOCS_CONFIGURE_ENABLE=	doc
 
 GTK2_CONFIGURE_ENABLE=	gtk2
 GTK2_USE=		GNOME=gtk20
 GTK3_USE=		GNOME=gtk30
 
 NLS_USES=	gettext localbase
 NLS_USES_OFF=	gettext-tools
 NLS_CONFIGURE_ENABLE=	nls
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${WRKSRC}/src/main.c
 
 post-patch-DOCS-off:
 	@${REINPLACE_CMD} -e 's|doc||g' ${WRKSRC}/Makefile.in
 
 post-patch-NLS-off:
 	@${REINPLACE_CMD} -e 's| po | |g' ${WRKSRC}/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/archivers/xarchiver/files/patch-src_main.c b/archivers/xarchiver/files/patch-src_main.c
index aacadce39eb4..e477c8a29856 100644
--- a/archivers/xarchiver/files/patch-src_main.c
+++ b/archivers/xarchiver/files/patch-src_main.c
@@ -1,25 +1,34 @@
---- src/main.c.orig	2020-05-30 14:10:55 UTC
+--- src/main.c.orig	2020-12-12 13:32:03 UTC
 +++ src/main.c
-@@ -387,7 +387,7 @@ static void xa_check_available_archivers ()
+@@ -103,7 +103,7 @@ static void xa_check_available_archivers ()
+ 
+ 	/* (un)compressors that can handle various types */
+ 
+-	sevenz = g_find_program_in_path("7z");
++	sevenz = g_find_program_in_path("7zz");
+ 
+ 	if (!sevenz)
+ 	{
+@@ -388,7 +388,7 @@ static void xa_check_available_archivers ()
  	/* GNU zip */
  
  	type = XARCHIVETYPE_GZIP;
 -	path = g_find_program_in_path("gzip");
 +	path = g_find_program_in_path("%%LOCALBASE%%/bin/gzip");
  
  	if (path)
  		archiver[type].is_compressor = TRUE;
-@@ -799,11 +799,11 @@ static void xa_check_available_archivers ()
+@@ -812,11 +812,11 @@ static void xa_check_available_archivers ()
  	if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefs_window->prefer_unzip)) ||
  	    (!is7za && !lsar))
  	{
 -		path = g_find_program_in_path("unzip");
 +		path = g_find_program_in_path("%%LOCALBASE%%/bin/unzip");
  
  		if (path)
  		{
 -			gchar *zip = g_find_program_in_path("zip");
 +			gchar *zip = g_find_program_in_path("%%LOCALBASE%%/bin/zip");
  
  			if (zip)
  			{