diff --git a/atkmm.spec b/atkmm.spec
index 1931f98..65b2655 100644
--- a/atkmm.spec
+++ b/atkmm.spec
@@ -4,7 +4,7 @@
 
 Name:           atkmm
 Version:        2.22.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        C++ interface for the ATK library
 
 Group:          System Environment/Libraries
@@ -39,13 +39,28 @@ The %{name}-devel package contains libraries and header files for
 developing applications that use %{name}.
 
 
+%package          doc
+Summary:          Developer's documentation for the atkmm library
+Group:            Documentation
+BuildArch:        noarch
+Requires:         libsigc++20-doc
+Requires:         glibmm24-doc
+
+%description      doc
+This package contains developer's documentation for the atkmm
+library. Pangomm is the C++ API for the ATK accessibility toolkit library.
+
+The documentation can be viewed either through the devhelp
+documentation browser or through a web browser.
+
+
 %prep
 %setup -q
 
 
 %build
 %configure --disable-static
-make %{?_smp_mflags}
+make %{?_smp_mfla gs}
 
 
 %install
@@ -53,14 +68,6 @@ rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
-# Fix documentation installation, put everything under gtk-doc and fix
-# relative paths.
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/atkmm-%{apiver}
-mv $RPM_BUILD_ROOT%{_docdir}/atkmm-%{apiver}/* $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/atkmm-%{apiver}/
-mv $RPM_BUILD_ROOT%{_datadir}/devhelp/books/atkmm-%{apiver}/*.devhelp2 $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/atkmm-%{apiver}
-# Fix broken devhelp base tag
-sed -i 's:base="[^\"]*":base="/usr/share/gtk-doc/html/atkmm-%{apiver}/reference/html":' $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/atkmm-%{apiver}/*.devhelp2
-
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -83,10 +90,20 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*.pc
 %{_libdir}/atkmm-%{apiver}/
-%{_datadir}/gtk-doc/
+
+
+%files doc
+%defattr(-, root, root, -)
+%doc %{_docdir}/%{name}-%{apiver}/*
+%{_datadir}/devhelp/
 
 
 %changelog
+* Mon Feb 21 2011 Haïkel Guémar <hguemar@fedoraproject.org> - 2.22.2-3
+- split doc into subpackage
+- fix documentation location
+- co-own /usr/share/devhelp
+
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.22.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild