diff --git a/.gitignore b/.gitignore
index 045e4cc..2e5c5e2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-SOURCES/samba-4.16.1.tar.xz
+SOURCES/samba-4.16.2.tar.xz
 SOURCES/samba-pubkey_AA99442FB680B620.gpg
diff --git a/.samba.metadata b/.samba.metadata
index 67fe437..6b7a169 100644
--- a/.samba.metadata
+++ b/.samba.metadata
@@ -1,2 +1,2 @@
-c08383faebceee30cc844f664d699883ae147e6f SOURCES/samba-4.16.1.tar.xz
+7ee5776f92bbca2508da3d06d2d03a8e5ff5ed67 SOURCES/samba-4.16.2.tar.xz
 971f563c447eda8d144d6c9e743cd0f0488c0d9e SOURCES/samba-pubkey_AA99442FB680B620.gpg
diff --git a/SOURCES/samba-4.16.1.tar.asc b/SOURCES/samba-4.16.1.tar.asc
deleted file mode 100644
index 86dc732..0000000
--- a/SOURCES/samba-4.16.1.tar.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEEgfXigyvSVFoYl7cTqplEL7aAtiAFAmJvqC0ACgkQqplEL7aA
-tiDg0g/+O+s5QgOPb+RFm3JFDAbMz012rBX6qd9Y2yvYZD9JdNXn7L2Z0mpzUknF
-UCD3/5ulMFzoxaohrAX/qWvBkJ/ctnijO0t+HQpK+C1HvJMul25O0enfIesoUsHb
-mll2KSko1XWKKIVure07cnoJipT7lBZa/xmo2zZHf5TdsnYYt9kywcnPljYYr8/S
-971rX8esSant3ATcxk6JiGEINB9rlbEw7Ow5iNtv0ZmHki5mb39fCY3vDnLG40Mo
-VirAW9x480QYzhSassgXEoCyA9LWwWjdbWHuumFFNdLkWwtjAGnc1PIhiGznkKTy
-s8enNkyZGZUmZfsr/mR5D1pBLe41VveW75N+4/GFkcaYPQJNAFhQdwx7d7F8P72I
-QfU8diCRL+786far/CVNViX4NMb11I1zo1ZbzrO7inUP75kqt3exVRnZUxTcKOae
-n6AqkQGHa8iY8UGwb5R6KTvb6ZwPjhmk9xX+Ja9Os6+OC17bGdANsiRO8MI0b7Eb
-TkFGoRbjpvLnvok1tKNXc5BMbqiHVk+k7WQVin+fIvRA9mO9bawNyVi7+ps+y1mo
-t0kfhZGDsF3YUgHuxkRW+nVXO3Cz/NwmC94hJ1hLtDyUfOAanWGoGYinAIFWC7rY
-41e6gagXfPpC0zGlQ3xynhsrEsEPMO+sh5TCRhDq53VM6RZyLpg=
-=qsuJ
------END PGP SIGNATURE-----
diff --git a/SOURCES/samba-4.16.2.tar.asc b/SOURCES/samba-4.16.2.tar.asc
new file mode 100644
index 0000000..62daa21
--- /dev/null
+++ b/SOURCES/samba-4.16.2.tar.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEEgfXigyvSVFoYl7cTqplEL7aAtiAFAmKm3zUACgkQqplEL7aA
+tiC2LA/+LwNu8NfLoSSuq+OXTe6Ih0KhdT3RtIhknhe2s3ibBw7juNqUEmZupufH
+01M6p+sq1YyyRABW2k2M51tKF96wdjffDNFTNdpFOXYL5Hm1uL4Lzdf4ZiWY9MKp
+U04uZ1OwicIeFdqU3oUt9iLY5Z2KPz4pTfIOZL67OV8QDXxHdieHfseWVUmOaAjd
+YsZFQRl2c29OkOkAD5AYpNdquQAGvS34M5dPYItrJwgKs9RYMG6JX03oCpoFxXVn
+wjV74S1GB03Gec7tOI+BlAshUeAgUIcYjSrcxJ3MEDTXjJkoVcS9gOOezuWf6lei
+4uEmLYKaYKstF3qFriXJIWoGPAakzyumQOpjo84C0Z0mftSX0L3XbVGmsP48Ra58
+foz0iLka2/8AqxYa5QXkGwqg615icpLo2MmM2/wvMg0Mvx6D6zcb2yx5gIb+ITmh
+d1iN7Rzhk+V2fP7m7zua4IEs7jq8M3pXUF7+By2XdboaOuq80APwLfr37yMeQBPu
+NTVgOPCe+AQZliOWagxZ03yLSraCljIfMFLecDdl1W2Vi45IrtRxT2o2gqtnOgsL
+1+8OfmcvPYYSXNr3dreeH7UROVR6DEBWL1bUV2UFB5EFzUDB612EE6Z5IVbPoTWl
+GVAKedXrrQx+f2ucUFg5AvjCJkZ8wVlkMTBK/KJbENbdAe/680k=
+=fziY
+-----END PGP SIGNATURE-----
diff --git a/SOURCES/samba.abignore b/SOURCES/samba.abignore
new file mode 100644
index 0000000..718059d
--- /dev/null
+++ b/SOURCES/samba.abignore
@@ -0,0 +1,5 @@
+#################################################
+# This is a grouping library without any code
+#################################################
+[suppress_file]
+file_name_regexp=.*libdcerpc-samr\\.so.*
diff --git a/SPECS/samba.spec b/SPECS/samba.spec
index 44251b0..83c3053 100644
--- a/SPECS/samba.spec
+++ b/SPECS/samba.spec
@@ -134,13 +134,13 @@
 
 %define samba_requires_eq()  %(LC_ALL="C" echo '%*' | xargs -r rpm -q --qf 'Requires: %%{name} = %%{epoch}:%%{version}\\n' | sed -e 's/ (none):/ /' -e 's/ 0:/ /' | grep -v "is not")
 
