diff --git a/packages/network/avahi/init.d/53_avahi b/packages/network/avahi/init.d/53_avahi
deleted file mode 100644
index 1831782af0..0000000000
--- a/packages/network/avahi/init.d/53_avahi
+++ /dev/null
@@ -1,49 +0,0 @@
-################################################################################
-#      Copyright (C) 2009-2010 OpenELEC.tv
-#      http://www.openelec.tv
-#
-#  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, 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 OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-# start Avahi Daemon
-#
-# runlevels: openelec, textmode
-
-(
-  # can be called from openelec addon.
-  # ensure that environment is sane
-  . /etc/profile
-
-  # wait for network
-  wait_for_inet_addr force
-
-  progress "Starting Avahi Daemon"
-
-  mkdir -p /var/run/avahi-daemon
-  while true; do
-    AVAHI_ENABLED=true
-    if [ -f $CONFIG_CACHE/service_avahi.conf ]; then
-      . $CONFIG_CACHE/service_avahi.conf
-    fi
-    if [ "$AVAHI_ENABLED" == "true" ]; then
-      wait_for_dbus
-      avahi-daemon --syslog > /dev/null 2>&1
-    else
-      break
-    fi
-    usleep 2000000
-  done
-)&
diff --git a/packages/network/avahi/package.mk b/packages/network/avahi/package.mk
index c7e04fb006..81bd6ac796 100644
--- a/packages/network/avahi/package.mk
+++ b/packages/network/avahi/package.mk
@@ -92,7 +92,6 @@ post_makeinstall_target() {
   if [ ! $SFTP_SERVER = "yes" ]; then
     rm -rf $INSTALL/etc/avahi/services/sftp-ssh.service
   fi
-  rm -rf $INSTALL/lib/systemd
 }
 
 post_install() {
@@ -101,4 +100,8 @@ post_install() {
 
   add_user avahiautoipd x 496 496 "avahi-autoipd" "/var/lib/avahi-autoipd" "/bin/sh"
   add_group avahiautoipd 496
+
+  enable_service avahi-daemon.service
+  enable_service avahi-daemon.socket
+  enable_service avahi-dnsconfd.service
 }