diff --git a/security/amavisd-new/Makefile b/security/amavisd-new/Makefile
index 255c083e7516..f70cd29a14a1 100644
--- a/security/amavisd-new/Makefile
+++ b/security/amavisd-new/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	amavisd-new
-PORTVERSION=	2.12.0
-PORTREVISION=	1
+PORTVERSION=	2.12.2
 PORTEPOCH=	1
 CATEGORIES=	security
 MASTER_SITES=	https://gitlab.com/amavis/amavis/-/archive/v${PORTVERSION}/
@@ -42,9 +41,9 @@ DAEMON?=	/usr/sbin/daemon -p
 
 OPTIONS_DEFINE=	IPV6 BDB SNMP SQLITE MYSQL PGSQL LDAP SASL SPAMASSASSIN P0F \
 		FILE RAR UNRAR ARJ UNARJ LHA ARC NOMARCH CAB RPM ZOO UNZOO LZOP \
-		P7ZIP MSWORD TNEF DOCS
+		7ZIP MSWORD TNEF DOCS
 OPTIONS_DEFAULT=	BDB SPAMASSASSIN FILE UNRAR ARJ LHA ARC CAB RPM ZOO LZOP \
-			P7ZIP MSWORD
+			7ZIP MSWORD
 BDB_DESC=		Use BerkeleyDB for nanny/cache/snmp
 SNMP_DESC=		Install amavisd snmp subagent
 SQLITE_DESC=		Use SQLite for lookups
@@ -67,7 +66,7 @@ RPM_DESC=		RPM support with archivers/rpm2cpio
 ZOO_DESC=		ZOO support with archivers/zoo
 UNZOO_DESC=		ZOO support with archivers/unzoo
 LZOP_DESC=		LZOP support with archivers/lzop
-P7ZIP_DESC=		P7ZIP support with archivers/p7zip
+7ZIP_DESC=		7ZIP support with archivers/7-zip
 MSWORD_DESC=		Ms Word support with textproc/ripole
 TNEF_DESC=		Add external tnef decoder converters/tnef
 
@@ -195,8 +194,8 @@ RUN_DEPENDS+=	unzoo>=4.4_1:archivers/unzoo
 RUN_DEPENDS+=	${LOCALBASE}/bin/lzop:archivers/lzop
 .endif
 
-.if ${PORT_OPTIONS:MP7ZIP}
-RUN_DEPENDS+=	${LOCALBASE}/bin/7zr:archivers/p7zip
+.if ${PORT_OPTIONS:M7ZIP}
+RUN_DEPENDS+=	${LOCALBASE}/bin/7zz:archivers/7-zip
 .endif
 
 .if ${PORT_OPTIONS:MMSWORD}
diff --git a/security/amavisd-new/distinfo b/security/amavisd-new/distinfo
index 4250eaad3504..383228758e3b 100644
--- a/security/amavisd-new/distinfo
+++ b/security/amavisd-new/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1566144032
-SHA256 (amavis-v2.12.0.tar.bz2) = 0ea5d3ace8388c0b92d867f096f4b4015cc8f6cc34c5c15b7be0b1ecd65b5292
-SIZE (amavis-v2.12.0.tar.bz2) = 873702
+TIMESTAMP = 1639651917
+SHA256 (amavis-v2.12.2.tar.bz2) = 9db619010a310351c57ff18385cf06dd6e06160412d3e530f3fe9b1ba219e457
+SIZE (amavis-v2.12.2.tar.bz2) = 874946