diff -Nur -x '*.orig' -x '*.rej' smeserver-arpwatch-0.1/createlinks mezzanine_patched_smeserver-arpwatch-0.1/createlinks
--- smeserver-arpwatch-0.1/createlinks	2009-01-27 00:44:39.000000000 +0100
+++ mezzanine_patched_smeserver-arpwatch-0.1/createlinks	2009-01-27 16:15:04.000000000 +0100
@@ -6,9 +6,7 @@
 service_link_enhanced("arpwatch", "K10", "6");
 service_link_enhanced("arpwatch", "K10", "0");
 
-safe_symlink("../daemontools" , 'root/etc/rc.d/init.d/supervise/arpwatch');
-safe_symlink("/var/service/arpwatch" , 'root/service/arpwatch');
-safe_touch("root/var/service/arpwatch/down");
-
 safe_touch("root/var/lib/arpwatch/arp.dat");
 
+templates2events("/etc/sysconfig/arpwatch", "bootstrap-console-save");
+
diff -Nur -x '*.orig' -x '*.rej' smeserver-arpwatch-0.1/root/etc/e-smith/templates/etc/sysconfig/arpwatch/ALL mezzanine_patched_smeserver-arpwatch-0.1/root/etc/e-smith/templates/etc/sysconfig/arpwatch/ALL
--- smeserver-arpwatch-0.1/root/etc/e-smith/templates/etc/sysconfig/arpwatch/ALL	1970-01-01 01:00:00.000000000 +0100
+++ mezzanine_patched_smeserver-arpwatch-0.1/root/etc/e-smith/templates/etc/sysconfig/arpwatch/ALL	2009-01-27 16:13:29.000000000 +0100
@@ -0,0 +1,7 @@
+# -u <username> : defines with what user id arpwatch should run
+# -e <email>    : the <email> where to send the reports
+# -s <from>     : the <from>-address
+{
+$OUT .= "OPTIONS=\"-i ${'InternalInterface'}{'Name'} -f /var/lib/arpwatch/arp.dat -u pcap -e root -s 'Arpwatch@${'DomainName'}'\"\n";
+}
+
diff -Nur -x '*.orig' -x '*.rej' smeserver-arpwatch-0.1/root/var/service/arpwatch/log/run mezzanine_patched_smeserver-arpwatch-0.1/root/var/service/arpwatch/log/run
--- smeserver-arpwatch-0.1/root/var/service/arpwatch/log/run	2009-01-27 00:54:58.000000000 +0100
+++ mezzanine_patched_smeserver-arpwatch-0.1/root/var/service/arpwatch/log/run	1970-01-01 01:00:00.000000000 +0100
@@ -1,24 +0,0 @@
-#!/bin/sh
-
-#----------------------------------------------------------------------
-# copyright (C) 2003-2006 Mitel Networks Corporation
-# 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#               
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#               
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
-#----------------------------------------------------------------------
-exec                                    \
-    /usr/local/bin/setuidgid smelog     \
-    /usr/local/bin/multilog s5000000  \
-    /var/log/arpwatch
-
diff -Nur -x '*.orig' -x '*.rej' smeserver-arpwatch-0.1/root/var/service/arpwatch/run mezzanine_patched_smeserver-arpwatch-0.1/root/var/service/arpwatch/run
--- smeserver-arpwatch-0.1/root/var/service/arpwatch/run	2009-01-27 00:41:55.000000000 +0100
+++ mezzanine_patched_smeserver-arpwatch-0.1/root/var/service/arpwatch/run	1970-01-01 01:00:00.000000000 +0100
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-exec 2>&1
-
-INTERNAL_IF=$(/sbin/e-smith/db configuration getprop InternalInterface Name)
-
-/usr/sbin/arpwatch -d -f /var/lib/arpwatch/arp.dat -i $INTERNAL_IF -u pcap -e root -s 'arpwatch'
-