diff -Nur smeserver-fetchmail-1.6/createlinks smeserver-fetchmail-1.6_bz9185/createlinks
--- smeserver-fetchmail-1.6/createlinks	2015-02-06 10:41:14.000000000 +0100
+++ smeserver-fetchmail-1.6_bz9185/createlinks	2016-01-13 11:15:42.314561833 +0100
@@ -21,16 +21,19 @@
 # an event launched if case of routing modification
 #--------------------------------------------------
 
-event_link("conf-masq",    "fetchmail-routing", "20");
-event_link("restart-masq", "fetchmail-routing", "50");
+templates2events("/etc/rc.d/init.d/masq", qw(fetchmail-routing));
+safe_symlink("adjust",
+    "root/etc/e-smith/events/fetchmail-routing/services2adjust/masq");
 
 #--------------------------------------------------
 # an event launched if case of fetchmail conf change
 #--------------------------------------------------
 
-event_link("conf-fetchmail-params-files", "fetchmail-change", "20");
+templates2events("/etc/fetchmail", qw(fetchmail-change));
+templates2events("/etc/crontab", qw(fetchmail-change));
+templates2events("/etc/startmail", qw(fetchmail-change));
+
 event_link("fetchmail-email-group-adjust", "fetchmail-change", "30");
-event_link("email-assign", "fetchmail-change", "40");
 event_link("conf-fetchmail-group-files", "fetchmail-change", "50");
 safe_symlink("adjust",
     "root/etc/e-smith/events/fetchmail-change/services2adjust/masq");
diff -Nur smeserver-fetchmail-1.6/root/etc/e-smith/events/actions/conf-fetchmail-params-files smeserver-fetchmail-1.6_bz9185/root/etc/e-smith/events/actions/conf-fetchmail-params-files
--- smeserver-fetchmail-1.6/root/etc/e-smith/events/actions/conf-fetchmail-params-files	2015-02-06 10:41:14.000000000 +0100
+++ smeserver-fetchmail-1.6_bz9185/root/etc/e-smith/events/actions/conf-fetchmail-params-files	1970-01-01 01:00:00.000000000 +0100
@@ -1,57 +0,0 @@
-#!/usr/bin/perl -w
-
-#----------------------------------------------------------------------
-# copyright (C) 1999, 2000 e-smith, inc.
-#
-# 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
-#
-# Technical support for this program is available from e-smith, inc.
-# Please visit our web site www.e-smith.com for details.
-#----------------------------------------------------------------------
-
-package esmith;
-
-use strict;
-use Errno;
-use esmith::templates;
-
-# Now regenerate fetchmail
-esmith::templates::processTemplate (
-                                {
-                                  TEMPLATE_PATH => "/etc/fetchmail",
-                                  PERMS     => 0500,
-                                  UID       => "qmailr",
-                                  GID       => "nofiles",
-                                } );
-
-# Now regenerate crontab
-esmith::templates::processTemplate (
-                                {
-                                  TEMPLATE_PATH => "/etc/crontab",
-                                  PERMS     => 0644,
-                                  UID       => "root",
-                                  GID       => "root",
-                                } );
-
-# Now regenerate startmail
-esmith::templates::processTemplate (
-                                {
-                                  TEMPLATE_PATH => "/etc/startmail",
-                                  PERMS     => 0700,
-                                  UID       => "root",
-                                  GID       => "daemon",
-                                } );
-
-exit (0);