diff --git a/2-rt-comment-out-have-aesni.patch b/1-rt-comment-out-have-aesni.patch
similarity index 100%
rename from 2-rt-comment-out-have-aesni.patch
rename to 1-rt-comment-out-have-aesni.patch
diff --git a/1-rt-revert-build-randstat.patch b/2-rt-revert-build-randstat.patch
similarity index 100%
rename from 1-rt-revert-build-randstat.patch
rename to 2-rt-revert-build-randstat.patch
diff --git a/3-rt-fix-jent-define.patch b/3-rt-fix-jent-define.patch
deleted file mode 100644
index e208c1a..0000000
--- a/3-rt-fix-jent-define.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- configure.ac	2022-03-24 13:14:11.000000000 +0100
-+++ configure.ac.new	2022-03-24 15:58:56.187367770 +0100
-@@ -95,7 +95,10 @@ AS_IF(
- 				[AM_CONDITIONAL([JITTER], [true])
- 				AC_DEFINE([HAVE_JITTER],1,[Enable JITTER])
- 				AC_CHECK_LIB(jitterentropy, jent_notime_settick,
--				[AC_DEFINE([HAVE_JITTER_NOTIME],1,[Enable JITTER_NOTIME])],
-+				[
-+					AC_DEFINE([HAVE_JITTER_NOTIME],1,[Enable JITTER_NOTIME])
-+					AC_DEFINE([JENT_CONF_ENABLE_INTERNAL_TIMER],1,[Enable JENT_CONF_ENABLE_INTERNAL_TIMER])
-+				],
- 				[],-lpthread)],
- 				AC_MSG_NOTICE([No Jitterentropy library found]),-lpthread)
- 	], [AC_MSG_NOTICE([Disabling JITTER entropy source])]
diff --git a/rng-tools.spec b/rng-tools.spec
index ab0c5fa..235c61e 100644
--- a/rng-tools.spec
+++ b/rng-tools.spec
@@ -12,7 +12,7 @@
 Summary:        Random number generator related utilities
 Name:           rng-tools
 Version:        6.15
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        GPLv2+
 URL:            https://github.com/nhorman/rng-tools
 Source0:        %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
@@ -22,7 +22,7 @@ Source2:        rngd.sysconfig
 BuildRequires: gcc make binutils
 BuildRequires: gettext
 BuildRequires: systemd systemd-rpm-macros
-BuildRequires: autoconf automake
+BuildRequires: autoconf >= 2.57, automake >= 1.7
 BuildRequires: libgcrypt-devel libcurl-devel
 BuildRequires: libxml2-devel openssl-devel
 BuildRequires: jitterentropy-devel
@@ -38,11 +38,13 @@ BuildRequires: libp11-devel
 Requires(post): systemd
 Requires(preun): systemd
 Requires(postun): systemd
-Requires: selinux-policy >= 34.1.31-2
 
-Patch0: 1-rt-revert-build-randstat.patch
-Patch1: 2-rt-comment-out-have-aesni.patch
-Patch2: 3-rt-fix-jent-define.patch
+# This ensures that the selinux-policy package and all its dependencies
+# are not pulled into containers and other systems that do not use SELinux.
+Requires: (selinux-policy >= 34.1.31-2 if selinux-policy)
+
+Patch0: 1-rt-comment-out-have-aesni.patch
+Patch1: 2-rt-revert-build-randstat.patch
 
 %description
 This is a random number generator daemon and its tools. It monitors
@@ -86,7 +88,7 @@ install -D %{SOURCE2} -m0644 %{buildroot}%{_sysconfdir}/sysconfig/rngd
 %files
 %{!?_licensedir:%global license %%doc}
 %license COPYING
-%doc AUTHORS README
+%doc AUTHORS README.md
 %{_bindir}/rngtest
 %{_sbindir}/rngd
 %{_mandir}/man1/rngtest.1.*
@@ -95,6 +97,10 @@ install -D %{SOURCE2} -m0644 %{buildroot}%{_sysconfdir}/sysconfig/rngd
 %config(noreplace) %attr(0644,root,root)    %{_sysconfdir}/sysconfig/rngd
 
 %changelog
+* Tue Oct 04 2022 Vladis Dronov <vdronov@redhat.com> - 6.15-2
+- Update to the upstream v6.15 + tip of origin/master @ 6dcc9ec2 (bz 2124605)
+- Do not require selinux-policy if it is not present
+
 * Sat Apr 16 2022 Vladis Dronov <vdronov@redhat.com> - 6.15-1
 - Update to the upstream v6.15 @ 172bf0e3 (bz 2075977)
 - Allow rngd process to drop privileges with "-D user:group"
diff --git a/rngd.sysconfig b/rngd.sysconfig
index dbb6f7a..cce3c6e 100644
--- a/rngd.sysconfig
+++ b/rngd.sysconfig
@@ -1,3 +1,3 @@
 # Optional arguments passed to rngd. See rngd(8) and
 # https://bugzilla.redhat.com/show_bug.cgi?id=1252175#c21
-RNGD_ARGS="--fill-watermark=0 -x pkcs11 -x nist -D daemon:daemon"
+RNGD_ARGS="--fill-watermark=0 -x pkcs11 -x nist -x qrypt -D daemon:daemon"
diff --git a/sources b/sources
index 1815b2a..6e06a10 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (rng-tools-6.15.tar.gz) = 8c3bfb7ae83ef8fbf8e7f028a40e5405f96a2135617347c3cc52f62119f951972b07ea5f1a5f094ebf6c3db35f49d6384a96720cda874115c19934f440592641
+SHA512 (rng-tools-6.15.tar.gz) = c64a15861b152edb242ff694cc2f2363e7aff0892aaecb9bbc5a7fe8c60b97fc0b320e466432f220ade0988ae4ef4acc863b509668a4bd70002a7b4c2847f8ab