diff --git a/libdb.spec b/libdb.spec
index 7901032..aebb8ea 100644
--- a/libdb.spec
+++ b/libdb.spec
@@ -4,7 +4,7 @@
 Summary: The Berkeley DB database library for C
 Name: libdb
 Version: 5.3.15
-Release: 4%{?dist}
+Release: 5%{?dist}
 Source0: http://download.oracle.com/berkeley-db/db-%{version}.tar.gz
 Source1: http://download.oracle.com/berkeley-db/db.1.85.tar.gz
 Patch0: libdb-multiarch.patch
@@ -107,6 +107,7 @@ be installed on all systems.
 Summary: The Berkeley DB database library for C++
 Group: System Environment/Libraries
 Requires: %{name}-cxx%{?_isa} = %{version}-%{release}
+Requires: %{name}-devel%{?_isa} = %{version}-%{release}
 
 %description cxx-devel
 The Berkeley Database (Berkeley DB) is a programmatic toolkit that
@@ -323,10 +324,8 @@ rm -rf ${RPM_BUILD_ROOT}
 %dir %{_includedir}/%{name}
 %{_includedir}/%{name}/db.h
 %{_includedir}/%{name}/db_185.h
-%{_includedir}/%{name}/db_cxx.h
 %{_includedir}/db.h
 %{_includedir}/db_185.h
-%{_includedir}/db_cxx.h
 
 %files devel-doc
 %defattr(-,root,root,-)
@@ -363,6 +362,8 @@ rm -rf ${RPM_BUILD_ROOT}
 
 %files cxx-devel
 %defattr(-,root,root,-)
+%{_includedir}/%{name}/db_cxx.h
+%{_includedir}/db_cxx.h
 %{_libdir}/libdb_cxx.so
 
 %files tcl
@@ -395,6 +396,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_libdir}/libdb_java.so
 
 %changelog
+* Tue Jul  3 2012 Jindrich Novy <jnovy@redhat.com> 5.3.15-5
+- move C++ header files to cxx-devel
+
 * Tue Jul  3 2012 Jindrich Novy <jnovy@redhat.com> 5.3.15-4
 - fix -devel packages dependencies yet more (#832225)