diff --git a/cockpit.spec b/cockpit.spec
index c1d8b13..9b8fcb3 100644
--- a/cockpit.spec
+++ b/cockpit.spec
@@ -7,7 +7,7 @@
 %define extra_flags CFLAGS='-O2 -Wall -Werror'
 %define selinux 1
 %endif
-%if 0%{?fedora} <= 21
+%if 0%{?fedora} > 0 && 0%{?fedora} <= 21
 %define selinux 1
 %endif
 %if 0%{?rhel}
@@ -18,7 +18,7 @@ Name:           cockpit
 %if %{defined gitcommit}
 Version:        %{gitcommit}
 %else
-Version:        0.39
+Version:        0.40
 %endif
 Release:        1%{?dist}
 Summary:        A user interface for Linux servers
@@ -70,7 +70,7 @@ BuildRequires: sed
 %endif
 
 # For documentation
-BuildRequires: /usr/bin/xmlto
+BuildRequires: xmlto
 
 Requires: %{name}-bridge = %{version}-%{release}
 Requires: %{name}-daemon = %{version}-%{release}
@@ -115,11 +115,18 @@ The Cockpit Deployment and Developer Guide shows sysadmins how to
 deploy Cockpit on their machines as well as helps developers who want to
 embed or extend Cockpit.
 
+%package pcp
+Summary: Cockpit PCP integration
+Requires: %{name}-bridge = %{version}-%{release}
+Requires: pcp
+
+%description pcp
+Cockpit support for reading PCP metrics and loading PCP archives.
+
 %package shell
 Summary: Cockpit Shell user interface package
 Requires: %{name}-bridge = %{version}-%{release}
 Requires: NetworkManager
-Requires: pcp
 Requires: grep
 Obsoletes: %{name}-assets
 BuildArch: noarch
@@ -180,6 +187,7 @@ rm -rf %{buildroot}/%{_datadir}/%{name}/docker
 %{_docdir}/%{name}/AUTHORS
 %{_docdir}/%{name}/COPYING
 %{_docdir}/%{name}/README.md
+%dir %{_datadir}/%{name}
 %{_datadir}/appdata
 %{_datadir}/applications
 %{_datadir}/pixmaps
@@ -196,18 +204,24 @@ rm -rf %{buildroot}/%{_datadir}/%{name}/docker
 %{_libexecdir}/cockpitd
 
 %files doc
+%exclude %{_docdir}/%{name}/AUTHORS
+%exclude %{_docdir}/%{name}/COPYING
+%exclude %{_docdir}/%{name}/README.md
 %{_docdir}/%{name}
 
+%files pcp
+%{_libexecdir}/cockpit-pcp
+
+%post pcp
+# HACK - https://bugzilla.redhat.com/show_bug.cgi?id=1185749
+( cd /var/lib/pcp/pmns && ./Rebuild -du )
+
 %files shell
 %{_datadir}/%{name}/base
 %{_datadir}/%{name}/shell
 %{_datadir}/%{name}/playground
 %{_datadir}/%{name}/server-systemd
 
-%post shell
-# HACK - https://bugzilla.redhat.com/show_bug.cgi?id=1185749
-( cd /var/lib/pcp/pmns && ./Rebuild -du )
-
 %files ws
 %doc %{_mandir}/man5/cockpit.conf.5.gz
 %doc %{_mandir}/man8/cockpit-ws.8.gz
@@ -309,6 +323,9 @@ fi
 %endif
 
 %changelog
+* Thu Feb 26 2015 Stef Walter <stefw@redhat.com> - 0.40-1
+- Update to 0.40 release
+
 * Thu Feb 19 2015 Stef Walter <stefw@redhat.com> - 0.39-1
 - Update to 0.39 release
 
diff --git a/sources b/sources
index 2e19ab6..62478a0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-60aaa688383fb0bd583fc6dafd993f22  cockpit-0.39.tar.bz2
+b4d116d0a05ad1f075c50273e23c1393  cockpit-0.40.tar.bz2