diff --git a/.cvsignore b/.cvsignore
index 7a20e67..981b159 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
 resource-agents-3.0.0.tar.gz
+3aa338887920.tar.gz
diff --git a/resource-agents.spec b/resource-agents.spec
index 6d17791..5cadc42 100644
--- a/resource-agents.spec
+++ b/resource-agents.spec
@@ -16,14 +16,21 @@
 # keep around ready for later user
 ## define 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 3aa338887920
+
 Name: resource-agents
 Summary: Open Source HA Resource Agents for Red Hat Cluster
 Version: 3.0.0
-Release: 13%{?alphatag:.%{alphatag}}%{?dist}
+Release: 14%{?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
+Source1: http://hg.linux-ha.org/agents/archive/%{altversion}.tar.gz
 
 ## Runtime deps
 Requires: bash grep sed gawk
@@ -32,51 +39,92 @@ Requires: net-tools mount e2fsprogs
 ## Setup/build bits
 
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-BuildArch: noarch
-
-# Build dependencies (sed / bash)
-# BuildRequires:
 
-%prep
-%setup -q -n resource-agents-%{version}%{?alphatag:.%{alphatag}}
+# Build dependencies
+BuildRequires: cluster-glue-libs-devel glib2-devel
+BuildRequires: automake autoconf pkgconfig
 
 # we inherit configure from cluster project. Configure it for vars we need.
 # building from source directly without those parameters will NOT work.
 # See http://www.redhat.com/archives/cluster-devel/2009-February/msg00003.html
-%build
-./configure \
+%prep
+%setup -q -n resource-agents-%{version}%{?alphatag:.%{alphatag}} -a 1
+
+# prepare rgmanager RAs
+%{_configure} \
   --sbindir=%{_sbindir} \
   --initddir=%{_sysconfdir}/rc.d/init.d \
   --libdir=%{_libdir} \
   --without_fence_agents \
   --disable_kernel_check
 
+# prepare pacemaker RAs
+cd %{altprefix}%{altversion}
+./autogen.sh
+%{_configure} \
+	CFLAGS="$(echo '%{optflags}')" \
+	--enable-fatal-warnings=no
+
+%build
 ##CFLAGS="$(echo '%{optflags}')" make %{_smp_mflags}
 # %{_smp_mflags} is broken from upstream and unrequired for this project.
 CFLAGS="$(echo '%{optflags}')" make -C rgmanager/src/resources
+cd %{altprefix}%{altversion}
+make %{_smp_mflags}
 
 %install
 rm -rf %{buildroot}
 make -C rgmanager/src/resources install DESTDIR=%{buildroot}
+make -C %{altprefix}%{altversion} install DESTDIR=%{buildroot}
+
+# tree fixup
+rm %{buildroot}/%{_libdir}/heartbeat/ocf-*
+find %{buildroot} -type f -name '.ocf-*' -exec chmod 644 {} \;
+find %{buildroot} -type f -name 'ocf-*' -exec chmod 644 {} \;
+find %{buildroot} -type f -name '*.dtd' -exec chmod 644 {} \;
+chmod 755 %{buildroot}/%{_sbindir}/ocf-tester
+chmod 755 %{buildroot}/%{_datadir}/cluster/ocf-shellfuncs
 
 %clean
 rm -rf %{buildroot}
 
 %description
-Red Hat Resource Agents provides a set of scripts to interface with several
-services to operate in a High Availability environment.
+A set of scripts to interface with several services to operate in a
+High Availability environment for both Pacemaker and rgmanager
+service managers.
 
 %files
 %defattr(-,root,root,-)
 %doc doc/COPYING.* doc/COPYRIGHT doc/README.licence
+%doc %{altprefix}%{altversion}/AUTHORS
 %{_datadir}/cluster
 
+%dir /usr/lib/ocf
+%dir /usr/lib/ocf/resource.d
+/usr/lib/ocf/resource.d/heartbeat
+%{_sbindir}/ocf-tester
+%{_sbindir}/sfex_init
+
+%dir %{_datadir}/glue
+%doc %{_datadir}/glue/ra-api-1.dtd
+
+%dir %{_libdir}/heartbeat
+%{_libdir}/heartbeat/send_arp  
+%{_libdir}/heartbeat/sfex_daemon
+
 %changelog
+* Wed Jul 29 2009 Fabio M. Di Nitto <fdinitto@redhat.com> - 3.0.0-14
+- Merge Pacemaker cluster resource agents:
+  * Add Source1.
+  * Drop noarch. We have real binaries now.
+  * Update BuildRequires.
+  * Update all relevant prep/build/install/files/description sections.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.0.0-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
 * Wed Jul  8 2009 Fabio M. Di Nitto <fdinitto@redhat.com> - 3.0.0-12
-- - spec file updates:
+- spec file updates:
   * Update copyright header
   * final release.. undefine alphatag
 
diff --git a/sources b/sources
index 64a90f7..d0084ca 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 485253db9ea4d48d38d7a0aef84cf660  resource-agents-3.0.0.tar.gz
+a05617c9fd4a765fb76e38247eb4738f  3aa338887920.tar.gz