diff --git a/.gitignore b/.gitignore
index 9f260e0..1fdaefd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 /ldb-1.1.3.tar.gz
 /ldb-1.1.4.tar.gz
 /ldb-1.1.6.tar.gz
+/ldb-1.1.8.tar.gz
diff --git a/libldb.spec b/libldb.spec
index 8ca6153..9aa2813 100644
--- a/libldb.spec
+++ b/libldb.spec
@@ -8,7 +8,7 @@
 %define tevent_version 0.9.15
 
 Name: libldb
-Version: 1.1.6
+Version: 1.1.8
 Release: 1%{?dist}
 Group: Development/Libraries
 Summary: A schema-less, ldap like, API and database
@@ -40,7 +40,6 @@ BuildRequires: doxygen
 
 Provides: bundled(libreplace)
 Provides: bundled(libtdb_compat)
-Provides: bundled(libccan)
 
 # Patches
 
@@ -90,16 +89,12 @@ Development files for the Python bindings for the LDB library
 
 %build
 
-# tdb_compat and ccan have no upstream releases to link against yet and their
-# API is in flux. It is unsafe to make them public and shared at this time.
-# Fedora doesn't yet support tdb2, so build against tdb1 for now
 %configure --disable-rpath \
            --disable-rpath-install \
            --bundled-libraries=NONE \
-           --builtin-libraries=tdb_compat,ccan,replace \
+           --builtin-libraries=replace \
            --with-modulesdir=%{_libdir}/ldb/modules \
-           --with-privatelibdir=%{_libdir}/ldb \
-           --disable-tdb2
+           --with-privatelibdir=%{_libdir}/ldb
 
 # Don't build with multiple processors
 # It breaks due to a threading issue in WAF
@@ -111,9 +106,6 @@ make install DESTDIR=%{buildroot}
 
 rm -f %{buildroot}%{_libdir}/libldb.a
 
-# Remove _tevent.so (it's managed by python-tevent)
-#rm -f %{buildroot}/%{python_sitearch}/_tevent.so
-
 # Shared libraries need to be marked executable for
 # rpmbuild to strip them and include them in debuginfo
 find $RPM_BUILD_ROOT -name "*.so*" -exec chmod -c +x {} \;
@@ -121,6 +113,10 @@ find $RPM_BUILD_ROOT -name "*.so*" -exec chmod -c +x {} \;
 # Install API docs
 cp -a apidocs/man/* $RPM_BUILD_ROOT/%{_mandir}
 
+# LDB 1.1.8 bug: remove manpage named after full
+# file path
+rm -f $RPM_BUILD_ROOT/%{_mandir}/man3/_*
+
 %clean
 rm -rf %{buildroot}
 
@@ -181,6 +177,14 @@ rm -rf %{buildroot}
 %postun -n pyldb -p /sbin/ldconfig
 
 %changelog
+* Tue Jul 10 2012 Stephen Gallagher <sgallagh@redhat.com> - 1.1.8-1
+- New upstream release 1.1.8
+- Required for latest Samba 4 beta
+- Fixes for pyldb
+- Revert to using tdb1 by default
+- Drop support for tdb_compat
+- CCAN is no longer built as a static library
+
 * Tue May 22 2012 Stephen Gallagher <sgallagh@redhat.com> - 1.1.6-1
 - New upstream release 1.1.6
 - Drop upstream patches
diff --git a/sources b/sources
index 1803856..dfacf12 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-37ea2b326c99b00f533c51a1326332ed  ldb-1.1.6.tar.gz
+355e929f4f29e95d8aa1ec7076ed91ab  ldb-1.1.8.tar.gz