diff --git a/3-rt-fix-jent-define.patch b/3-rt-fix-jent-define.patch
new file mode 100644
index 0000000..e208c1a
--- /dev/null
+++ b/3-rt-fix-jent-define.patch
@@ -0,0 +1,14 @@
+--- 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 3714aaf..3f9242b 100644
--- a/rng-tools.spec
+++ b/rng-tools.spec
@@ -11,14 +11,14 @@
 Summary:        Random number generator related utilities
 Name:           rng-tools
 Version:        6.15
-Release:        2.git.048ee9ae%{?dist}
+Release:        2%{?dist}
 License:        GPLv2+
 URL:            https://github.com/nhorman/rng-tools
 Source0:        %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
 Source1:        rngd.service
 Source2:        rngd.sysconfig
 
-BuildRequires: gcc make
+BuildRequires: gcc make binutils
 BuildRequires: gettext
 BuildRequires: systemd systemd-rpm-macros
 BuildRequires: autoconf automake
@@ -41,6 +41,7 @@ Requires: selinux-policy >= 36.5
 
 Patch0: 1-rt-revert-build-randstat.patch
 Patch1: 2-rt-comment-out-have-aesni.patch
+Patch2: 3-rt-fix-jent-define.patch
 
 %description
 Hardware random number generation tools.
@@ -57,6 +58,8 @@ Hardware random number generation tools.
 %endif
 
 ./autogen.sh
+# a dirty hack so libdarn_impl_a_CFLAGS overrides common CFLAGS
+sed -i -e 's/$(libdarn_impl_a_CFLAGS) $(CFLAGS)/$(CFLAGS) $(libdarn_impl_a_CFLAGS)/' Makefile.in
 %configure %{?_without_pkcs11} %{?_without_rtlsdr}
 %make_build
 
@@ -89,9 +92,10 @@ install -D %{SOURCE2} -m0644 %{buildroot}%{_sysconfdir}/sysconfig/rngd
 %config(noreplace) %attr(0644,root,root)    %{_sysconfdir}/sysconfig/rngd
 
 %changelog
-* Thu Mar 24 2022 Vladis Dronov <vdronov@redhat.com> - 6.15-2.git.048ee9ae
-- Update to the upstream v6.15 + tip of origin/master @ 048ee9ae
+* Sat Apr 16 2022 Vladis Dronov <vdronov@redhat.com> - 6.15-2
+- Update to the upstream v6.15 + tip of origin/master @ 172bf0e3
 - Add a requirement for selinux-policy of a certain version
+- Fix an error building with jitterentropy-3.4.0
 
 * Tue Feb 22 2022 Vladis Dronov <vdronov@redhat.com> - 6.15-1
 - Update to the upstream v6.15 + tip of origin/master @ 3009fdd5
diff --git a/sources b/sources
index 6fc4bd7..1815b2a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (rng-tools-6.15.tar.gz) = 54f3283bfdfbd588bc98c5c6dcb5fc95de28acd29dfac03ca9d71886f02e1c6ba9e338a06409dff031858a7b14f148c95cd72f786c955a93bf530646e5f7ed9c
+SHA512 (rng-tools-6.15.tar.gz) = 8c3bfb7ae83ef8fbf8e7f028a40e5405f96a2135617347c3cc52f62119f951972b07ea5f1a5f094ebf6c3db35f49d6384a96720cda874115c19934f440592641