-%global baserelease 0
+%global baserelease 1
 
-%global samba_version 4.16.1
+%global samba_version 4.16.2
 %global talloc_version 2.3.3
 %global tdb_version 1.4.6
 %global tevent_version 0.12.0
-%global ldb_version 2.5.0
+%global ldb_version 2.5.1
 # This should be rc1 or nil
 %global pre_release %nil
 
@@ -200,6 +200,7 @@ Source11:       smb.conf.vendor
 Source12:       smb.conf.example
 Source13:       pam_winbind.conf
 Source14:       samba.pamd
+Source15:       samba.abignore
 
 Source201:      README.downgrade
 
@@ -428,8 +429,10 @@ SMB/CIFS clients.
 Summary: Files used by both Samba servers and clients
 BuildArch: noarch
 
-Requires(post): systemd
+Requires(post): (systemd-standalone-tmpfiles or systemd)
+%if 0%{?fedora}
 Recommends:     logrotate
+%endif
 
 Provides: samba4-common = %{samba_depver}
 Obsoletes: samba4-common < %{samba_depver}
@@ -509,6 +512,8 @@ SMB/CIFS clients.
 %package dc
 Summary: Samba AD Domain Controller
 Requires: %{name} = %{samba_depver}
+Requires: %{name}-client-libs = %{samba_depver}
+Requires: %{name}-common-libs = %{samba_depver}
 Requires: %{name}-libs = %{samba_depver}
 Requires: %{name}-dc-provision = %{samba_depver}
 Requires: %{name}-dc-libs = %{samba_depver}
@@ -549,6 +554,7 @@ The samba-dc-provision package provides files to setup a domain controller
 ### DC-LIBS
 %package dc-libs
 Summary: Samba AD Domain Controller Libraries
+Requires: %{name}-client-libs = %{samba_depver}
 Requires: %{name}-common-libs = %{samba_depver}
 Requires: %{name}-libs = %{samba_depver}
 
@@ -564,9 +570,11 @@ link against the SMB, RPC and other protocols.
 ### DC-BIND
 %package dc-bind-dlz
 Summary: Bind DLZ module for Samba AD
