diff --git a/utils/rng-tools/Makefile b/utils/rng-tools/Makefile
index 9999ad577..7c859e140 100644
--- a/utils/rng-tools/Makefile
+++ b/utils/rng-tools/Makefile
@@ -1,8 +1,15 @@
+#
+# Copyright (C) 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:=rng-tools
 PKG_VERSION:=3
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://downloads.sourceforge.net/project/gkernel/rng-tools/3/
diff --git a/utils/rng-tools/files/rngd.init b/utils/rng-tools/files/rngd.init
index 733444fe3..74d23b31a 100644
--- a/utils/rng-tools/files/rngd.init
+++ b/utils/rng-tools/files/rngd.init
@@ -1,14 +1,16 @@
 #!/bin/sh /etc/rc.common
+# Copyright (C) 2011 OpenWrt.org
+
 START=98
 
 RNGD_INTERVAL=30
 RNGD_AMOUNT=4000
-RNGD_DEVICE=/dev/urandom
+RNGD_DEVICE="/dev/urandom"
 
 start() {
-    rngd -r $RNGD_DEVICE -W $RNGD_AMOUNT -t $RNGD_INTERVAL
+	service_start /sbin/rngd -r $RNGD_DEVICE -W $RNGD_AMOUNT -t $RNGD_INTERVAL
 }
 
 stop() {
-    killall rngd
+	service_stop /sbin/rngd
 }