diff --git a/README.md b/README.md
index 602c76f..8e17350 100644
--- a/README.md
+++ b/README.md
@@ -34,7 +34,7 @@ Template App Brocade HBA
 ======
 Monitoring for Network Adapters - Brocade. Template is using Discovery to create Items and Triggers. You need also add SUDO for zabbix user: ```zabbix ALL=(ALL) NOPASSWD: /usr/bin/bcu```
 
-Template App Clamav
+Template App ClamAV
 ======
 Monitoring for ClamAV.
 
@@ -190,9 +190,9 @@ Template App vsftpd
 ======
 Monitoring for vsftpd.
 
-Template Device Back-UPS ES 700G	
+Template Device Back-UPS ES 700G
 ======
-Monitoring of APC UPS dedicated battery power. Requires package apcupsd to be installed. 
+Monitoring of APC UPS dedicated battery power. Requires package apcupsd to be installed.
 
 Template Device BigIP F5
 ======
@@ -346,4 +346,4 @@ Contains items related with basic linux security (iptables status, selinux statu
 
 Template SELinux
 ======
-Monitoring for SELinux service.
\ No newline at end of file
+Monitoring for SELinux service.
diff --git a/templates/Template App Amavisd.xml b/templates/Template App Amavisd.xml
index 1cb64a8..f32c319 100644
--- a/templates/Template App Amavisd.xml	
+++ b/templates/Template App Amavisd.xml	
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <zabbix_export>
     <version>3.0</version>
-    <date>2016-05-02T08:00:26Z</date>
+    <date>2016-08-01T19:35:29Z</date>
     <groups>
         <group>
-            <name>Zabbix Templates</name>
+            <name>Templates</name>
         </group>
     </groups>
     <templates>
@@ -14,10 +14,14 @@
             <description/>
             <groups>
                 <group>
-                    <name>Zabbix Templates</name>
+                    <name>Templates</name>
                 </group>
             </groups>
-            <applications/>
+            <applications>
+                <application>
+                    <name>Amavisd</name>
+                </application>
+            </applications>
             <items>
                 <item>
                     <name>Amavis service is running</name>
@@ -54,7 +58,11 @@
                     <port/>
                     <description/>
                     <inventory_link>0</inventory_link>
-                    <applications/>
+                    <applications>
+                        <application>
+                            <name>Amavisd</name>
+                        </application>
+                    </applications>
                     <valuemap>
                         <name>Service state</name>
                     </valuemap>
diff --git a/templates/Template App ClamAV.xml b/templates/Template App ClamAV.xml
new file mode 100644
index 0000000..db79761
--- /dev/null
+++ b/templates/Template App ClamAV.xml	
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<zabbix_export>
+    <version>3.0</version>
+    <date>2016-08-01T19:35:53Z</date>
+    <groups>
+        <group>
+            <name>Templates</name>
+        </group>
+    </groups>
+    <templates>
+        <template>
+            <template>Template App ClamAV</template>
+            <name>Template App ClamAV</name>
+            <description/>
+            <groups>
+                <group>
+                    <name>Templates</name>
+                </group>
+            </groups>
+            <applications>
+                <application>
+                    <name>ClamAV</name>
+                </application>
+            </applications>
+            <items>
+                <item>
+                    <name>ClamAV service is running</name>
+                    <type>0</type>
+                    <snmp_community/>
+                    <multiplier>0</multiplier>
+                    <snmp_oid/>
+                    <key>proc.num[clamd]</key>
+                    <delay>90</delay>
+                    <history>7</history>
+                    <trends>365</trends>
+                    <status>0</status>
+                    <value_type>3</value_type>
+                    <allowed_hosts/>
+                    <units/>
+                    <delta>0</delta>
+                    <snmpv3_contextname/>
+                    <snmpv3_securityname/>
+                    <snmpv3_securitylevel>0</snmpv3_securitylevel>
+                    <snmpv3_authprotocol>0</snmpv3_authprotocol>
+                    <snmpv3_authpassphrase/>
+                    <snmpv3_privprotocol>0</snmpv3_privprotocol>
+                    <snmpv3_privpassphrase/>
+                    <formula>1</formula>
+                    <delay_flex/>
+                    <params/>
+                    <ipmi_sensor/>
+                    <data_type>0</data_type>
+                    <authtype>0</authtype>
+                    <username/>
+                    <password/>
+                    <publickey/>
+                    <privatekey/>
+                    <port/>
+                    <description/>
+                    <inventory_link>0</inventory_link>
+                    <applications>
+                        <application>
+                            <name>ClamAV</name>
+                        </application>
+                    </applications>
+                    <valuemap>
+                        <name>Service state</name>
+                    </valuemap>
+                    <logtimefmt/>
+                </item>
+            </items>
+            <discovery_rules/>
+            <macros/>
+            <templates/>
+            <screens/>
+        </template>
+    </templates>
+    <triggers>
+        <trigger>
+            <expression>{Template App ClamAV:proc.num[clamd].last(0)}=0</expression>
+            <name>Service clamd (clamav) is not running</name>
+            <url/>
+            <status>0</status>
+            <priority>3</priority>
+            <description/>
+            <type>0</type>
+            <dependencies/>
+        </trigger>
+    </triggers>
+    <value_maps>
+        <value_map>
+            <name>Service state</name>
+            <mappings>
+                <mapping>
+                    <value>0</value>
+                    <newvalue>Down</newvalue>
+                </mapping>
+                <mapping>
+                    <value>1</value>
+                    <newvalue>Up</newvalue>
+                </mapping>
+            </mappings>
+        </value_map>
+    </value_maps>
+</zabbix_export>