diff --git a/.gitignore b/.gitignore
index 609a3be..bc5b858 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@ resource-agents-3.0.14.tar.bz2
 /ClusterLabs-resource-agents-1e3e9db.tar.gz
 /ClusterLabs-resource-agents-f79322c.tar.gz
 /ClusterLabs-resource-agents-e697f43.tar.gz
+/ClusterLabs-resource-agents-f6c9350.tar.gz
diff --git a/resource-agents.spec b/resource-agents.spec
index 14e7990..e06a60c 100644
--- a/resource-agents.spec
+++ b/resource-agents.spec
@@ -20,7 +20,7 @@
 #
 
 %global upstream_prefix ClusterLabs-resource-agents
-%global upstream_version e697f43
+%global upstream_version f6c9350
 
 # SSLeay (required by ldirectord)
 %if 0%{?suse_version}
@@ -35,8 +35,8 @@
 
 Name:		resource-agents
 Summary:	Open Source HA Reusable Cluster Resource Scripts
-Version:	3.9.7
-Release:	6%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
+Version:	4.0.0
+Release:	1%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
 License:	GPLv2+ and LGPLv2+
 URL:		https://github.com/ClusterLabs/resource-agents
 %if 0%{?fedora} || 0%{?centos_version} || 0%{?rhel}
@@ -227,6 +227,7 @@ rm -rf %{buildroot}
 %if %{with linuxha}
 %doc doc/README.webapps
 %doc %{_datadir}/%{name}/ra-api-1.dtd
+%doc %{_datadir}/%{name}/metadata.rng
 %endif
 
 %if %{with rgmanager}
@@ -331,6 +332,9 @@ ccs_update_schema > /dev/null 2>&1 ||:
 %endif
 
 %changelog
+* Tue Jan 31 2017 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.0.0-1
+- Rebase to resource-agents 4.0.0 upstream release.
+
 * Thu Dec 15 2016 Oyvind Albrigtsen <oalbrigt@redhat.com> - 3.9.7-6
 - Add netstat dependency
 
diff --git a/sources b/sources
index 8b82582..a7abd2a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-778730910eb4b243dc9ff3fa618cf148  ClusterLabs-resource-agents-e697f43.tar.gz
+SHA512 (ClusterLabs-resource-agents-f6c9350.tar.gz) = e5899be117d82e7e5356dd853dcc6ca2ffd844d477af65f995c1b85fad4dea858dddc37f3eb1eab6ed1df5db1e7d1910617d88c73667ea0fbba02fff9391f3f1