diff --git a/.gitignore b/.gitignore
index 3816fb2..e3f6bf7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@ resource-agents-3.0.14.tar.bz2
 /ClusterLabs-resource-agents-e697f43.tar.gz
 /ClusterLabs-resource-agents-f6c9350.tar.gz
 /ClusterLabs-resource-agents-56782d5.tar.gz
+/ClusterLabs-resource-agents-150fb85.tar.gz
diff --git a/resource-agents.spec b/resource-agents.spec
index 6ee4e44..d4b6429 100644
--- a/resource-agents.spec
+++ b/resource-agents.spec
@@ -20,7 +20,7 @@
 #
 
 %global upstream_prefix ClusterLabs-resource-agents
-%global upstream_version 56782d5
+%global upstream_version 150fb85
 
 # SSLeay (required by ldirectord)
 %if 0%{?suse_version}
@@ -35,8 +35,8 @@
 
 Name:		resource-agents
 Summary:	Open Source HA Reusable Cluster Resource Scripts
-Version:	4.0.0
-Release:	2%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
+Version:	4.0.1
+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}
@@ -333,6 +333,9 @@ ccs_update_schema > /dev/null 2>&1 ||:
 %endif
 
 %changelog
+* Thu Feb  2 2017 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.0.1-1
+- Rebase to resource-agents 4.0.1 upstream release.
+
 * Wed Feb  1 2017 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.0.0-2
 - galera: remove "long SST monitoring" support due to corner-case issues
 
diff --git a/sources b/sources
index 69a2a11..5bba490 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ClusterLabs-resource-agents-56782d5.tar.gz) = 32bbe9529ec16f1e413461efcc62c1c6408ee91195b63bf030685d345c8c60cdf6942f3ecfbc18ead4e1b1e9f911e3bee10a2acaaf992f59c29c9b0789dff27a
+SHA512 (ClusterLabs-resource-agents-150fb85.tar.gz) = 13c81428a0a33859adb43d8736b1fdd679e1f9e99458a0a9bd2340c5ba4258630114531245910ae383af5a28652ed41b3ef01dcbca2751bfe254224f65967918