diff --git a/sys-auth/sssd/sssd-2.9.5-r1.ebuild b/sys-auth/sssd/sssd-2.9.5-r2.ebuild
similarity index 98%
rename from sys-auth/sssd/sssd-2.9.5-r1.ebuild
rename to sys-auth/sssd/sssd-2.9.5-r2.ebuild
index 2f6024c..8c25772 100644
--- a/sys-auth/sssd/sssd-2.9.5-r1.ebuild
+++ b/sys-auth/sssd/sssd-2.9.5-r2.ebuild
@@ -229,6 +229,8 @@ multilib_src_configure() {
 		# Annoyingly configure requires that you pick systemd XOR sysv
 		--with-initscript=$(usex systemd systemd sysv)
 		KRB5_CONFIG="${ESYSROOT}"/usr/bin/krb5-config
+		# Needed for Samba 4.21
+		CPPFLAGS="${CPPFLAGS} -I${ESYSROOT}/usr/include/samba-4.0"
 	)
 
 	use systemd && myconf+=(
@@ -238,7 +240,7 @@ multilib_src_configure() {
 	if ! multilib_is_native_abi; then
 		# work-around all the libraries that are used for CLI and server
 		myconf+=(
-			{POPT,TALLOC,TDB,TEVENT}_{CFLAGS,LIBS}=' '
+			{POPT,TALLOC,TDB,TEVENT,LDB}_{CFLAGS,LIBS}=' '
 			# ldb headers are fine since native needs it
 			# ldb lib fails... but it does not seem to bother
 			{DHASH,UNISTRING,INI_CONFIG_V{0,1,1_1,1_3}}_{CFLAGS,LIBS}=' '