diff --git a/utils/rng-tools/Makefile b/utils/rng-tools/Makefile
index 474589c7d..2652434d2 100644
--- a/utils/rng-tools/Makefile
+++ b/utils/rng-tools/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2011 OpenWrt.org
+# Copyright (C) 2011-2014 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,21 +8,23 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=rng-tools
-PKG_VERSION:=3
-PKG_RELEASE:=2
+PKG_VERSION:=5
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://downloads.sourceforge.net/project/gkernel/rng-tools/3/
-PKG_MD5SUM:=fa305916ec101c85c0065aeceb81a38d
+PKG_SOURCE_URL:=@SF/gkernel/rng-tools/$(PKG_VERSION)/
+PKG_MD5SUM:=6726cdc6fae1f5122463f24ae980dd68
+PKG_MAINTAINER:=Hannu Nyman <hannu.nyman@iki.fi>
 
 PKG_FIXUP:=autoreconf
 
+PKG_BUILD_DEPENDS:=USE_UCLIBC:argp-standalone
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/rng-tools
   SECTION:=utils
   CATEGORY:=Utilities
-  DEPENDS:=+USE_UCLIBC:argp-standalone
   TITLE:=Daemon for adding entropy to kernel entropy pool
   URL:=http://sourceforge.net/projects/gkernel/
 endef
diff --git a/utils/rng-tools/files/rngd.init b/utils/rng-tools/files/rngd.init
index 74d23b31a..805559c4c 100644
--- a/utils/rng-tools/files/rngd.init
+++ b/utils/rng-tools/files/rngd.init
@@ -1,5 +1,5 @@
 #!/bin/sh /etc/rc.common
-# Copyright (C) 2011 OpenWrt.org
+# Copyright (C) 2011-2014 OpenWrt.org
 
 START=98
 
@@ -8,7 +8,7 @@ RNGD_AMOUNT=4000
 RNGD_DEVICE="/dev/urandom"
 
 start() {
-	service_start /sbin/rngd -r $RNGD_DEVICE -W $RNGD_AMOUNT -t $RNGD_INTERVAL
+	service_start /sbin/rngd -r $RNGD_DEVICE -W $RNGD_AMOUNT
 }
 
 stop() {