diff --git a/net/netatalk/Makefile b/net/netatalk/Makefile
index 93eb74cde..5aa5d08b9 100644
--- a/net/netatalk/Makefile
+++ b/net/netatalk/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=netatalk
 PKG_VERSION:=2.2.1
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@SF/netatalk
diff --git a/net/netatalk/files/afpd.init b/net/netatalk/files/afpd.init
index bc42b350b..4e92b1830 100644
--- a/net/netatalk/files/afpd.init
+++ b/net/netatalk/files/afpd.init
@@ -1,24 +1,23 @@
 #!/bin/sh /etc/rc.common
+# Copyright (C) 2010-2011 OpenWrt.org
 
 START=70
 
 MAXCONS="7"
-CONFIGFILE="/etc/netatalk/afpd.conf"
-PIDFILE="/var/run/afpd.pid"
 
 start()
 {
-	/usr/sbin/cnid_metad
-	/usr/sbin/afpd -F ${CONFIGFILE} -P ${PIDFILE} -c ${MAXCONS}
+	service_start /usr/sbin/cnid_metad
+	service_start /usr/sbin/afpd -c ${MAXCONS}
 }
 
 stop()
 {
-	kill `cat "${PIDFILE}"`
-	killall cnid_metad
+	service_stop /usr/sbin/afpd
+	service_stop /usr/sbin/cnid_metad
 }
 
 reload()
 {
-	kill -s HUP `cat "${PIDFILE}"`
+	service_relaod /usr/sbin/afpd
 }