diff --git a/pl.spec b/pl.spec
index ab59433..6971163 100644
--- a/pl.spec
+++ b/pl.spec
@@ -1,5 +1,5 @@
 %define with_java 1
-%define separate_xpce 0
+%define separate_xpce 1
 
 # Require openjdk 1.6 until bug #740762 becomes resolved.
 %define jdkvershort 1.6.0
@@ -219,13 +219,6 @@ mv $RPM_BUILD_ROOT%{_libdir}/swipl-%{version}/lib/jpl.jar \
 
 mv $RPM_BUILD_ROOT%{_libdir}/swipl-%{version}/xpce/man/xpce-client.1 \
     $RPM_BUILD_ROOT%{_mandir}/man1/
-%if %{separate_xpce}
-# Move the various include files into /usr/include
-mkdir -p $RPM_BUILD_ROOT%{_includedir}/swipl/xpce
-mv $RPM_BUILD_ROOT%{_libdir}/swipl-%{version}/include/*.h \
-        $RPM_BUILD_ROOT%{_includedir}/swipl
-rm -rf $RPM_BUILD_ROOT%{_libdir}/swipl-%{version}/include
-%endif
 
 # Clean up the other stuff that shouldn't be packaged
 find packages/jpl/examples -name "*.class" | xargs rm -f
@@ -238,7 +231,6 @@ rm $RPM_BUILD_ROOT%{_libdir}/swipl-%{version}/xpce/bin/x86_64-linux/xpce-client
 %doc customize/dotplrc
 %{_mandir}/man1/*
 %dir %{_libdir}/swipl-%{version}
-%exclude %{_libdir}/swipl-%{version}/doc
 %{_libdir}/swipl-%{version}/*
 %{_bindir}/*
 
@@ -250,26 +242,36 @@ rm $RPM_BUILD_ROOT%{_libdir}/swipl-%{version}/xpce/bin/x86_64-linux/xpce-client
 # Devel
 %exclude %{_libdir}/swipl-%{version}/lib/*/libswipl.so
 %exclude %{_libdir}/swipl-%{version}/include
+# Doc
+%exclude %{_libdir}/swipl-%{version}/doc
 # Static
 %exclude %{_libdir}/swipl-%{version}/lib/*/libswipl.a
 %if %{separate_xpce}
 # XPCE
 %exclude %{_bindir}/xpce*
-%exclude %{_libdir}/swipl-%{version}/bin/*/xpce
+#%exclude %{_libdir}/swipl-%{version}/bin/*/xpce
 %exclude %{_libdir}/swipl-%{version}/customize/dotxpcerc
-%exclude %{_libdir}/swipl-%{version}/xpce*
+%exclude %{_libdir}/swipl-%{version}/lib/*-linux/pl2xpce.so
 %exclude %{_libdir}/swipl-%{version}/library/http/xpce_httpd.pl
+%exclude %{_libdir}/swipl-%{version}/Makefile
+%exclude %{_libdir}/swipl-%{version}/swipl.rc
+%exclude %{_libdir}/swipl-%{version}/xpce
+%exclude %{_mandir}/man1/xpce-client.1*
 %endif
 
 %if %{separate_xpce}
 %files xpce
-%doc %[docdir-xpce}/*
 %doc customize/dotxpcerc
+#%{_includedir}/swipl/xpce
 %{_bindir}/xpce*
-%{_includedir}/swipl/xpce
-%{_libdir}/swipl-%{version}/bin/*/xpce
-%{_libdir}/swipl-%{version}/xpce*
+#%{_libdir}/swipl-%{version}/bin/*/xpce
+%{_libdir}/swipl-%{version}/customize/dotxpcerc
+%{_libdir}/swipl-%{version}/lib/*-linux/pl2xpce.so
 %{_libdir}/swipl-%{version}/library/http/xpce_httpd.pl
+%{_libdir}/swipl-%{version}/Makefile
+%{_libdir}/swipl-%{version}/swipl.rc
+%{_libdir}/swipl-%{version}/xpce
+%{_mandir}/man1/xpce-client.1*
 %endif
 
 %files devel
@@ -302,6 +304,7 @@ rm $RPM_BUILD_ROOT%{_libdir}/swipl-%{version}/xpce/bin/x86_64-linux/xpce-client
   locate standard library
 - xpce is run as swipl now
 - Move documentation into separate sub-package
+- Move XPCE into separate sub-package
 
 * Thu Mar 01 2012 Petr Pisar <ppisar@redhat.com> - 6.0.1-1
 - 6.0.1 bump