diff --git a/.gitignore b/.gitignore
index a374aa4..3a63757 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/rng-tools-6.15.tar.gz
+/rng-tools-6.16.tar.gz
diff --git a/rng-tools.spec b/rng-tools.spec
index 119723e..e0d090e 100644
--- a/rng-tools.spec
+++ b/rng-tools.spec
@@ -11,8 +11,8 @@
 
 Summary:        Random number generator related utilities
 Name:           rng-tools
-Version:        6.15
-Release:        3%{?dist}
+Version:        6.16
+Release:        1%{?dist}
 License:        GPLv2+
 URL:            https://github.com/nhorman/rng-tools
 Source0:        %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
@@ -33,6 +33,7 @@ BuildRequires: rtl-sdr-devel
 %endif
 %if %{with pkcs11}
 BuildRequires: libp11-devel
+Suggests: opensc
 %endif
 
 Requires(post): systemd
@@ -63,6 +64,12 @@ TPM, jitter) and supplies entropy from them to a kernel entropy pool.
 %endif
 
 ./autogen.sh
+# a dirty hack to force PIC for a PIC-aware assembly code for i686
+# /usr/lib/rpm/redhat/redhat-hardened-cc1 in Koji/Brew does not
+# force PIC for assembly sources as of now
+%ifarch i386 i686
+sed -i -e '/^#define RDRAND_RETRY_LIMIT\t10/a#define __PIC__ 1' rdrand_asm.S
+%endif
 # 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}
@@ -97,6 +104,11 @@ install -D %{SOURCE2} -m0644 %{buildroot}%{_sysconfdir}/sysconfig/rngd
 %config(noreplace) %attr(0644,root,root)    %{_sysconfdir}/sysconfig/rngd
 
 %changelog
+* 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
+- Add a hint for opensc package (bz 1845854)
+
 * Tue Dec 27 2022 Vladis Dronov <vdronov@redhat.com> - 6.15-3
 - Update to the upstream v6.15 + tip of origin/master @ cb8cc624 (bz 2156554)
 - Fix a number of issues found by covscan code scanner
diff --git a/sources b/sources
index 9ef7609..5dbceb4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (rng-tools-6.15.tar.gz) = eb4e3409c1d2b44644d3fd75afc9a47df2f273a47b1b9397a7eaf35c075bb9a9130c66975afd3cb0e5316d653d9b9c7c786695d4b514e51843c5a7976aea8554
+SHA512 (rng-tools-6.16.tar.gz) = 09d3ddc130486380efed726a29fb0a159f05140ee4e7f8a339af089dd75afaeaf2c3dc6a8b8ac955692a39ef9f4056a64cb2878c78a74f706776fb4fd563d7ec