diff --git a/package/Config.in b/package/Config.in
index 311cc6cc1..1a95b10fd 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -750,6 +750,7 @@ source "package/bc/Config.in"
 source "package/collectd/Config.in"
 source "package/empty/Config.in"
 source "package/googlefontdirectory/Config.in"
+source "package/haveged/Config.in"
 source "package/mcrypt/Config.in"
 source "package/mobile-broadband-provider-info/Config.in"
 source "package/shared-mime-info/Config.in"
diff --git a/package/haveged/Config.in b/package/haveged/Config.in
new file mode 100644
index 000000000..0e49a2db7
--- /dev/null
+++ b/package/haveged/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_HAVEGED
+	bool "haveged"
+	depends on BR2_USE_MMU # fork()
+	help
+	  The haveged project is an attempt to provide an easy-to-use,
+	  unpredictable random number generator based upon an adaptation
+	  of the HAVEGE algorithm.
+
+	  http://www.issihosts.com/haveged/
diff --git a/package/haveged/S21haveged b/package/haveged/S21haveged
new file mode 100755
index 000000000..f17cd2907
--- /dev/null
+++ b/package/haveged/S21haveged
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+[ -x /usr/sbin/haveged ] || exit 0
+
+case "$1" in
+	start)
+		echo -n "Starting haveged: "
+		start-stop-daemon -S -x /usr/sbin/haveged -- -w 1024 -r 0
+		[ $? == 0 ] && echo "OK" || echo "FAIL"
+		;;
+	stop)
+		echo -n "Stopping haveged: "
+		start-stop-daemon -K -x /usr/sbin/haveged
+		[ $? == 0 ] && echo "OK" || echo "FAIL"
+		;;
+	restart|reload)
+		$0 stop
+		$0 start
+		;;
+	*)
+		echo "Usage: $0 {start|stop|restart}"
+		exit 1
+esac
+
+exit 0
diff --git a/package/haveged/haveged.mk b/package/haveged/haveged.mk
new file mode 100644
index 000000000..99dbe41b1
--- /dev/null
+++ b/package/haveged/haveged.mk
@@ -0,0 +1,17 @@
+################################################################################
+#
+# haveged
+#
+################################################################################
+
+HAVEGED_VERSION = 1.7c
+HAVEGED_SITE = http://www.issihosts.com/haveged
+HAVEGED_LICENSE = GPLv3+
+HAVEGED_LICENSE_FILES = COPYING
+
+define HAVEGED_INSTALL_INIT_SYSV
+	$(INSTALL) -m 755 -D package/haveged/S21haveged \
+		$(TARGET_DIR)/etc/init.d/S21haveged
+endef
+
+$(eval $(autotools-package))