diff --git a/.rng-tools.metadata b/.rng-tools.metadata
new file mode 100644
index 0000000..38df16e
--- /dev/null
+++ b/.rng-tools.metadata
@@ -0,0 +1,2 @@
+2e3475074ae0c75fc417da553eb70ec160334b18 SOURCES/jitterentropy-library-3.4.1.tar.gz
+8487beef3dfc81bc0cef48b0e160996009ccbc4f SOURCES/rng-tools-6.16.tar.gz
diff --git a/SPECS/rng-tools.spec b/SPECS/rng-tools.spec
index 14a02b7..ba5b52e 100644
--- a/SPECS/rng-tools.spec
+++ b/SPECS/rng-tools.spec
@@ -3,7 +3,7 @@
 Summary:        Random number generator related utilities
 Name:           rng-tools
 Version:        6.16
-Release:        1%{?dist}
+Release:        2%{?dist}
 Group:          System Environment/Base
 License:        GPLv2+
 URL:            https://github.com/nhorman/rng-tools
@@ -75,6 +75,13 @@ install -D %{SOURCE2} -m0644 %{buildroot}%{_sysconfdir}/sysconfig/rngd
 %systemd_preun rngd.service
 
 %postun
+# rngd.service on RHEL-9 changed to multi-user target so we need to update
+# the symlink by re-enabling the service for cases where a LEAPP upgrade is
+# executed from RHEL-8 to 9.
+if [ $1 -ge 1 ] ; then
+    # Package upgrade, not uninstall
+    systemctl reenable rngd.service >/dev/null 2>&1
+fi
 %systemd_postun_with_restart rngd.service
 
 %files
@@ -89,6 +96,9 @@ install -D %{SOURCE2} -m0644 %{buildroot}%{_sysconfdir}/sysconfig/rngd
 %config(noreplace) %attr(0644,root,root)    %{_sysconfdir}/sysconfig/rngd
 
 %changelog
+* Thu Mar 26 2026 Bruno Meneguele <bmeneg@redhat.com> - 6.16-2
+- Fix systemd unit symlink for LEAPP upgrades (RHEL-161093)
+
 * Thu Mar 02 2023 Vladis Dronov <vdronov@redhat.com> - 6.16-1
 - Update rng-tools to v6.16 @ 0e560296 (bz 2174908)
 - Get rid of text relocations in -fPIE build