diff -Nur -x '*.orig' -x '*.rej' smeserver-zabbix-server-0.1/createlinks mezzanine_patched_smeserver-zabbix-server-0.1/createlinks
--- smeserver-zabbix-server-0.1/createlinks	2009-02-03 03:31:23.000000000 +0100
+++ mezzanine_patched_smeserver-zabbix-server-0.1/createlinks	2009-02-06 16:18:07.000000000 +0100
@@ -9,6 +9,7 @@
 templates2events("/etc/zabbix/zabbix_server.conf", qw(zabbix-update bootstrap-console-save));
 templates2events("/etc/zabbix/zabbix.conf.php", qw(zabbix-update bootstrap-console-save));
 templates2events("/etc/sudoers", $event);
+templates2events("/var/lib/zabbix/bin/sendxmpp", $event);
 templates2events("/etc/e-smith/sql/init/80zabbix-server", qw(zabbix-update bootstrap-console-save));
 
 # Services to restart
diff -Nur -x '*.orig' -x '*.rej' smeserver-zabbix-server-0.1/root/etc/e-smith/db/configuration/defaults/zabbix-server/JabberTLS mezzanine_patched_smeserver-zabbix-server-0.1/root/etc/e-smith/db/configuration/defaults/zabbix-server/JabberTLS
--- smeserver-zabbix-server-0.1/root/etc/e-smith/db/configuration/defaults/zabbix-server/JabberTLS	1970-01-01 01:00:00.000000000 +0100
+++ mezzanine_patched_smeserver-zabbix-server-0.1/root/etc/e-smith/db/configuration/defaults/zabbix-server/JabberTLS	2009-02-06 16:18:07.000000000 +0100
@@ -0,0 +1 @@
+enabled
diff -Nur -x '*.orig' -x '*.rej' smeserver-zabbix-server-0.1/root/etc/e-smith/templates/var/lib/zabbix/bin/sendxmpp/all mezzanine_patched_smeserver-zabbix-server-0.1/root/etc/e-smith/templates/var/lib/zabbix/bin/sendxmpp/all
--- smeserver-zabbix-server-0.1/root/etc/e-smith/templates/var/lib/zabbix/bin/sendxmpp/all	1970-01-01 01:00:00.000000000 +0100
+++ mezzanine_patched_smeserver-zabbix-server-0.1/root/etc/e-smith/templates/var/lib/zabbix/bin/sendxmpp/all	2009-02-06 16:18:31.000000000 +0100
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+echo "$3" | \
+    sendxmpp -u {${'zabbix-server'}{'JabberAccount'};} \
+	-p {${'zabbix-server'}{'JabberPassword'};} \
+	-j {${'zabbix-server'}{'JabberServer'};} \
+	-r zabbix \
+	{(${'zabbix-server'}{'JabberTLS'} || 'enabled') eq 'disabled' ? '':'-t \\';}
+	-s "$2" "$1"
+
diff -Nur -x '*.orig' -x '*.rej' smeserver-zabbix-server-0.1/root/etc/e-smith/templates.metadata/var/lib/zabbix/bin/sendxmpp mezzanine_patched_smeserver-zabbix-server-0.1/root/etc/e-smith/templates.metadata/var/lib/zabbix/bin/sendxmpp
--- smeserver-zabbix-server-0.1/root/etc/e-smith/templates.metadata/var/lib/zabbix/bin/sendxmpp	1970-01-01 01:00:00.000000000 +0100
+++ mezzanine_patched_smeserver-zabbix-server-0.1/root/etc/e-smith/templates.metadata/var/lib/zabbix/bin/sendxmpp	2009-02-06 16:18:07.000000000 +0100
@@ -0,0 +1,3 @@
+PERMS=0750
+UID="root"
+GID="zabbix"
diff -Nur -x '*.orig' -x '*.rej' smeserver-zabbix-server-0.1/root/var/lib/zabbix/bin/sendxmpp mezzanine_patched_smeserver-zabbix-server-0.1/root/var/lib/zabbix/bin/sendxmpp
--- smeserver-zabbix-server-0.1/root/var/lib/zabbix/bin/sendxmpp	2009-02-02 23:35:06.000000000 +0100
+++ mezzanine_patched_smeserver-zabbix-server-0.1/root/var/lib/zabbix/bin/sendxmpp	1970-01-01 01:00:00.000000000 +0100
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-ACCOUNT=$(/sbin/e-smith/db configuration getprop zabbix-server JabberAccount)
-PASS=$(/sbin/e-smith/db configuration getprop zabbix-server JabberPassword)
-SERVER=$(/sbin/e-smith/db configuration getprop zabbix-server JabberServer)
-
-echo "$3" | sendxmpp -u $ACCOUNT -p $PASS -j $SERVER -t -s "$2" "$1"
-