diff --git a/ipv6/totd/Makefile b/ipv6/totd/Makefile
index c47cf0225..ed15390e4 100644
--- a/ipv6/totd/Makefile
+++ b/ipv6/totd/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=totd
 PKG_VERSION:=1.5.1
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.dillema.net/software/totd
diff --git a/ipv6/totd/files/totd.init b/ipv6/totd/files/totd.init
index c12cc41cd..9c2dd74e9 100644
--- a/ipv6/totd/files/totd.init
+++ b/ipv6/totd/files/totd.init
@@ -1,23 +1,14 @@
 #!/bin/sh /etc/rc.common
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2011 OpenWrt.org
 
 START=60
-BIN=totd
-RUN_D=/var/run
-PID_F=$RUN_D/$BIN.pid
 
+SERVICE_USE_PID=1
 
 start() {
-	mkdir -p $RUN_D
-	$BIN -c /etc/totd.conf
+	service_start /usr/sbin/totd -c /etc/totd.conf
 }
 
 stop() {
-	[ -f $PID_F ] && kill $(cat $PID_F)
-}
-
-restart() {
-	stop
-	sleep 1
-	start
+	service_stop /usr/sbin/totd
 }