diff --git a/libldb.spec b/libldb.spec
index 2b3e1b0..892a58d 100644
--- a/libldb.spec
+++ b/libldb.spec
@@ -35,6 +35,7 @@ BuildRequires: docbook-style-xsl
 BuildRequires: python-devel
 BuildRequires: python-tdb
 BuildRequires: pytalloc-devel
+BuildRequires: doxygen
 
 # Patches
 
@@ -90,6 +91,7 @@ Development files for the Python bindings for the LDB library
            --with-privatelibdir=%{_libdir}/ldb
 
 make V=1 %{?_smp_mflags}
+doxygen Doxyfile
 
 %install
 make install DESTDIR=%{buildroot}
@@ -103,6 +105,9 @@ rm -f %{buildroot}/%{python_sitearch}/_tevent.so
 # rpmbuild to strip them and include them in debuginfo
 find $RPM_BUILD_ROOT -name "*.so*" -exec chmod -c +x {} \;
 
+# Install API docs
+cp -a apidocs/man/* $RPM_BUILD_ROOT/%{_mandir}
+
 %clean
 rm -rf %{buildroot}
 
@@ -144,7 +149,7 @@ rm -rf %{buildroot}
 %{_libdir}/libldb.so
 
 %{_libdir}/pkgconfig/ldb.pc
-%{_mandir}/man3/ldb.3.gz
+%{_mandir}/man3/ldb*.gz
 
 %files -n pyldb
 %defattr(-,root,root,-)
@@ -156,11 +161,15 @@ rm -rf %{buildroot}
 %{_includedir}/pyldb.h
 %{_libdir}/libpyldb-util.so
 %{_libdir}/pkgconfig/pyldb-util.pc
+%{_mandir}/man*/Py*.gz
 
 %post -n pyldb -p /sbin/ldconfig
 %postun -n pyldb -p /sbin/ldconfig
 
 %changelog
+* Mon Nov 21 2011 Stephen Gallagher <sgallagh@redhat.com> - 1.1.0-2
+- Build and install API documentation
+
 * Wed Nov 09 2011 Stepgen Gallagher <sgallagh@redhat.com> - 1.1.3-1
 - New upstream release
 - Required for building newer samba4 packages