diff --git a/.gitignore b/.gitignore
index 3a63757..678b720 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/rng-tools-6.16.tar.gz
+/rng-tools-*.tar.gz
diff --git a/2-rt-revert-build-randstat.patch b/2-rt-revert-build-randstat.patch
index c784c64..001450c 100644
--- a/2-rt-revert-build-randstat.patch
+++ b/2-rt-revert-build-randstat.patch
@@ -8,30 +8,9 @@ This reverts commit 2ce93190cb0111fcab2f622a539689d70960643a.
 
 Signed-off-by: Vladis Dronov <vdronov@redhat.com>
 ---
- .gitignore          | 3 +--
  contrib/Makefile.am | 5 +++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
+ 1 file changed, 3 insertions(+), 2 deletions(-)
 
-diff --git .gitignore .gitignore
-index 943fa2b..5dc334d 100644
---- .gitignore
-+++ .gitignore
-@@ -1,6 +1,6 @@
- *.a
- *.o
--.deps/
-+/.deps/
- /aclocal.m4
- /ar-lib
- /autom4te.cache/
-@@ -10,7 +10,6 @@
- /config.status
- /config.sub
- /configure
--/contrib/randstat
- /depcomp
- /install-sh
- /missing
 diff --git contrib/Makefile.am contrib/Makefile.am
 index a81fb0e..18c4fbc 100644
 --- contrib/Makefile.am
diff --git a/rng-tools.spec b/rng-tools.spec
index e0d090e..22d19a0 100644
--- a/rng-tools.spec
+++ b/rng-tools.spec
@@ -12,8 +12,8 @@
 Summary:        Random number generator related utilities
 Name:           rng-tools
 Version:        6.16
-Release:        1%{?dist}
-License:        GPLv2+
+Release:        7%{?dist}
+License:        GPL-2.0-or-later
 URL:            https://github.com/nhorman/rng-tools
 Source0:        %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
 Source1:        rngd.service
@@ -104,6 +104,10 @@ install -D %{SOURCE2} -m0644 %{buildroot}%{_sysconfdir}/sysconfig/rngd
 %config(noreplace) %attr(0644,root,root)    %{_sysconfdir}/sysconfig/rngd
 
 %changelog
+* Sat Mar 30 2024 Vladis Dronov <vdronov@redhat.com> - 6.16-7
+- Update to the upstream v6.16 + tip of origin/master @ 98cf8d63 (RHEL-30953)
+- Fix a test failure
+
 * Thu Mar 02 2023 Vladis Dronov <vdronov@redhat.com> - 6.16-1
 - Update to the upstream v6.16 + tip of origin/master @ 0e560296 (bz 2174916)
 - Get rid of text relocations in -fPIE build
diff --git a/sources b/sources
index 5dbceb4..5b75797 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (rng-tools-6.16.tar.gz) = 09d3ddc130486380efed726a29fb0a159f05140ee4e7f8a339af089dd75afaeaf2c3dc6a8b8ac955692a39ef9f4056a64cb2878c78a74f706776fb4fd563d7ec
+SHA512 (rng-tools-6.16.tar.gz) = 132f7defdeb576771b3665bcd364a6ba4384f29f455a95cc5d8fe28c14bbbaad5b792639a900d16e776a80483b28b7b03a403a6171a8408e6362eeed204d65fb
diff --git a/tests/selftest/PURPOSE b/tests/selftest/PURPOSE
index 415147c..b40985f 100644
--- a/tests/selftest/PURPOSE
+++ b/tests/selftest/PURPOSE
@@ -1,4 +1,3 @@
 PURPOSE of /CoreOS/rng-tools/Sanity/selftest
-Description: Executes rngtest to validate randomness of rng data 
+Description: Executes rngtest to validate randomness of rng data
 Author: Neil Horman <nhorman@redhat.com>
- 
diff --git a/tests/selftest/runtest.sh b/tests/selftest/runtest.sh
index 7fd3658..ff4b03f 100755
--- a/tests/selftest/runtest.sh
+++ b/tests/selftest/runtest.sh
@@ -32,32 +32,34 @@
 
 PACKAGE="rng-tools"
 PACKAGES="rng-tools gcc make binutils gettext automake autoconf jitterentropy-devel jansson-devel libcap-devel libxml2 libxml2-devel openssl-devel libcurl-devel libgcrypt-devel"
-UPSTREAMPKG="rng-tools-*"
 BUILDLOG=`mktemp`
 TESTLOG=`mktemp`
-TARGET=$(echo `uname -m` | egrep ppc)
+TARGET=$(echo `uname -m` | grep -E ppc)
 if [[ $TARGET != "" ]]; then TARGET="--target `uname -m`"; fi
 TOPDIR=`mktemp -d`
 SPEC="$TOPDIR/SPECS/$PACKAGE*.spec"
-TESTDIR="$TOPDIR/BUILD/$UPSTREAMPKG/"
+TESTDIR="$TOPDIR/BUILD/$PACKAGE"
 
 rlJournalStart
-    rlPhaseStartSetup
+	rlPhaseStartSetup
 	for PKG in $PACKAGES; do
 		rlAssertRpm $PKG
 	done
-    rlPhaseEnd
+	rlPhaseEnd
 
-    rlPhaseStartTest
+	rlPhaseStartTest
 	rlFetchSrcForInstalled $PACKAGE
 	rlRun "rpm -ivh --define '_topdir $TOPDIR' $PACKAGE*.src.rpm" 0 "Installing $PACKAGE src rpm"
-	echo "+ Building $PACKAGE (Log: $BUILDLOG)"
+	echo "+ Building $PACKAGE in $TOPDIR (Log: $BUILDLOG)"
 	echo "+ Build command: rpmbuild -bc $SPEC $TARGET"
 	rlRun "rpmbuild --define '_topdir $TOPDIR' -bc $SPEC $TARGET &> $BUILDLOG"
 	echo "+ Buildlog:"
 	tail -n 100 $BUILDLOG
+	rlFileSubmit $BUILDLOG
+	echo "+ Testing $PACKAGE (Log: $TESTLOG)"
 	rlRun "pushd ."
-	rlRun "cd $TESTDIR"
+	# an ugly trick to get exacly into $PACKAGE-$major.$minor directory
+	cd $TESTDIR-???? || cd $TESTDIR-??? || cd $TESTDIR-????? || echo Failed to cd to a test dir
 	rlRun "RNGD_JITTER_TIMEOUT=60 make check &> $TESTLOG"
 	if [ $? -eq 0 ]
 	then
@@ -65,12 +67,14 @@ rlJournalStart
 	else
 		rlFail "Selftest Failed"
 	fi
+	echo "+ Testlog:"
+	tail -n 100 $TESTLOG
 	rlFileSubmit $TESTLOG
-    rlPhaseEnd
+	rlPhaseEnd
 
-    rlPhaseStartCleanup
+	rlPhaseStartCleanup
 	rlRun "popd"
 	rlRun "rm -rf $PACKAGE*.src.rpm" 0 "Removing source rpm"
-    rlPhaseEnd
+	rlPhaseEnd
 rlJournalPrintText
 rlJournalEnd
diff --git a/tests/tests.yml b/tests/tests.yml
index e1d5585..fc3990c 100644
--- a/tests/tests.yml
+++ b/tests/tests.yml
@@ -8,6 +8,7 @@
     tests:
     - selftest
     required_packages:
+        - gettext
         - jitterentropy-devel
         - jansson-devel
         - libcap-devel