diff --git a/ldb.spec b/ldb.spec
index db83d7f..22da106 100644
--- a/ldb.spec
+++ b/ldb.spec
@@ -25,9 +25,10 @@ BuildRequires:  pkg-config
 %else
 BuildRequires:  pkgconfig
 %endif
+#!BuildIgnore:  libtalloc-devel
 BuildRequires:  libtalloc2-devel >= 2.0.7
 BuildRequires:  libtdb1-devel >= 1.2.10
-#BuildRequires:  libtevent0-devel >= 0.9.15
+BuildRequires:  libtevent0-devel >= 0.9.15
 BuildRequires:  python-tdb >= 1.2.10
 BuildRequires:  python-devel
 BuildRequires:  python-tevent >= 0.9.15
@@ -51,13 +52,13 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 This package includes the ldb1 library.
 
 
-%package devel
+%package -n libldb-devel
 License:        LGPL-3.0+
 Summary:        Libraries and Header Files to Develop Programs with ldb1 Support
 Group:          Development/Libraries/C and C++
 Requires:       libldb1 = %{version}
 
-%description devel
+%description -n libldb-devel
 Libraries and Header Files to Develop Programs with ldb1 Support
 
 
@@ -87,8 +88,11 @@ export CFLAGS="${RPM_OPT_FLAGS} -D_GNU_SOURCE ${OPTIMIZATION} -D_LARGEFILE64_SOU
 CONFIGURE_OPTIONS="\
 	--prefix=%{_prefix} \
 	--libdir=%{_libdir} \
-	--with-modulesdir=%{_libdir}/samba \
+	--with-modulesdir=%{_libdir} \
+	--bundled-libraries=tdb2 \
 "
+#	--bundled-libraries=NONE \
+#	--bundled-libraries=!tdb \
 ./configure ${CONFIGURE_OPTIONS}
 %{__make} %{build_make_smp_mflags} \
 	all
@@ -110,22 +114,20 @@ DESTDIR=${RPM_BUILD_ROOT} make install
 %{_libdir}/libldb.so.*
 %{_libdir}/ldb/libccan.so.*
 %{_libdir}/ldb/libpytalloc-util.so.*
-%{_libdir}/ldb/libtalloc.so.*
 %{_libdir}/ldb/libtdb.so.*
-%{_libdir}/ldb/libtevent.so.*
 %{_libdir}/libpyldb-util.so.*
 %{_libdir}/ldb/libtdb_compat.so
-%{_libdir}/samba/asq.so
-%{_libdir}/samba/ldap.so
-%{_libdir}/samba/paged_results.so
-%{_libdir}/samba/paged_searches.so
-%{_libdir}/samba/rdn_name.so
-%{_libdir}/samba/sample.so
-%{_libdir}/samba/server_sort.so
-%{_libdir}/samba/skel.so
-%{_libdir}/samba/tdb.so
+%{_libdir}/ldb/asq.so
+#%{_libdir}/ldb/ldap.so
+%{_libdir}/ldb/paged_results.so
+%{_libdir}/ldb/paged_searches.so
+%{_libdir}/ldb/rdn_name.so
+%{_libdir}/ldb/sample.so
+%{_libdir}/ldb/server_sort.so
+%{_libdir}/ldb/skel.so
+%{_libdir}/ldb/tdb.so
 
-%files devel
+%files -n libldb-devel
 %defattr(-,root,root)
 %{_includedir}/ldb.h
 %{_includedir}/ldb_errors.h
@@ -136,6 +138,7 @@ DESTDIR=${RPM_BUILD_ROOT} make install
 %{_includedir}/pytalloc.h
 %{_libdir}/libldb.so
 %{_libdir}/ldb/libldb-cmdline.so
+%{_libdir}/ldb/libpopt.so
 %{_libdir}/libpyldb-util.so
 %{_libdir}/pkgconfig/ldb.pc
 %{_libdir}/pkgconfig/pyldb-util.pc