diff --git a/roles/chat/files/devzat b/roles/chat/files/devzat
index b42362e..cd2f9ba 100644
--- a/roles/chat/files/devzat
+++ b/roles/chat/files/devzat
@@ -7,20 +7,15 @@
 
 . /etc/rc.subr
 
-prestart() {
-    cp -prP ${devzat_source} ${devzat_command}
-}
-
 name="devzat"
 rcvar="devzat_enable"
 devzat_user="nobody"
 devzat_source="/usr/local/sbin/devzat"
-devzat_command="/usr/local/sbin/devzat.run"
+devzat_command="/usr/local/sbin/devzat"
 pidfile="/tmp/${name}.pid"
 command="/usr/sbin/daemon"
 command_args="-P ${pidfile} -c ${devzat_command}"
 devzat_config="/usr/local/etc/devzat.yml"
-start_precmd="prestart"
 
 load_rc_config $name
 : ${devzat_enable:=no}
diff --git a/roles/chat/templates/Bastillefile.j2 b/roles/chat/templates/Bastillefile.j2
index c7a5091..5fa0eff 100644
--- a/roles/chat/templates/Bastillefile.j2
+++ b/roles/chat/templates/Bastillefile.j2
@@ -1,5 +1,7 @@
 SERVICE devzat stop
 
+CMD if [ -f /usr/local/sbin/devzat ]; then rm -f /usr/local/sbin/devzat; fi
+
 SYSRC sendmail_enable=NONE
 SYSRC tmpsize=500m
 SYSRC tmpmfs=AUTO