diff --git a/ctdb/configure.rpm b/ctdb/configure.rpm
index ff7eace2815..32e6673d310 100755
--- a/ctdb/configure.rpm
+++ b/ctdb/configure.rpm
@@ -7,7 +7,7 @@ else
 fi
 
 CFLAGS="-Wall -g -D_GNU_SOURCE" ./configure \
-	--builtin-libraries=replace,popt,samba-debug,socket-blocking,tdb-wrap \
+	--builtin-libraries=replace,popt \
 	--bundled-libraries=!talloc,!tevent,!tdb \
 	--minimum-library-version=talloc:2.0.8,tdb:1.2.11,tevent:0.9.16 \
 	--prefix=/usr \
diff --git a/ctdb/packaging/RPM/ctdb.spec.in b/ctdb/packaging/RPM/ctdb.spec.in
index 98dd3027c12..ce7d8a629e9 100644
--- a/ctdb/packaging/RPM/ctdb.spec.in
+++ b/ctdb/packaging/RPM/ctdb.spec.in
@@ -88,7 +88,7 @@ fi
 export CC
 
 CFLAGS="$RPM_OPT_FLAGS $EXTRA -D_GNU_SOURCE" ./buildtools/bin/waf configure \
-	--builtin-libraries=replace,popt,samba-debug,socket-blocking,tdb-wrap \
+	--builtin-libraries=replace,popt \
 	--bundled-libraries=!talloc,!tevent,!tdb \
 	--minimum-library-version=talloc:%libtalloc_version,tdb:%libtdb_version,tevent:%libtevent_version \
 %if %with_pcp_pmda
@@ -199,6 +199,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/ltdbtool
 %{_bindir}/ctdb_diagnostics
 %{_bindir}/onnode
+%dir %{_libdir}
+%{_libdir}/ctdb/lib*
 %{_mandir}/man1/ctdb.1.gz
 %{_mandir}/man1/ctdbd.1.gz
 %{_mandir}/man1/ctdbd_wrapper.1.gz