diff --git a/.cvsignore b/.cvsignore
index 38fec36..5152868 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
 bc00c0b065d9.tar.bz2
-resource-agents-3.0.5.tar.gz
+resource-agents-3.0.6.tar.gz
diff --git a/resource-agents.spec b/resource-agents.spec
index c4c68da..aa39498 100644
--- a/resource-agents.spec
+++ b/resource-agents.spec
@@ -10,26 +10,23 @@
 ###############################################################################
 ###############################################################################
 
-# main (empty) package
-# http://www.rpm.org/max-rpm/s1-rpm-subpack-spec-file-changes.html
-
 # keep around ready for later user
-## define alphatag rc4
+## global alphatag rc4
 
 # When downloading directly from Mercurial, it will automatically add this prefix
 # Invoking 'hg archive' wont but you can add one with:
 #  hg archive -t tgz -p "Cluster-Resource-Agents-" -r $altversion $altversion.tar.gz
-%define altprefix Cluster-Resource-Agents-
-%define altversion bc00c0b065d9
+%global altprefix Cluster-Resource-Agents-
+%global altversion bc00c0b065d9
 
 Name: resource-agents
 Summary: Open Source HA Resource Agents for Red Hat Cluster
-Version: 3.0.5
-Release: 2%{?alphatag:.%{alphatag}}%{?dist}
+Version: 3.0.6
+Release: 1%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
 URL: http://sources.redhat.com/cluster/wiki/
-Source0: ftp://sources.redhat.com/pub/cluster/releases/resource-agents-%{version}%{?alphatag:.%{alphatag}}.tar.gz
+Source0: https://fedorahosted.org/releases/c/l/cluster/%{name}-%{version}.tar.gz
 Source1: http://hg.linux-ha.org/agents/archive/%{altversion}.tar.bz2
 
 ## Runtime deps
@@ -37,13 +34,12 @@ Requires: bash grep sed gawk
 Requires: net-tools mount e2fsprogs
 
 ## Setup/build bits
-BuildRequires: libxslt docbook-style-xsl
-
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 # Build dependencies
 BuildRequires: cluster-glue-libs-devel glib2-devel
 BuildRequires: automake autoconf pkgconfig
+BuildRequires: libxslt docbook-style-xsl
 
 %description
 A set of scripts to interface with several services to operate in a
@@ -78,7 +74,7 @@ and works with the heartbeat code (http://www.linux-ha.org/).
 # building from source directly without those parameters will NOT work.
 # See http://www.redhat.com/archives/cluster-devel/2009-February/msg00003.html
 %prep
-%setup -q -n resource-agents-%{version}%{?alphatag:.%{alphatag}} -a 1
+%setup -q -n %{name}-%{version} -a 1
 
 # prepare rgmanager RAs
 %{_configure} \
@@ -160,6 +156,13 @@ rm -rf %{buildroot}
 /usr/lib/ocf/resource.d/heartbeat/ldirectord
 
 %changelog
+* Mon Dec 7 2009 Fabio M. Di Nitto <fdinitto@redhat.com> - 3.0.6-1
+- New rgmanager resource agents upstream release
+- spec file update:
+  * use global instead of define
+  * use new Source0 url
+  * use %name macro more aggressively
+
 * Mon Dec 7 2009 Andrew Beekhof <andrew@beekhof.net> - 3.0.5-2
 - Update Pacameker agents to upstream version: bc00c0b065d9
   + High: RA: introduce OCF_FUNCTIONS_DIR, allow it to be overridden (LF2239)
diff --git a/sources b/sources
index 383c404..f6101eb 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 8c659c6c25cf7f29eae98e22b00d388f  bc00c0b065d9.tar.bz2
-a7577975345b865dc73ec0b1c0bd24f7  resource-agents-3.0.5.tar.gz
+12e059b8d7b1a05a161161bb9662b38b  resource-agents-3.0.6.tar.gz