diff --git a/.gitignore b/.gitignore
index 5b1de52..789c00d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@ resource-agents-3.0.14.tar.bz2
 /ClusterLabs-resource-agents-5434e96.tar.gz
 /ClusterLabs-resource-agents-614b55f.tar.gz
 /ClusterLabs-resource-agents-39c1f6e.tar.gz
+/ClusterLabs-resource-agents-1e3e9db.tar.gz
diff --git a/resource-agents.spec b/resource-agents.spec
index bc076d3..153df64 100644
--- a/resource-agents.spec
+++ b/resource-agents.spec
@@ -20,7 +20,7 @@
 #
 
 %global upstream_prefix ClusterLabs-resource-agents
-%global upstream_version 39c1f6e
+%global upstream_version 1e3e9db
 
 # 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.5
-Release:	12%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}.2
+Version:	3.9.6
+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}
@@ -300,6 +300,9 @@ ccs_update_schema > /dev/null 2>&1 ||:
 %endif
 
 %changelog
+* Fri Feb 13 2015 David Vossel <dvossel@redhat.com> - 3.9.6-1
+- Rebase to resource-agents 3.9.6 upstream release.
+
 * Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.9.5-12.2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 
diff --git a/sources b/sources
index b6b7a0c..9d69fb9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0db69fa8abfdba2cbc0fa835056ef6de  ClusterLabs-resource-agents-39c1f6e.tar.gz
+4320bfe86ce811364fb5f1537d42b866  ClusterLabs-resource-agents-1e3e9db.tar.gz