diff --git a/libcanberra.spec b/libcanberra.spec
index 784bf3c..c150d32 100644
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@ -1,12 +1,11 @@
 Name: libcanberra
 Version: 0.25
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Portable Sound Event Library
 Group: System Environment/Libraries
 Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.gz
 License: LGPLv2+
 Url: http://git.0pointer.de/?p=libcanberra.git;a=summary
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gtk2-devel
 BuildRequires: gtk3-devel
 BuildRequires: alsa-lib-devel
@@ -51,8 +50,6 @@ Gtk+ 3.x bindings for libcanberra
 Summary: Development Files for libcanberra Client Development
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: pkgconfig
-Requires: gtk-doc
 Requires: gtk2-devel
 
 %description devel
@@ -86,15 +83,11 @@ Development Files for libcanberra Client Development
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make DESTDIR=$RPM_BUILD_ROOT install
 find $RPM_BUILD_ROOT \( -name *.a -o -name *.la \) -exec rm {} \;
 rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
 %defattr(-,root,root)
 %doc README LGPL
@@ -128,7 +121,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(-,root,root)
-%doc %{_datadir}/gtk-doc/html/libcanberra
+%doc %{_datadir}/gtk-doc
 %{_includedir}/canberra-gtk.h
 %{_includedir}/canberra.h
 %{_libdir}/libcanberra-gtk.so
@@ -144,6 +137,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/vala/vapi/libcanberra.vapi
 
 %changelog
+* Mon Aug 23 2010 Matthias Clasen <mclasen@redhat.com> 0.25-3
+- Co-own /usr/share/gtk-doc (#604379)
+
 * Mon Jun 28 2010 Matthias Clasen <mclasen@redhat.com> 0.25-2
 - Rebuild