diff --git a/kdelibs.spec b/kdelibs.spec
index 8ad84b5..ec47ff8 100644
--- a/kdelibs.spec
+++ b/kdelibs.spec
@@ -2,7 +2,7 @@
Summary: K Desktop Environment 4 - Libraries
Version: 4.1.0
-Release: 1%{?dist}.1
+Release: 2%{?dist}
%if 0%{?fedora} > 8
Name: kdelibs
@@ -266,6 +266,11 @@ popd
install -p -m 644 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/profile.d/kde4.sh
install -p -m 644 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d/kde4.csh
+# fix Sonnet documentation multilib conflict
+bunzip2 %{buildroot}%{_kde4_docdir}/HTML/en/sonnet/index.cache.bz2
+sed -i -e 's!!!g' %{buildroot}%{_kde4_docdir}/HTML/en/sonnet/index.cache
+bzip2 -9 %{buildroot}%{_kde4_docdir}/HTML/en/sonnet/index.cache
+
# install apidocs and generator script
install -p -D doc/api/doxygen.sh %{buildroot}%{_kde4_bindir}/kde4-doxygen.sh
%endif
@@ -312,6 +317,7 @@ rm -rf %{buildroot}
%{_kde4_sharedir}/kde4/services/*
%{_kde4_sharedir}/kde4/servicetypes/*
%{_kde4_sharedir}/icons/hicolor/*/actions/presence_*
+%{_kde4_docdir}/HTML/en/sonnet/
%{_kde4_libdir}/lib*.so.*
%{_kde4_libdir}/libkdeinit4_*.so
%dir %{_kde4_libdir}/kde4/
@@ -338,7 +344,6 @@ rm -rf %{buildroot}
%{_kde4_docdir}/HTML/en/common/
%{_kde4_datadir}/locale/all_languages/
%endif
-%{_kde4_docdir}/HTML/en/sonnet/
%files devel
%defattr(-,root,root,-)
@@ -361,8 +366,9 @@ rm -rf %{buildroot}
%changelog
-* Thu Jul 24 2008 Kevin Kofler 4.1.0-1.1
-- fix file list for build as kdelibs4 (no -common split)
+* Thu Jul 24 2008 Kevin Kofler 4.1.0-2
+- move Sonnet documentation back to the main package
+- fix #453063 (Sonnet documentation multilib conflict) properly
* Wed Jul 23 2008 Than Ngo 4.1.0-1
- 4.1.0