diff --git a/templates/Template App Amavisd.xml b/templates/Template App Amavisd.xml
index f32c319..3de8b50 100644
--- a/templates/Template App Amavisd.xml	
+++ b/templates/Template App Amavisd.xml	
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <zabbix_export>
-    <version>3.0</version>
-    <date>2016-08-01T19:35:29Z</date>
+    <version>3.2</version>
+    <date>2017-06-22T07:42:43Z</date>
     <groups>
         <group>
             <name>Templates</name>
@@ -23,6 +23,49 @@
                 </application>
             </applications>
             <items>
+                <item>
+                    <name>Amavisd version</name>
+                    <type>0</type>
+                    <snmp_community/>
+                    <multiplier>0</multiplier>
+                    <snmp_oid/>
+                    <key>amavis.version</key>
+                    <delay>3600</delay>
+                    <history>7</history>
+                    <trends>0</trends>
+                    <status>0</status>
+                    <value_type>1</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>Amavisd</name>
+                        </application>
+                    </applications>
+                    <valuemap/>
+                    <logtimefmt/>
+                </item>
                 <item>
                     <name>Amavis service is running</name>
                     <type>0</type>
@@ -31,7 +74,7 @@
                     <snmp_oid/>
                     <key>proc.num[amavisd]</key>
                     <delay>90</delay>
-                    <history>7</history>
+                    <history>30</history>
                     <trends>365</trends>
                     <status>0</status>
                     <value_type>3</value_type>
@@ -70,21 +113,44 @@
                 </item>
             </items>
             <discovery_rules/>
+            <httptests/>
             <macros/>
             <templates/>
             <screens/>
         </template>
     </templates>
     <triggers>
+        <trigger>
+            <expression>{Template App Amavisd:amavis.version.diff(0)}&gt;0</expression>
+            <recovery_mode>0</recovery_mode>
+            <recovery_expression/>
+            <name>Amavisd version has changed</name>
+            <correlation_mode>0</correlation_mode>
+            <correlation_tag/>
+            <url/>
+            <status>0</status>
+            <priority>1</priority>
+            <description/>
+            <type>0</type>
+            <manual_close>0</manual_close>
+            <dependencies/>
+            <tags/>
+        </trigger>
         <trigger>
             <expression>{Template App Amavisd:proc.num[amavisd].last(0)}=0</expression>
+            <recovery_mode>0</recovery_mode>
+            <recovery_expression/>
             <name>Service amavis is not running</name>
+            <correlation_mode>0</correlation_mode>
+            <correlation_tag/>
             <url/>
             <status>0</status>
             <priority>3</priority>
             <description/>
             <type>0</type>
+            <manual_close>0</manual_close>
             <dependencies/>
+            <tags/>
         </trigger>
     </triggers>
     <value_maps>
diff --git a/zabbix_agentd.conf.d/amavis.conf b/zabbix_agentd.conf.d/amavis.conf
new file mode 100644
index 0000000..ff0075b
--- /dev/null
+++ b/zabbix_agentd.conf.d/amavis.conf
@@ -0,0 +1 @@
+UserParameter=amavis.version, amavisd -V