diff --git a/.gitignore b/.gitignore
index be2856c..c8cb1b8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /ldb-0.9.22.tar.gz
+/ldb-1.0.0.tar.gz
diff --git a/0001-Install-python-bindings-in-the-arch-specific-locatio.patch b/0001-Install-python-bindings-in-the-arch-specific-locatio.patch
deleted file mode 100644
index 0488a1e..0000000
--- a/0001-Install-python-bindings-in-the-arch-specific-locatio.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From feff3aad50304450248aa66aed59d09439699234 Mon Sep 17 00:00:00 2001
-From: Stephen Gallagher <sgallagh@redhat.com>
-Date: Wed, 12 Jan 2011 15:01:52 -0500
-Subject: [PATCH] Install python bindings in the arch-specific location
-
----
- buildtools/wafsamba/samba_python.py |    5 ++++-
- 1 files changed, 4 insertions(+), 1 deletions(-)
-
-diff --git a/buildtools/wafsamba/samba_python.py b/buildtools/wafsamba/samba_python.py
-index a663b1910d063336c1340142ae8855d7e176ecdb..9b72f3fd112288a022a2de0701594814616f202f 100644
---- a/buildtools/wafsamba/samba_python.py
-+++ b/buildtools/wafsamba/samba_python.py
-@@ -51,6 +51,9 @@ def SAMBA_PYTHON(bld, name,
- 
-     link_name = 'python/%s' % realname
- 
-+    from distutils.sysconfig import get_python_lib
-+    arch_install_dir = get_python_lib(1)
-+
-     bld.SAMBA_LIBRARY(name,
-                       source=source,
-                       deps=deps,
-@@ -63,7 +66,7 @@ def SAMBA_PYTHON(bld, name,
-                       link_name=link_name,
-                       pyembed=True,
-                       target_type='PYTHON',
--                      install_path='${PYTHONDIR}',
-+                      install_path=arch_install_dir,
-                       enabled=enabled)
- 
- Build.BuildContext.SAMBA_PYTHON = SAMBA_PYTHON
--- 
-1.7.3.4
-
diff --git a/libldb.spec b/libldb.spec
index 97e0ad2..4a8c9ad 100644
--- a/libldb.spec
+++ b/libldb.spec
@@ -8,8 +8,8 @@
 %define tevent_version 0.9.10
 
 Name: libldb
-Version: 0.9.22
-Release: 9%{?dist}
+Version: 1.0.0
+Release: 1%{?dist}
 Group: Development/Libraries
 Summary: A schema-less, ldap like, API and database
 Requires: libtalloc >= %{talloc_version}
@@ -37,18 +37,17 @@ BuildRequires: python-tdb
 BuildRequires: pytalloc-devel
 
 # Patches
-Patch0001: 0001-Install-python-bindings-in-the-arch-specific-locatio.patch
 
 %description
 An extensible library that implements an LDAP like API to access remote LDAP
 servers, or use local tdb databases.
 
-%package tools
+%package -n ldb-tools
 Group: Development/Libraries
 Summary: Tools to manage LDB files
 Requires: libldb = %{version}-%{release}
 
-%description tools
+%description -n ldb-tools
 Tools to manage LDB files
 
 %package devel
@@ -83,18 +82,17 @@ Development files for the Python bindings for the LDB library
 %prep
 %setup -q -n ldb-%{version}
 
-%patch0001 -p1
-
 %build
-./autogen.sh
-%configure --disable-rpath \
-           --disable-rpath-install \
+%configure --disable-rpath-install \
            --bundled-libraries=NONE \
            --with-modulesdir=%{_libdir}/ldb/modules \
            --with-privatelibdir=%{_libdir}/ldb
 
 make V=1 %{?_smp_mflags}
 
+%check
+make V=1 %{?_smp_mflags} check
+
 %install
 make install DESTDIR=%{buildroot}
 
@@ -118,9 +116,11 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %dir %{_libdir}/ldb
 %{_libdir}/libldb.so.*
+%dir %{_libdir}/ldb/modules
+%dir %{_libdir}/ldb/modules/ldb
 %{_libdir}/ldb/modules/ldb/*.so
 
-%files tools
+%files -n ldb-tools
 %defattr(-,root,root,-)
 %{_bindir}/ldbadd
 %{_bindir}/ldbdel
@@ -128,7 +128,7 @@ rm -rf %{buildroot}
 %{_bindir}/ldbmodify
 %{_bindir}/ldbrename
 %{_bindir}/ldbsearch
-%{_libdir}/ldb/libldb-cmdline-ldb.so
+%{_libdir}/ldb/libldb-cmdline.so
 %{_mandir}/man1/ldbadd.1.*
 %{_mandir}/man1/ldbdel.1.*
 %{_mandir}/man1/ldbedit.1.*
@@ -141,6 +141,7 @@ rm -rf %{buildroot}
 %{_includedir}/ldb_module.h
 %{_includedir}/ldb_handlers.h
 %{_includedir}/ldb_errors.h
+%{_includedir}/ldb_version.h
 %{_includedir}/ldb.h
 %{_libdir}/libldb.so
 
@@ -150,7 +151,7 @@ rm -rf %{buildroot}
 %files -n pyldb
 %defattr(-,root,root,-)
 %{python_sitearch}/ldb.so
-%{_libdir}/libpyldb-util.so.*
+%{_libdir}/libpyldb-util.so.1*
 
 %files -n pyldb-devel
 %defattr(-,root,root,-)
@@ -162,6 +163,11 @@ rm -rf %{buildroot}
 %postun -n pyldb -p /sbin/ldconfig
 
 %changelog
+* Fri Feb 11 2011 Stephen Gallagher <sgallagh@redhat.com> - 1.0.0-1
+- New upstream release 1.0.0
+- SOname bump to account for module loading changes
+- Rename libldb-tools to ldb-tools to make upgrades easier
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.22-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index c528714..da53d15 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-952a63b6cc1a24606fbc9ee79f8d67a4  ldb-0.9.22.tar.gz
+34f09c412b59672734988918f9010456  ldb-1.0.0.tar.gz