+Requires: %{name}-client-libs = %{samba_depver}
 Requires: %{name}-common = %{samba_depver}
 Requires: %{name}-dc-libs = %{samba_depver}
 Requires: %{name}-dc = %{samba_depver}
+Requires: %{name}-libs = %{samba_depver}
 Requires: bind
 
 Provides: bundled(libreplace)
@@ -582,6 +590,9 @@ name server related details of Samba AD.
 Summary: Developer tools for Samba libraries
 Requires: %{name}-libs = %{samba_depver}
 Requires: %{name}-client-libs = %{samba_depver}
+%if %{with dc}
+Requires: %{name}-dc-libs = %{samba_depver}
+%endif
 
 Provides: samba4-devel = %{samba_depver}
 Obsoletes: samba4-devel < %{samba_depver}
@@ -596,6 +607,7 @@ libraries in the Samba suite.
 %package vfs-cephfs
 Summary: Samba VFS module for Ceph distributed storage system
 Requires: %{name} = %{samba_depver}
+Requires: %{name}-client-libs = %{samba_depver}
 Requires: %{name}-libs = %{samba_depver}
 
 Provides: bundled(libreplace)
@@ -732,6 +744,9 @@ Requires: %{name} = %{samba_depver}
 Requires: %{name}-client-libs = %{samba_depver}
 Requires: %{name}-common-libs = %{samba_depver}
 Requires: %{name}-libs = %{samba_depver}
+%if %{with dc}
+Requires: %{name}-dc-libs = %{samba_depver}
+%endif
 Requires: python3-talloc
 Requires: python3-tevent
 Requires: python3-tdb
@@ -770,6 +785,8 @@ If you want to run full set of Samba tests, you need to install this package.
 %if %{with dc} || %{with testsuite}
 %package -n python3-samba-dc
 Summary: Samba Python libraries for Samba AD
+Requires: %{name}-client-libs = %{samba_depver}
+Requires: %{name}-dc-libs = %{samba_depver}
 Requires: python3-%{name} = %{samba_depver}
 
 %description -n python3-samba-dc
@@ -1023,6 +1040,7 @@ and use CTDB instead.
 Summary: CTDB PCP pmda support
 Requires: ctdb = %{samba_depver}
 Requires: pcp-libs
+Requires: %{name}-client-libs = %{samba_depver}
 
 %description -n ctdb-pcp-pmda
 Performance Co-Pilot (PCP) support for CTDB
@@ -1083,7 +1101,7 @@ rm -f lib/crypto/{aes,rijndael}*.c
 #endif with includelibs
 %endif
 
-%global _samba_libraries !zlib,!popt%{_talloc_lib}%{_tevent_lib}%{_tdb_lib}%{_ldb_lib}
+%global _samba_libraries !popt%{_talloc_lib}%{_tevent_lib}%{_tdb_lib}%{_ldb_lib}
 
 %global _samba_idmap_modules idmap_ad,idmap_rid,idmap_ldap,idmap_hash,idmap_tdb2
 %global _samba_pdb_modules pdb_tdbsam,pdb_ldap,pdb_smbpasswd,pdb_wbc_sam,pdb_samba4
@@ -4137,6 +4155,13 @@ fi
 %endif
 
 %changelog
+* Tue Jun 14 2022 Pavel Filipenský <pfilipen@redhat.com> - 4.16.2-1
+- resolves: rhbz#2084162 - Fix printer displays only after 300 seconds timeout
+
+* Mon Jun 13 2022 Pavel Filipenský <pfilipen@redhat.com> - 4.16.2-0
+- Fix rpminspect abidiff
+- related: rhbz#2077468 - Rebase Samba to 4.16.2
+
 * Mon May 02 2022 Pavel Filipenský <pfilipen@redhat.com> - 4.16.1-0
 - Update to Samba 4.16.1
 - resolves: rhbz#2077468 Rebase Samba to the the latest 4.16.x release