diff --git a/.cvsignore b/.cvsignore
index 5152868..3eef4b5 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-bc00c0b065d9.tar.bz2
-resource-agents-3.0.6.tar.gz
+c76b4a6eb576.tar.bz2
+resource-agents-3.0.7.tar.gz
diff --git a/resource-agents.spec b/resource-agents.spec
index aa39498..bd5c2ea 100644
--- a/resource-agents.spec
+++ b/resource-agents.spec
@@ -17,12 +17,12 @@
 # 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 bc00c0b065d9
+%global altversion c76b4a6eb576
 
 Name: resource-agents
 Summary: Open Source HA Resource Agents for Red Hat Cluster
-Version: 3.0.6
-Release: 1%{?alphatag:.%{alphatag}}%{?dist}
+Version: 3.0.7
+Release: 2%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
 URL: http://sources.redhat.com/cluster/wiki/
@@ -40,6 +40,7 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires: cluster-glue-libs-devel glib2-devel
 BuildRequires: automake autoconf pkgconfig
 BuildRequires: libxslt docbook-style-xsl
+BuildRequires: python
 
 %description
 A set of scripts to interface with several services to operate in a
@@ -109,6 +110,10 @@ find %{buildroot} -type f -name '*.dtd' -exec chmod 644 {} \;
 chmod 755 %{buildroot}/%{_sbindir}/ocf-tester
 chmod 755 %{buildroot}/%{_datadir}/cluster/ocf-shellfuncs
 
+# symlink to allow pacemaker to use rgmanager RAs
+cd %{buildroot}/usr/lib/ocf/resource.d/ && \
+ ln -sf %{_datadir}/cluster/ redhat
+
 %clean
 rm -rf %{buildroot}
 
@@ -129,6 +134,7 @@ rm -rf %{buildroot}
 %dir /usr/lib/ocf
 %dir /usr/lib/ocf/resource.d
 /usr/lib/ocf/resource.d/heartbeat
+/usr/lib/ocf/resource.d/redhat
 %{_sbindir}/ocf-tester
 %{_sbindir}/sfex_init
 
@@ -156,6 +162,22 @@ rm -rf %{buildroot}
 /usr/lib/ocf/resource.d/heartbeat/ldirectord
 
 %changelog
+* Fri Jan 15 2010 Fabio M. Di Nitto <fdinitto@redhat.com> - 3.0.7-2
+- Add python as BuildRequires
+
+* Mon Jan 11 2010 Fabio M. Di Nitto <fdinitto@redhat.com> - 3.0.7-1
+- New rgmanager resource agents upstream release
+  Resolves: rhbz#526286, rhbz#533461
+
+* Mon Jan 11 2010 Andrew Beekhof <andrew@beekhof.net> - 3.0.6-2
+- Update Pacameker agents to upstream version: c76b4a6eb576
+  + High: RA: VirtualDomain: fix forceful stop (LF 2283)
+  + High: apache: monitor operation of depth 10 for web applications (LF 2234)
+  + Medium: IPaddr2: CLUSTERIP/iptables rule not always inserted on failed monitor (LF 2281)
+  + Medium: RA: Route: improve validate (LF 2232)
+  + Medium: mark obsolete RAs as deprecated (LF 2244)
+  + Medium: mysql: escalate stop to KILL if regular shutdown doesn't work
+
 * Mon Dec 7 2009 Fabio M. Di Nitto <fdinitto@redhat.com> - 3.0.6-1
 - New rgmanager resource agents upstream release
 - spec file update:
@@ -186,6 +208,7 @@ rm -rf %{buildroot}
 
 * Fri Nov 20 2009 Fabio M. Di Nitto <fdinitto@redhat.com> - 3.0.5-1
 - New rgmanager resource agents upstream release
+- Allow pacemaker to use rgmanager resource agents
 
 * Wed Oct 28 2009 Andrew Beekhof <andrew@beekhof.net> - 3.0.4-2
 - Update Pacameker agents to upstream version: e2338892f59f
diff --git a/sources b/sources
index f6101eb..d9f7dc5 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-8c659c6c25cf7f29eae98e22b00d388f  bc00c0b065d9.tar.bz2
-12e059b8d7b1a05a161161bb9662b38b  resource-agents-3.0.6.tar.gz
+560e687fa108dbe90e4fae0772ea6e66  c76b4a6eb576.tar.bz2
+497d03f8ff8f48c76cdec9e3e469b077  resource-agents-3.0.7.tar.gz