diff --git a/net/arpwatch/Makefile b/net/arpwatch/Makefile
index fe981fef5..20b1959b6 100644
--- a/net/arpwatch/Makefile
+++ b/net/arpwatch/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2009 OpenWrt.org
+# Copyright (C) 2006-2011 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=arpwatch
 PKG_VERSION:=2.1a15
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=ftp://ftp.free.fr/.mirrors1/ftp.gentoo.org/distfiles/
diff --git a/net/arpwatch/files/arpwatch.init b/net/arpwatch/files/arpwatch.init
index 56d13e3ad..b05692b5c 100644
--- a/net/arpwatch/files/arpwatch.init
+++ b/net/arpwatch/files/arpwatch.init
@@ -1,10 +1,12 @@
 #!/bin/sh /etc/rc.common
+# Copyright (C) 2006-2011 OpenWrt.org
+
 START=90
 
-start () {
-	arpwatch -f /etc/arpwatch/arp.dat -i br-lan
+start() {
+	service_start /usr/sbin/arpwatch -f /etc/arpwatch/arp.dat -i br-lan
 }
 
 stop() {
-	killall arpwatch
+	service_stop /usr/sbin/arpwatch
 }