diff --git a/ldb.changes b/ldb.changes
index 7e94d82..2a21ea6 100644
--- a/ldb.changes
+++ b/ldb.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Oct 30 13:15:15 UTC 2015 - lmuelle@suse.com
+
+- Add doxygen at build time to add the development documentation.
+- Disable rpath-install and silent-rules while configure.
+
 -------------------------------------------------------------------
 Thu Oct 22 20:52:14 UTC 2015 - lmuelle@suse.com
 
diff --git a/ldb.spec b/ldb.spec
index 8f98835..a4905a1 100644
--- a/ldb.spec
+++ b/ldb.spec
@@ -27,6 +27,7 @@
 
 Name:           ldb
 BuildRequires:  docbook-xsl-stylesheets
+BuildRequires:  doxygen
 #!BuildIgnore: libtalloc
 BuildRequires:  libtalloc-devel >= %{talloc_version}
 BuildRequires:  libtdb-devel >= %{tdb_version}
@@ -141,6 +142,8 @@ CONFIGURE_OPTIONS="\
 	--prefix=%{_prefix} \
 	--libdir=%{_libdir} \
 	--disable-rpath \
+	--disable-rpath-install \
+	--disable-silent-rules \
 	--with-modulesdir=%{_libdir} \
 	--bundled-libraries=NONE \
 	--builtin-libraries=replace \
@@ -148,6 +151,9 @@ CONFIGURE_OPTIONS="\
 ./configure ${CONFIGURE_OPTIONS}
 %{__make} %{build_make_smp_mflags} \
 	all
+doxygen Doxyfile
+# remove man page with bogus full build dir in path
+rm -f apidocs/man/man3/_*_ldb-%{ldb_version}_include_.3
 
 %check
 # make test doesn't work with --disable-rpath
@@ -156,6 +162,8 @@ CONFIGURE_OPTIONS="\
 %install
 DESTDIR=${RPM_BUILD_ROOT} make install
 
+cp -a apidocs/man/* $RPM_BUILD_ROOT/%{_mandir}
+
 %post -n %{libldb_name} -p /sbin/ldconfig
 
 %postun -n %{libldb_name} -p /sbin/ldconfig
@@ -187,6 +195,11 @@ DESTDIR=${RPM_BUILD_ROOT} make install
 %{_libdir}/libldb.so
 %dir %{_libdir}/ldb
 %{_libdir}/pkgconfig/ldb.pc
+%{_mandir}/man3/ldb*.3.*
+%if 0%{?suse_version} > 1110 || 0%{?fedora_version} > 0 || 0%{?centos_version} > 599 || 0%{?rhel_version} > 599
+%if 0%{?suse_version} != 1110
+%{_mandir}/man3/ldif*.3.*
+%endif
 
 %files -n ldb-tools
 %defattr(-,root,root)
@@ -197,13 +210,12 @@ DESTDIR=${RPM_BUILD_ROOT} make install
 %{_bindir}/ldbrename
 %{_bindir}/ldbsearch
 %{_libdir}/ldb/libldb-cmdline.so
-%{_mandir}/man1/ldbadd.1.gz
-%{_mandir}/man1/ldbdel.1.gz
-%{_mandir}/man1/ldbedit.1.gz
-%{_mandir}/man1/ldbmodify.1.gz
-%{_mandir}/man1/ldbrename.1.gz
-%{_mandir}/man1/ldbsearch.1.gz
-%{_mandir}/man3/ldb.3.gz
+%{_mandir}/man1/ldbadd.1.*
+%{_mandir}/man1/ldbdel.1.*
+%{_mandir}/man1/ldbedit.1.*
+%{_mandir}/man1/ldbmodify.1.*
+%{_mandir}/man1/ldbrename.1.*
+%{_mandir}/man1/ldbsearch.1.*
 
 %files -n python-ldb
 %defattr(-,root,root,-)
@@ -215,5 +227,9 @@ DESTDIR=${RPM_BUILD_ROOT} make install
 %{_includedir}/pyldb.h
 %{_libdir}/libpyldb-util.so
 %{_libdir}/pkgconfig/pyldb-util.pc
+%if 0%{?suse_version} > 1110 || 0%{?fedora_version} > 0 || 0%{?centos_version} > 599 || 0%{?rhel_version} > 599
+%if 0%{?suse_version} != 1110
+%{_mandir}/man3/PyLdb*.3.*
+%endif
 
 %changelog