diff --git a/pl.spec b/pl.spec
index 2264848..988012a 100644
--- a/pl.spec
+++ b/pl.spec
@@ -86,6 +86,17 @@ Requires: readline-devel, pkgconfig
 Development files for SWI Prolog.
 
 
+%package doc
+Summary: Documentation for SWI Prolog
+Group: Documentation
+# This must be archicture dependend because some files live in %%{_libdir}
+# because they can are used by built-in documentation system.
+Requires: %{name} = %{version}-%{release}
+
+%description doc
+%{summary}.
+
+
 %package static
 Summary: Static library for SWI Prolog
 Group: Development/Languages
@@ -215,7 +226,6 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/swipl-%{version}/include
 %endif
 
 # Clean up the other stuff that shouldn't be packaged
-rm -rf $RPM_BUILD_ROOT%{_libdir}/swipl-%{version}/doc
 find packages/jpl/examples -name "*.class" | xargs rm -f
 find packages/jpl/examples -name ".cvsignore" | xargs rm -f
 
@@ -223,14 +233,11 @@ find packages/jpl/examples -name ".cvsignore" | xargs rm -f
 %files
 %doc ReleaseNotes/relnotes-5.10 README COPYING VERSION
 %doc customize/dotplrc
-%doc %{docdir}/*
 %{_mandir}/man1/*
 %dir %{_libdir}/swipl-%{version}
+%exclude %{_libdir}/swipl-%{version}/doc
 %{_libdir}/swipl-%{version}/*
 %{_bindir}/*
-%if ! %{separate_xpce}
-%doc %{docdir}-xpce/*
-%endif
 
 # Exclude the files that are in the sub-packages
 %if %{with_java}
@@ -267,6 +274,11 @@ find packages/jpl/examples -name ".cvsignore" | xargs rm -f
 %{_libdir}/swipl-%{version}/lib/*/libswipl.so
 %{_libdir}/pkgconfig/swipl.pc
 
+%files doc
+%{_libdir}/swipl-%{version}/doc
+%doc %{docdir}/*
+%doc %{docdir}-xpce/*
+
 %files static
 %{_libdir}/swipl-%{version}/lib/*/libswipl.a
 
@@ -286,6 +298,7 @@ find packages/jpl/examples -name ".cvsignore" | xargs rm -f
 - Keep executables as symlinks because interpreter uses the symlink value to
   locate standard library
 - xpce is run as swipl now
+- Move documentation into separate sub-package
 
 * Thu Mar 01 2012 Petr Pisar <ppisar@redhat.com> - 6.0.1-1
 - 6.0.1 bump