diff --git a/mailscanner/rep_viruses.php b/mailscanner/rep_viruses.php
index 829852ee..2aaffc4b 100644
--- a/mailscanner/rep_viruses.php
+++ b/mailscanner/rep_viruses.php
@@ -32,7 +32,7 @@
 // Authentication checking
 require __DIR__ . '/login.function.php';
 
-// add the header information such as the logo, search, menu, ....
+// Add the header information such as the logo, search, menu, ....
 $filter = html_start(__('virusreport50'), 0, false, true);
 
 // Get a list of virus scanners from MailScanner.conf
@@ -54,7 +54,6 @@
             break;
         case 'clamd':
             $scanner[$vscanner]['name'] = 'ClamD';
-            // ORIG#$scanner[$vscanner]['regexp'] = "/(?P<file>.+) contains (?P<virus>\S+)/";
             $scanner[$vscanner]['regexp'] = "/(?P<file>.+) was infected: (?P<virus>\S+)/";
             break;
         case 'clamavmodule':
@@ -62,6 +61,8 @@
             $scanner[$vscanner]['regexp'] = "/(?P<file>.+) was infected: (?P<virus>\S+)/";
             break;
         case 'f-prot':
+        case 'f-prot-6':
+        case 'f-protd-6':
             $scanner[$vscanner]['name'] = 'F-Prot';
             $scanner[$vscanner]['regexp'] = "/(?P<file>.+) Infection: (?P<virus>\S+)/";
             break;
@@ -71,6 +72,7 @@
             $scanner[$vscanner]['regexp'] = "/(?P<file>.+) Found the (?P<virus>\S+) (trojan|virus) !!!/";
             break;
         case 'f-secure':
+        case 'f-secure-12':
             $scanner[$vscanner]['name'] = 'F-Secure';
             $scanner[$vscanner]['regexp'] = "/(?P<file>.+) Infected: (?P<virus>\S+)/";
             break;
@@ -110,6 +112,11 @@
             $scanner[$vscanner]['name'] = 'Avast';
             $scanner[$vscanner]['regexp'] = '/Avast: found (?P<virus>.*) in (?P<file>.*)/';
             break;
+        case 'esets':
+        case 'esetsefs':
+            $scanner[$vscanner]['name'] = 'ESET';
+            $scanner[$vscanner]['regexp'] = '/Esets: found (?P<virus>\S+) in (?P<file>\S+)/';
+            break;
     }
 }