--- amavisd.conf.orig	2021-10-13 08:10:54 UTC
+++ amavisd.conf
@@ -348,13 +348,13 @@ $banned_filename_re = new_RE(
   ['tnef', \&do_tnef],
 # ['lha',  \&do_lha,   'lha'],  # not safe, use 7z instead
 # ['sit',  \&do_unstuff, 'unstuff'],  # not safe
-  [['zip','kmz'], \&do_7zip,  ['7za', '7z'] ],
+  [['zip','kmz'], \&do_7zip,  ['7zz', '7za', '7z'] ],
   [['zip','kmz'], \&do_unzip],
-  ['7z',   \&do_7zip,  ['7zr', '7za', '7z'] ],
+  ['7z',   \&do_7zip,  ['7zz', '7zr', '7za', '7z'] ],
   [[qw(gz bz2 Z tar)],
-           \&do_7zip,  ['7za', '7z'] ],
+           \&do_7zip,  ['7zz', '7za', '7z'] ],
   [[qw(xz lzma jar cpio arj rar swf lha iso cab deb rpm)],
-           \&do_7zip,  '7z' ],
+           \&do_7zip,  ['7zz', '7z'] ],
   ['exe',  \&do_executable, ['unrar','rar'], 'lha', ['unarj','arj'] ],
 );
 
--- amavisd.orig	2021-12-16 12:46:10 UTC
+++ amavisd
@@ -1740,13 +1740,13 @@ BEGIN {
     ['tnef', \&Amavis::Unpackers::do_tnef],
 #   ['lha',  \&Amavis::Unpackers::do_lha,   \$lha],  # not safe, use 7z instead
 #   ['sit',  \&Amavis::Unpackers::do_unstuff, \$unstuff],  # not safe
-    [['zip','kmz'], \&Amavis::Unpackers::do_7zip,  ['7za', '7z'] ],
+    [['zip','kmz'], \&Amavis::Unpackers::do_7zip,  ['7zz', '7za', '7z'] ],
     [['zip','kmz'], \&Amavis::Unpackers::do_unzip],
-    ['7z',   \&Amavis::Unpackers::do_7zip,  ['7zr', '7za', '7z'] ],
+    ['7z',   \&Amavis::Unpackers::do_7zip,  ['7zz', '7zr', '7za', '7z'] ],
     [[qw(gz bz2 Z tar)],
-             \&Amavis::Unpackers::do_7zip,  ['7za', '7z'] ],
+             \&Amavis::Unpackers::do_7zip,  ['7zz', '7za', '7z'] ],
     [[qw(xz lzma jar cpio arj rar swf lha iso cab deb rpm)],
-             \&Amavis::Unpackers::do_7zip,  '7z' ],
+             \&Amavis::Unpackers::do_7zip,  ['7zz', '7z'] ],
     ['exe',  \&Amavis::Unpackers::do_executable, \$unrar, \$lha, \$unarj],
   );