diff --git a/Botan.changes b/Botan.changes
index bd197d1..84ec2fe 100644
--- a/Botan.changes
+++ b/Botan.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Mon Jul  4 17:14:21 CEST 2011 - pth@suse.de
+
+- Make package own its docdir.
+
+-------------------------------------------------------------------
+Thu Jun 23 14:43:48 CEST 2011 - dmueller@suse.de
+
+- rename the devel package back to libbotan-devel as the main
+  package allows to build only one -devel package
+
 -------------------------------------------------------------------
 Wed Jun 22 16:10:32 CEST 2011 - pth@suse.de
 
diff --git a/Botan.spec b/Botan.spec
index 947d4ba..1fc7635 100644
--- a/Botan.spec
+++ b/Botan.spec
@@ -73,19 +73,18 @@ Authors:
 --------
     Jack Lloyd <lloyd@randombit.net>
 
-%package        %{short_version}-devel
-
+%package        -n libbotan-devel
 License:        BSD3c
 Summary:        Development files for Botan
 Group:          Development/Libraries/C and C++
 Requires:       gmp-devel libbz2-devel
-Provides:       Botan-devel = %{version}, libbotan-devel = %{version}
-Obsoletes:      Botan-devel < %{version}, libbotan-devel < %{version}
+Provides:       Botan-devel = %{version}
+Obsoletes:      Botan-devel < %{version}
 Requires:       libbotan-%{version_suffix} = %{version}
 
 %define botan_docdir %{_datadir}/doc/packages/%{name}-%{version}
 
-%description    %{short_version}-devel
+%description    -n libbotan-devel
 This package contains the header files and libraries needed to develop
 programs that use the Botan library.
 
@@ -130,10 +129,10 @@ rm -f %{buildroot}/%{_libdir}/libbotan*.a
 %files -n libbotan-%{version_suffix}
 %defattr(-,root,root)
 %docdir %{botan_docdir}
-%{botan_docdir}/*
+%{botan_docdir}
 %{_libdir}/libbotan-%{short_version}.so.*
 
-%files %{short_version}-devel
+%files -n libbotan-devel
 %defattr(-,root,root)
 %{_libdir}/libbotan-%{short_version}.so
 %{_libdir}/pkgconfig/botan-%{short_version}.pc