diff --git a/net/chaosvpn/Makefile b/net/chaosvpn/Makefile
index 5b602ad2b..48e79a80c 100644
--- a/net/chaosvpn/Makefile
+++ b/net/chaosvpn/Makefile
@@ -1,14 +1,15 @@
-# Copyright (C) 2010 OpenWrt.org
-# All rights reserved.
+#
+# Copyright (C) 2010-2011 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
+#
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=chaosvpn
 PKG_VERSION:=2.0
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=${PKG_NAME}-${PKG_VERSION}.tar.gz
 PKG_SOURCE_URL:=http://github.com/downloads/ryd/chaosvpn/
diff --git a/net/chaosvpn/files/chaosvpn.init b/net/chaosvpn/files/chaosvpn.init
index 08626387d..d415f5df3 100644
--- a/net/chaosvpn/files/chaosvpn.init
+++ b/net/chaosvpn/files/chaosvpn.init
@@ -1,6 +1,10 @@
 #!/bin/sh /etc/rc.common
+# Copyright (C) 2010-2011 OpenWrt.org
+
 START=99
 
+SERVICE_DAEMONIZE=1
+
 start()
 {
 	/usr/sbin/chaosvpn_config.sh
@@ -8,10 +12,10 @@ start()
 		logger "not starting chaosvpn, check your config"
 		exit 1
 	}
-	/usr/sbin/chaosvpn -f -c /etc/tinc/chaosvpn.conf >/dev/null 2>&1 &
+	service_start /usr/sbin/chaosvpn -f -c /etc/tinc/chaosvpn.conf
 }
 
 stop()
 {
-	killall chaosvpn
+	service_stop /usr/sbin/chaosvpn
 }