diff --git a/libldb1.changes b/ldb.changes
similarity index 77%
rename from libldb1.changes
rename to ldb.changes
index d33ffb6..333e886 100644
--- a/libldb1.changes
+++ b/ldb.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri May 25 11:12:36 UTC 2012 - lmuelle@suse.com
+
+- Cleanup BuildRequires and spec file in general.
+
 -------------------------------------------------------------------
 Thu May 17 12:44:28 UTC 2012 - lmuelle@suse.com
 
diff --git a/libldb1.spec b/ldb.spec
similarity index 73%
rename from libldb1.spec
rename to ldb.spec
index f2d7dcb..5c563de 100644
--- a/libldb1.spec
+++ b/ldb.spec
@@ -20,28 +20,6 @@
 #%{!?python_version:  %global python_version %(%{__python} -c "import sys; sys.stdout.write(sys.version[:3])")}
 
 Name:           libldb1
-BuildRequires:  cups-devel
-BuildRequires:  e2fsprogs-devel
-BuildRequires:  fam-devel
-BuildRequires:  libacl-devel
-BuildRequires:  pam-devel
-BuildRequires:  popt-devel
-BuildRequires:  readline-devel
-%if 0%{?suse_version}
-BuildRequires:  cracklib-devel openldap2-devel
-%endif
-%if 0%{?suse_version} > 1030
-BuildRequires:  gdbm-devel pwdutils
-%endif
-%if 0%{?suse_version} > 930
-BuildRequires:  krb5-devel libiniparser-devel libnscd-devel python-devel
-%endif
-%if 0%{?suse_version} > 1000
-BuildRequires:  keyutils-devel
-%endif
-%if 0%{?suse_version} > 1000 || 0%{?fedora_version} || 0%{?rhel_version} || 0%{?mandriva_version}
-BuildRequires:  ctdb-devel
-%endif
 %if 0%{?suse_version} > 1020
 BuildRequires:  pkg-config
 %else
@@ -50,9 +28,6 @@ BuildRequires:  pkgconfig
 BuildRequires:  libtalloc2-devel >= 2.0.7
 BuildRequires:  libtdb1-devel
 BuildRequires:  libtevent0-devel
-%if 0%{?suse_version} && 0%{?suse_version} < 1111
-%define	guards_symbols pre_1111
-%endif
 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1140
 %define	build_make_smp_mflags %{?_smp_mflags}
 %else
@@ -68,28 +43,6 @@ PreReq:         /sbin/ldconfig
 Summary:        Samba ldb Library
 Source:         http://download.samba.org/pub/ldb/ldb-%{version}.tar.gz
 Source4:        baselibs.conf
-# Choose some features / extra packages here
-############################################
-%if 0%{?suse_version} && 0%{?suse_version} < 1111
-%define	link_static_libs 1
-%else
-%define	link_static_libs 0
-%endif
-# Define some global directories
-################################
-%define	DOCDIR %{_defaultdocdir}/samba
-%define	DOCBOOKDIR %{_defaultdocdir}/%{name}/docbook
-%define	SWATDIR %{_datadir}/samba/swat
-%define	LOGDIR %{_localstatedir}/log/samba
-%define	LOCKDIR %{_localstatedir}/lib/samba
-%define	CONFIGDIR %{_sysconfdir}/samba
-%define	INITDIR %{_sysconfdir}/init.d
-%define	PIDDIR %{_localstatedir}/run/samba
-%if "%{_vendor}" == "suse"
-%define	NET_CFGDIR network
-%else
-%define	NET_CFGDIR network-scripts
-%endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -131,8 +84,6 @@ Tools to manipulate ldb files
 export CFLAGS="${RPM_OPT_FLAGS} -D_GNU_SOURCE ${OPTIMIZATION} -D_LARGEFILE64_SOURCE -DIDMAP_RID_SUPPORT_TRUSTED_DOMAINS"
 CONFIGURE_OPTIONS="\
 	--prefix=%{_prefix} \
-	--localstatedir=%{LOCKDIR} \
-	--sysconfdir=%{CONFIGDIR} \
 	--libdir=%{_libdir} \
 	--with-modulesdir=%{_libdir}/samba \
 "