diff --git a/net/ipsec-tools/Makefile b/net/ipsec-tools/Makefile
index 48b1d5929..34d0c0ae8 100644
--- a/net/ipsec-tools/Makefile
+++ b/net/ipsec-tools/Makefile
@@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=ipsec-tools
 PKG_VERSION:=0.8.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@SF/ipsec-tools
diff --git a/net/ipsec-tools/files/racoon.init b/net/ipsec-tools/files/racoon.init
index e8d287000..d539b363f 100644
--- a/net/ipsec-tools/files/racoon.init
+++ b/net/ipsec-tools/files/racoon.init
@@ -1,17 +1,17 @@
 #!/bin/sh /etc/rc.common
-# Copyright (C) 2009 OpenWrt.org
-START=49
+# Copyright (C) 2009-2011 OpenWrt.org
 # Copyright (C) 2011 Artem Makhutov
 
-start() {
-	setkey -f /etc/ipsec.conf
-	mkdir /var/racoon/
+START=49
 
-	/usr/sbin/racoon -f /etc/racoon/racoon.conf
+SERVICE_USE_PID=1
+
+start() {
+	mkdir -m 0700 -p /var/racoon
+	[ -f /etc/ipsec.conf ] && /usr/sbin/setkey -f /etc/ipsec.conf
+	service_start /usr/sbin/racoon -f /etc/racoon.conf
 }
 
 stop() {
-	killall racoon
-	killall racoonctl
+	service_stop /usr/sbin/racoon
 }
-