diff --git a/polish/napi/Makefile b/polish/napi/Makefile
index e6db02445bed..378a2d5ab22a 100644
--- a/polish/napi/Makefile
+++ b/polish/napi/Makefile
@@ -1,56 +1,57 @@
 PORTNAME=	napi
 PORTVERSION=	2.0.1
+PORTREVISION=	1
 CATEGORIES=	polish multimedia
 
 MAINTAINER=	dominik.lisiak@bemsoft.pl
 COMMENT=	Command line subtitles downloader for napiprojekt.pl
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	7z:archivers/p7zip \
+RUN_DEPENDS=	7zz:archivers/7-zip \
 		base64:converters/base64 \
 		bash:shells/bash \
 		mediainfo:multimedia/mediainfo \
 		wget:ftp/wget
 
 USES=		cmake shebangfix
 
 USE_GITLAB=	yes
 GL_ACCOUNT=	hesperos
 GL_PROJECT=	${PORTNAME}
 GL_COMMIT=	ac404649571e470bf9494f788bd8a74843956851
 
 SHEBANG_GLOB=	*.sh *.sh.in
 
 STRIP=
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=	COVER NFO RMORIG SUBRIP UTF8
 
 COVER_DESC=	Always try to download cover (-c)
 NFO_DESC=	Always try to download .nfo file (-n)
 RMORIG_DESC=	Always remove intermediate files (-d)
 SUBRIP_DESC=	Convert subtitles to SubRip (.srt) by default (-f subrip)
 UTF8_DESC=	Convert subtitles to UTF-8 by default (-C UTF-8)
 
 NAPI_CONF=	libs/libnapi_sysconf.sh
 
 post-patch-COVER-on:
 	@${REINPLACE_CMD} -e 's|\(napiprojekt\.cover\.download\)=0|\1=1|' ${WRKSRC}/${NAPI_CONF}
 
 post-patch-NFO-on:
 	@${REINPLACE_CMD} -e 's|\(napiprojekt\.nfo\.download\)=0|\1=1|' ${WRKSRC}/${NAPI_CONF}
 
 post-patch-RMORIG-on:
 	@${REINPLACE_CMD} -e 's|\(napiprojekt\.subtitles\.orig\.delete\)=0|\1=1|' ${WRKSRC}/${NAPI_CONF}
 
 post-patch-SUBRIP-on:
 	@${REINPLACE_CMD} -e 's|\(napiprojekt\.subtitles\.format\)=default|\1=subrip|' ${WRKSRC}/${NAPI_CONF}
 
 post-patch-UTF8-on:
 	@${REINPLACE_CMD} -e 's|\(napiprojekt\.subtitles\.encoding\)=default|\1=UTF-8|' ${WRKSRC}/${NAPI_CONF}
 
 post-install:
 	@${RM} -r ${STAGEDIR}${LOCALBASE}/lib/napi/*.in
 
 .include <bsd.port.mk>
diff --git a/polish/napi/files/patch-libs_libnapi__fs.sh b/polish/napi/files/patch-libs_libnapi__fs.sh
index 755e942821a3..8326cdf5ab86 100644
--- a/polish/napi/files/patch-libs_libnapi__fs.sh
+++ b/polish/napi/files/patch-libs_libnapi__fs.sh
@@ -1,29 +1,38 @@
---- libs/libnapi_fs.sh.orig	2020-04-24 07:22:41 UTC
+--- libs/libnapi_fs.sh.orig	2022-01-17 05:41:41 UTC
 +++ libs/libnapi_fs.sh
 @@ -54,7 +54,7 @@ _fs_configureStat_GV() {
      # verify stat tool
      ___g_fsWrappers[$___g_fsStat]="stat -c%s "
  
 -    if wrappers_isSystemDarwin; then
 +    if wrappers_isSystemDarwin || wrappers_isSystemFreeBSD; then
          # stat may be installed through macports, check if
          # there's a need to reconfigure it to BSD flavour
          ${___g_fsWrappers[$___g_fsStat]} "$0" >/dev/null 2>&1 ||
 @@ -72,6 +72,8 @@ _fs_configureBase64_GV() {
      # verify base64
      wrappers_isSystemDarwin &&
          ___g_fsWrappers[$___g_fsBase64]="base64 -D"
 +    wrappers_isSystemFreeBSD &&
 +        ___g_fsWrappers[$___g_fsBase64]="base64 -d"
  }
  
  #
-@@ -83,6 +85,8 @@ _fs_configureMd5_GV() {
-     # verify md5 tool
+@@ -84,6 +86,8 @@ _fs_configureMd5_GV() {
      ___g_fsWrappers[$___g_fsMd5]="md5sum"
      wrappers_isSystemDarwin &&
-+        ___g_fsWrappers[$___g_fsMd5]="md5"
-+    wrappers_isSystemFreeBSD &&
          ___g_fsWrappers[$___g_fsMd5]="md5"
++    wrappers_isSystemFreeBSD &&
++        ___g_fsWrappers[$___g_fsMd5]="md5"
  }
  
+ #
+@@ -105,7 +109,7 @@ _fs_configure7z_GV() {
+     local k=''
+ 
+     # use 7z or 7za only, 7zr doesn't support passwords
+-    declare -a t7zs=( '7za' '7z' )
++    declare -a t7zs=( '7za' '7z' '7zz' )
+ 
+     for k in "${t7zs[@]}"; do
+         tools_isDetected "$k" &&
diff --git a/polish/napi/files/patch-libs_libnapi__tools.sh b/polish/napi/files/patch-libs_libnapi__tools.sh
new file mode 100644
index 000000000000..090ae4cbf2cf
--- /dev/null
+++ b/polish/napi/files/patch-libs_libnapi__tools.sh
@@ -0,0 +1,11 @@
+--- libs/libnapi_tools.sh.orig	2022-01-17 07:45:13 UTC
++++ libs/libnapi_tools.sh
+@@ -42,7 +42,7 @@ declare -a ___g_tools=( 'tr=1' 'printf=1' 'mktemp=1' '
+     'wc=1' 'dd=1' 'grep=1' 'seq=1' 'sed=1' 'cut=1' \
+     'base64=1' 'unlink=0' 'stat=1' 'basename=1' \
+     'dirname=1' 'cat=1' 'cp=1' 'mv=1' 'awk=1' \
+-    'file=0' 'iconv=0' '7z|7za=0' 'md5|md5sum=1' \
++    'file=0' 'iconv=0' '7z|7za|7zz=0' 'md5|md5sum=1' \
+     'fps:mediainfo=0' 'fps:mplayer|mplayer2=0' 'fps:ffmpeg|ffprobe=0' )
+ 
+ ########################################################################