diff --git a/rng-tools/patches/rng-tools-man.patch b/rng-tools/patches/rng-tools-man.patch
new file mode 100644
index 000000000..010d20d17
--- /dev/null
+++ b/rng-tools/patches/rng-tools-man.patch
@@ -0,0 +1,21 @@
+diff -up rng-tools-3/rngtest.1.in.man rng-tools-3/rngtest.1.in
+--- rng-tools-3/rngtest.1.in.man	2009-12-24 07:47:24.000000000 +0100
++++ rng-tools-3/rngtest.1.in	2012-01-12 10:12:27.909567190 +0100
+@@ -43,7 +43,7 @@ Exit after processing n input blocks, if
+ Dump statistics every n blocks, if n is not zero.
+ .TP
+ \fB\-t\fR \fIn\fR, \fB\-\-timedstats=\fIn\fR (default: 0)
+-Dump statistics every n secods, if n is not zero.
++Dump statistics every n seconds, if n is not zero.
+ .TP
+ \fB\-?\fR, \fB\-\-help\fR
+ Give a short summary of all program options.
+@@ -62,7 +62,7 @@ other statistics show a breakdown of the
+ tests are defined on FIPS 140-1 and FIPS 140-2 errata of 2001-10-10. They
+ were removed in FIPS 140-2 errata of 2002-12-03).
+ .PP
+-The speed statistics are taken for every 20000-bit block trasferred or
++The speed statistics are taken for every 20000-bit block transferred or
+ processed.
+ 
+ .SH EXIT STATUS
diff --git a/rng-tools/rng-tools.nm b/rng-tools/rng-tools.nm
new file mode 100644
index 000000000..ef5e03528
--- /dev/null
+++ b/rng-tools/rng-tools.nm
@@ -0,0 +1,52 @@
+###############################################################################
+# IPFire.org    - An Open Source Firewall Solution                            #
+# Copyright (C) - IPFire Development Team <info@ipfire.org>                   #
+###############################################################################
+
+name       = rng-tools
+version    = 4
+release    = 1
+
+groups     = System/Base
+url        = http://sourceforge.net/projects/gkernel/
+license    = GPLv2+
+summary    = Random number generator related utilities.
+
+description
+	%{summary}
+end
+
+source_dl  = http://downloads.sourceforge.net/project/gkernel/rng-tools/%{version}/
+
+build
+	requires
+		gettext
+		groff
+	end
+end
+
+packages
+	package %{name}
+		script postin
+			/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+		end
+
+		script preun
+			/bin/systemctl --no-reload disable rngd.service > /dev/null 2>&1 || :
+			/bin/systemctl stop rngd.service > /dev/null 2>&1 || :
+		end
+
+		script postun
+			/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+		end
+
+		script postup
+			/bin/systemctl daemon-reload 2>&1 || :
+			/bin/systemctl reload-or-try-restart rngd.service >/dev/null 2>&1 || :
+		end
+	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
+end
diff --git a/rng-tools/systemd/rngd.service b/rng-tools/systemd/rngd.service
new file mode 100644
index 000000000..770bc621f
--- /dev/null
+++ b/rng-tools/systemd/rngd.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=Hardware RNG Entropy Gatherer Daemon
+
+[Service]
+ExecStart=/usr/sbin/rngd -f --no-tpm=1
+
+[Install]
+WantedBy=multi-user.target