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-03-02 16:30:41.000000000 +0100
+++ mezzanine_patched_smeserver-zabbix-server-0.1/createlinks	2009-03-02 16:30:22.000000000 +0100
@@ -10,6 +10,7 @@
 templates2events("/etc/zabbix/zabbix.conf.php", qw(zabbix-server-update bootstrap-console-save));
 templates2events("/etc/sudoers", $event);
 templates2events("/var/lib/zabbix/bin/sendxmpp", $event);
+templates2events("/var/lib/zabbix/.sendxmpprc", $event);
 templates2events("/etc/e-smith/sql/init/80zabbix-server", qw(zabbix-server-update bootstrap-console-save));
 templates2events("/etc/rc.d/init.d/masq", $event);
 
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	2009-03-02 16:30:41.000000000 +0100
+++ mezzanine_patched_smeserver-zabbix-server-0.1/root/etc/e-smith/templates/var/lib/zabbix/bin/sendxmpp/all	2009-03-02 16:29:11.000000000 +0100
@@ -1,9 +1,6 @@
 
 echo "$3" | \
-    sendxmpp -u {${'zabbix-server'}{'JabberAccount'};} \
-	-p {${'zabbix-server'}{'JabberPassword'};} \
-	-j {${'zabbix-server'}{'JabberServer'};} \
-	-r zabbix \
+    sendxmpp -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	2009-03-02 16:30:41.000000000 +0100
+++ mezzanine_patched_smeserver-zabbix-server-0.1/root/etc/e-smith/templates.metadata/var/lib/zabbix/bin/sendxmpp	2009-03-02 16:29:56.000000000 +0100
@@ -1,3 +1,4 @@
 PERMS=0750
 UID="root"
 GID="zabbix"
+
diff -Nur -x '*.orig' -x '*.rej' smeserver-zabbix-server-0.1/root/etc/e-smith/templates.metadata/var/lib/zabbix/.sendxmpprc mezzanine_patched_smeserver-zabbix-server-0.1/root/etc/e-smith/templates.metadata/var/lib/zabbix/.sendxmpprc
--- smeserver-zabbix-server-0.1/root/etc/e-smith/templates.metadata/var/lib/zabbix/.sendxmpprc	1970-01-01 01:00:00.000000000 +0100
+++ mezzanine_patched_smeserver-zabbix-server-0.1/root/etc/e-smith/templates.metadata/var/lib/zabbix/.sendxmpprc	2009-03-02 16:25:55.000000000 +0100
@@ -0,0 +1,3 @@
+PERMS=0600
+UID="zabbix"
+GID="zabbix"
diff -Nur -x '*.orig' -x '*.rej' smeserver-zabbix-server-0.1/root/var/lib/zabbix/.sendxmpprc/all mezzanine_patched_smeserver-zabbix-server-0.1/root/var/lib/zabbix/.sendxmpprc/all
--- smeserver-zabbix-server-0.1/root/var/lib/zabbix/.sendxmpprc/all	1970-01-01 01:00:00.000000000 +0100
+++ mezzanine_patched_smeserver-zabbix-server-0.1/root/var/lib/zabbix/.sendxmpprc/all	2009-03-02 16:24:35.000000000 +0100
@@ -0,0 +1,3 @@
+# Jabber Account for zabbix alerts
+{${'zabbix-server'}{'JabberAccount'}}@{${'zabbix-server'}{'JabberServer'}} {${'zabbix-server'}{'JabberPassword'}}
+