diff --git a/rng-tools.spec b/rng-tools.spec
index 4f1d925..89db997 100644
--- a/rng-tools.spec
+++ b/rng-tools.spec
@@ -11,8 +11,8 @@
 
 Summary:        Random number generator related utilities
 Name:           rng-tools
-Version:        6.16
-Release:        7%{?dist}
+Version:        6.17
+Release:        1%{?dist}
 License:        GPL-2.0-or-later
 URL:            https://github.com/nhorman/rng-tools
 Source0:        %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
@@ -104,6 +104,9 @@ install -D %{SOURCE2} -m0644 %{buildroot}%{_sysconfdir}/sysconfig/rngd
 %config(noreplace) %attr(0644,root,root)    %{_sysconfdir}/sysconfig/rngd
 
 %changelog
+* Wed Jun 05 2024 Vladis Dronov <vdronov@redhat.com> - 6.17-1
+- Update to the upstream v6.17 @ 2160b9c3 (RHEL-36771)
+
 * Sat Mar 30 2024 Vladis Dronov <vdronov@redhat.com> - 6.16-7
 - Update to the upstream v6.16 + tip of origin/master @ 98cf8d63
 
diff --git a/rngd.sysconfig b/rngd.sysconfig
index cce3c6e..17f63ee 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 -x qrypt -D daemon:daemon"
+RNGD_ARGS="--fill-watermark=0 -x pkcs11 -x nist -x qrypt -x namedpipe -D daemon:daemon"
diff --git a/sources b/sources
index 5b75797..77f49c9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (rng-tools-6.16.tar.gz) = 132f7defdeb576771b3665bcd364a6ba4384f29f455a95cc5d8fe28c14bbbaad5b792639a900d16e776a80483b28b7b03a403a6171a8408e6362eeed204d65fb
+SHA512 (rng-tools-6.17.tar.gz) = a7fc15aee4b1d4447986d916c83dc0cb140c5ceb7fba563a9704efe0c05811fbd97a80b5591d7d6756d4795402bc501e98ff10ba29cbfa1b8603dfc823bc5025
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