diff --git a/samba.spec b/samba.spec
index c112518..aaf7011 100644
--- a/samba.spec
+++ b/samba.spec
@@ -109,7 +109,7 @@
 Summary:	Samba SMB server
 Name:		samba
 Version:	4.10.2
-Release:	6
+Release:	9
 Epoch:		1
 License:	GPLv3+
 Group:		System/Servers
@@ -145,8 +145,6 @@ Patch11:	ROSA-smb-default-config.patch
 Patch12:	ROSA-Clearer-debug-about-ulimits.patch
 Patch13:	ROSA-Force-libsystemd.patch
 
-# %%__forceautoreq* were added to rpm 5.4.10-88
-#BuildRequires:	rpm >= 5.4.10-88
 %if %{with clang}
 BuildRequires:	clang lld
 %else
@@ -222,8 +220,6 @@ Requires:	%{name}-common = %{EVRD}
 # Disable autoreq on individual libs to get rid of library dependecy loops and provide deps on these libs to samba-* packages.
 %if %{with noautoreq}
 %define __noautoreq '(lib(non-posix-acls|dcerpc-(atsvc|binding|samr|server)|dcerpc|ndr-(krb5pac|nbt|standard)|ndr|netapi|nss_winbind|pdb|samba-(credentials|hostconfig|policy|util)|samdb|smb(client|conf|ldap)|tevent-util|samba-errors|wbclient)|pam_winbind|winbind_krb5_locator)\.so|devel.*'
-#define __forceautoreq 'libsmbclient.so.0|libsmbclient0|lib64smbclient0'
-#define __forceautoreqfiles 'libsmbclient.so.0|libsmbclient0|lib64smbclient0'
 %endif
 
 %description
@@ -234,7 +230,7 @@ clients, which complement the built-in SMB filesystem in Linux. Samba uses
 NetBIOS over TCP/IP (NetBT) protocols and does NOT need NetBEUI (Microsoft
 Raw NetBIOS frame) protocol.
 
-Samba features working NT Domain Control capability.
+Samba features working NT or AD Domain Control capability.
 
 Please refer to the WHATSNEW.txt document for fixup information. This binary
 release includes encrypted password support.
@@ -368,9 +364,28 @@ fi
 #----------------------------------------------------------------------------
 
 %package -n %{libsambalibs}
-Summary:	Samba-server libraries
+Summary:	Samba libraries
 Group:		System/Libraries
 Requires:	%{libs_config}
+# Manually resolving dependencies due to using __noautoreq (see above)
+Requires:	%{libname} = %{EVRD}
+Requires:	%{libnetapi} = %{EVRD}
+Requires:	%{libdcerpc} = %{EVRD}
+Requires:	%{libsambahostconfig} = %{EVRD}
+Requires:	%{libndr} = %{EVRD}
+Requires:	%{libwbclient} = %{EVRD}
+Requires:	%{libsambautil} = %{EVRD}
+Requires:	%{libpolicy} = %{EVRD}
+Requires:	%{libsamdb} = %{EVRD}
+Requires:	%{libsambapassdb} = %{EVRD}
+Requires:	%{libcredentials} = %{EVRD}
+Requires:	%{libsmbconf} = %{EVRD}
+Requires:	%{libsmbldap} = %{EVRD}
+Requires:	%{libtevent_util} = %{EVRD}
+Requires:	%{libnsswins} = %{EVRD}
+Requires:	%{libwinbind} = %{EVRD}
+Requires:	%{libsambaerrors} = %{EVRD}
+#
 Conflicts:	%{name}-server < 1:4.1.17
 Obsoletes:	lib64samba-bind-dlz0 < 1:4.1.17-4
 Conflicts:	lib64samba-bind-dlz0 < 1:4.1.17-4
@@ -379,7 +394,7 @@ Obsoletes:	%{_lib}registry0 < 1:4.6
 Obsoletes:	%{libsambaserver} < 1:4.9.4-5
 
 %description -n %{libsambalibs}
-Provides libraries for samba-server
+Provides libraries for Samba
 
 %files -n %{libsambalibs}
 %{_libdir}/%{name}/vfs/*.so
@@ -531,6 +546,7 @@ Provides libraries for samba-server
 Summary:	Samba (SMB) client programs
 Group:		Networking/Other
 Requires:	%{name}-common = %{EVRD}
+Requires:	%{libname} = %{EVRD}
 Requires:	mount-cifs
 # For samba-tool
 Requires:	ldb-utils
@@ -588,33 +604,11 @@ Summary:	Files used by both Samba servers and clients
 Group:		System/Servers
 # rpcclient etc. use samba python modules
 Requires:	%{name}-python = %{EVRD}
-Requires:	%{libsambaerrors} = %{EVRD}
-Requires:	%{libsambapassdb} = %{EVRD}
-Requires:	%{libcredentials} = %{EVRD}
-Requires:	%{libsmbconf} = %{EVRD}
-Requires:	%{libsmbldap} = %{EVRD}
-Requires:	%{libtevent_util} = %{EVRD}
+Requires:	%{libsambalibs} = %{EVRD}
 Requires(post):	systemd
 %rename 	samba-common-ldap
 Conflicts:	samba3-common
 
-# A clumzy approach to get rid of LOOPS - provide deps for individual libs _by hand_
-Requires:	%{libsmbldap } = %{EVRD}
-Requires:	%{libnetapi} = %{EVRD}
-Requires:	%{libname} = %{EVRD}
-Requires:	%{libsamdb} = %{EVRD}
-Requires:	%{libsmbconf} = %{EVRD}
-Requires:	%{libtevent_util} = %{EVRD}
-Requires:	%{libsambahostconfig} = %{EVRD}
-Requires:	%{libwinbind} = %{EVRD}
-Requires:	%{libndr} = %{EVRD}
-Requires:	%{libwbclient} = %{EVRD}
-Requires:	%{libcredentials} = %{EVRD}
-Requires:	%{libsambapassdb} = %{EVRD}
-Requires:	%{libsmbldap} = %{EVRD}
-Requires:	%{libsambautil} = %{EVRD}
-Requires:	%{libdcerpc} = %{EVRD}
-
 %description common
 Samba-common provides files necessary for both the server and client
 packages of Samba.
@@ -856,6 +850,8 @@ operation of tools against smb servers.
 Summary:	SMB Client Library
 Group:		System/Libraries
 Provides:	libsmbclient = %{EVRD}
+# Manually resolve dependencies due to using __noautoreq (see above)
+Requires:	%{libsambalibs} = %{EVRD}
 
 %description -n %{libname}
 This package contains the SMB client library, part of the samba suite of
@@ -870,16 +866,6 @@ networking software, allowing other software to access SMB shares.
 Summary:	SMB Client Library Development files
 Group:		Development/C
 Requires:	%{libname} = %{EVRD}
-Requires:	%{libcredentials} = %{EVRD}
-Requires:	%{libdcerpc} = %{EVRD}
-Requires:	%{libtevent_util} = %{EVRD}
-Requires:	%{libwbclient} = %{EVRD}
-Requires:	%{libsambahostconfig} = %{EVRD}
-Requires:	%{libndr} = %{EVRD}
-Requires:	%{libsmbconf} = %{EVRD}
-Requires:	%{libsambautil} = %{EVRD}
-Requires:	%{libsambaerrors} = %{EVRD}
-Requires:	%{name}-common = %{EVRD}
 
 Conflicts:	%{_lib}smbclient0-devel < 1:4.1.9-10
 Obsoletes:	%{_lib}smbclient0-devel < 1:4.1.9-10