diff --git a/libdb.spec b/libdb.spec
index c3ae397..a8eae9a 100644
--- a/libdb.spec
+++ b/libdb.spec
@@ -4,7 +4,7 @@
 Summary: The Berkeley DB database library for C
 Name: libdb
 Version: 5.2.28
-Release: 1%{?dist}
+Release: 2%{?dist}
 Source0: http://download.oracle.com/berkeley-db/db-%{version}.tar.gz
 Source1: http://download.oracle.com/berkeley-db/db.1.85.tar.gz
 # db-1.85 upstream patches
@@ -62,6 +62,19 @@ client/server applications. This package contains the header files,
 libraries, and documentation for building programs which use the
 Berkeley DB.
 
+%package devel-doc
+Summary: C development documentation files for the Berkeley DB library
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: %{name}-devel = %{version}-%{release}
+
+%description devel-doc
+The Berkeley Database (Berkeley DB) is a programmatic toolkit that
+provides embedded database support for both traditional and
+client/server applications. This package contains the header files,
+libraries, and documentation for building programs which use the
+Berkeley DB.
+
 %package static
 Summary: Berkeley DB static libraries
 Group: Development/Libraries
@@ -256,15 +269,18 @@ chmod u+w ${RPM_BUILD_ROOT}%{_bindir} ${RPM_BUILD_ROOT}%{_bindir}/*
 # remove unneeded .la files (#225675)
 rm -f ${RPM_BUILD_ROOT}%{_libdir}/*.la
 
-# remove C# devel files
-rm -rf docs/csharp
-
 # avoid fancy permissons
 chmod 0755 ${RPM_BUILD_ROOT}%{_libdir}/*.so
 
 # remove RPATHs
 chrpath -d ${RPM_BUILD_ROOT}%{_libdir}/*.so ${RPM_BUILD_ROOT}%{_bindir}/*
 
+# unify documentation and examples, remove stuff we don't need
+rm -rf docs/csharp
+rm -rf examples/csharp
+rm -rf docs/installation
+mv examples docs
+
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
@@ -294,12 +310,6 @@ rm -rf ${RPM_BUILD_ROOT}
 /%{_lib}/libdb-%{__soversion}.so
 %{_libdir}/libdb-%{__soversion}.so
 
-%files cxx-devel
-%defattr(-,root,root,-)
-%doc examples/cxx
-%{_libdir}/libdb_cxx.so
-%{_libdir}/libdb_cxx-%{__soversion}.so
-
 %files utils
 %defattr(-,root,root,-)
 %{_bindir}/db*_archive
@@ -318,8 +328,6 @@ rm -rf ${RPM_BUILD_ROOT}
 
 %files devel
 %defattr(-,root,root,-)
-%doc	docs/*
-%doc	examples/c
 %{_libdir}/libdb.so
 %dir %{_includedir}/%{name}
 %{_includedir}/%{name}/db.h
@@ -329,6 +337,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_includedir}/db_185.h
 %{_includedir}/db_cxx.h
 
+%files devel-doc
+%defattr(-,root,root,-)
+%doc	docs/*
+
 %files static
 %defattr(-,root,root,-)
 %{_libdir}/libdb-%{__soversion}.a
@@ -337,13 +349,17 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_libdir}/libdb_sql-%{__soversion}.a
 %{_libdir}/libdb_java-%{__soversion}.a
 
+%files cxx-devel
+%defattr(-,root,root,-)
+%{_libdir}/libdb_cxx.so
+%{_libdir}/libdb_cxx-%{__soversion}.so
+
 %files tcl-devel
 %defattr(-,root,root,-)
 %{_libdir}/libdb_tcl-%{__soversion}.so
 
 %files sql-devel
 %defattr(-,root,root,-)
-%doc examples/sql
 %{_bindir}/dbsql
 %{_libdir}/libdb_sql.so
 %{_libdir}/libdb_sql-%{__soversion}.so
@@ -351,11 +367,13 @@ rm -rf ${RPM_BUILD_ROOT}
 
 %files java-devel
 %defattr(-,root,root,-)
-%doc examples/java
 %{_libdir}/libdb_java*.so
 %{_datadir}/java/*.jar
 
 %changelog
+* Wed Jun 15 2011 Jindrich Novy <jnovy@redhat.com> 5.2.28-2
+- move development documentation to devel-doc subpackage (#705386)
+
 * Tue Jun 14 2011 Jindrich Novy <jnovy@redhat.com> 5.2.28-1
 - update to 5.2.28