diff --git a/.cvsignore b/.cvsignore
index de7eeb9..d985938 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-agents-1.0.3.tar.bz2
 resource-agents-3.0.11.tar.bz2
+a7c0f35916bf.tar.bz2
diff --git a/resource-agents.spec b/resource-agents.spec
index b8a8f55..1f08928 100644
--- a/resource-agents.spec
+++ b/resource-agents.spec
@@ -17,7 +17,7 @@
 # Invoking 'hg archive' wont but you can add one with:
 #  hg archive -t tgz -p "Cluster-Resource-Agents-" -r $altversion $altversion.tar.gz
 %global altprefix Cluster-Resource-Agents-
-%global altversion agents-1.0.3
+%global altversion a7c0f35916bf
 
 Name: resource-agents
 Summary: Open Source HA Resource Agents for Red Hat Cluster
@@ -108,7 +108,7 @@ and works with the heartbeat code (http://www.linux-ha.org/).
 # prepare pacemaker RAs
 cd %{altprefix}%{altversion}
 ./autogen.sh
-%{configure} --enable-fatal-warnings=no
+%{configure} --enable-fatal-warnings=no --with-rsctmpdir=%{_var}/run/heartbeat/rsctmp
 
 %build
 ##CFLAGS="$(echo '%{optflags}')" make %{_smp_mflags}
@@ -175,6 +175,7 @@ rm -rf %{buildroot}
 %{_libdir}/heartbeat/findif
 %{_libdir}/heartbeat/send_arp  
 %{_libdir}/heartbeat/sfex_daemon
+%{_includedir}/heartbeat/agent_config.h
 
 %files -n ldirectord
 %defattr(-,root,root,-)
@@ -188,6 +189,19 @@ rm -rf %{buildroot}
 /usr/lib/ocf/resource.d/heartbeat/ldirectord
 
 %changelog
+* Sat May 10 2010 Andrew Beekhof <andrew@beekhof.net> - 3.0.11-2
+- New pacemaker agents upstream release: a7c0f35916bf
+  + High: pgsql: properly implement pghost parameter
+  + High: RA: mysql: fix syntax error
+  + High: SAPInstance RA: do not rely on op target rc when monitoring clones (lf#2371)
+  + High: set the HA_RSCTMP directory to /var/run/resource-agents (lf#2378)
+  + Medium: IPaddr/IPaddr2: add a description of the assumption in meta-data
+  + Medium: IPaddr: return the correct code if interface delete failed
+  + Medium: nfsserver: rpc.statd as the notify cmd does not work with -v (thanks to Carl Lewis)
+  + Medium: oracle: reduce output from sqlplus to the last line for queries (bnc#567815)
+  + Medium: pgsql: implement "config" parameter
+  + Medium: RA: iSCSITarget: follow changed IET access policy
+
 * Wed Apr 21 2010 Fabio M. Di Nitto <fdinitto@redhat.com> - 3.0.11-1
 - new upstream release
   Resolves: rhbz#583945, rhbz#581047, rhbz#576330, rhbz#583017
diff --git a/sources b/sources
index bfe3843..24dad6c 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-fcaa2cfd83a28d1965200e11db2ddd41  agents-1.0.3.tar.bz2
 f9309dd40707f33c301d0e1fd095ee2b  resource-agents-3.0.11.tar.bz2
+47b99d289954bd9e3da382c8919f9386  a7c0f35916bf.tar.bz2