diff --git a/.cvsignore b/.cvsignore
index 24c5fef..5bcdd0e 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
 0daab7da36a8.tar.bz2
+dso.patch
diff --git a/heartbeat-3.0.0-haresources.patch b/heartbeat-3.0.0-haresources.patch
new file mode 100644
index 0000000..8e45c4a
--- /dev/null
+++ b/heartbeat-3.0.0-haresources.patch
@@ -0,0 +1,11 @@
+diff -Nur Linux-HA-Dev-0daab7da36a8.orig/heartbeat/init.d/heartbeat.in Linux-HA-Dev-0daab7da36a8/heartbeat/init.d/heartbeat.in
+--- Linux-HA-Dev-0daab7da36a8.orig/heartbeat/init.d/heartbeat.in	2009-08-18 15:54:56.000000000 -0600
++++ Linux-HA-Dev-0daab7da36a8/heartbeat/init.d/heartbeat.in	2010-04-30 13:34:36.000000000 -0600
+@@ -49,6 +49,7 @@
+ HA_DIR=@sysconfdir@/ha.d; export HA_DIR
+ CONFIG=$HA_DIR/ha.cf
+ . $HA_DIR/shellfuncs
++HA_NOARCHBIN=@HA_NOARCHDATAHBDIR@
+ 
+ LOCKDIR=@localstatedir@/lock/subsys
+ RUNDIR=@localstatedir@/run
diff --git a/heartbeat.spec b/heartbeat.spec
index 5e7a19f..e894b6e 100644
--- a/heartbeat.spec
+++ b/heartbeat.spec
@@ -2,7 +2,7 @@
 # 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 "Linux-HA-Dev-" -r $upstreamversion $upstreamversion.tar.gz
-%global specversion 5
+%global specversion 7
 %global upstreamprefix Linux-HA-Dev-
 %global upstreamversion 0daab7da36a8
 
@@ -20,6 +20,8 @@ License:          GPLv2 and LGPLv2+
 URL:              http://linux-ha.org/
 Group:            System Environment/Daemons
 Source0:          http://hg.linux-ha.org/dev/archive/%{upstreamversion}.tar.bz2
+Patch1:		  dso.patch
+Patch2:           heartbeat-3.0.0-haresources.patch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 BuildRequires:    glib2-devel
 BuildRequires:    iputils
@@ -87,6 +89,8 @@ Headers and shared libraries for writing programs for Heartbeat
 
 %prep
 %setup -q -n %{upstreamprefix}%{upstreamversion}
+%patch1 -p0 
+%patch2 -p1 
 
 %build
 ./bootstrap
@@ -176,6 +180,12 @@ fi
 %{_libdir}/*.so
 
 %changelog
+* Fri Apr 30 2010 Kevin Fenzi <kevin@tummy.com> - 3.0.0-0.7.0daab7da36a8.hg
+- Add patch to fix haresource based clusters - fixes #576608
+
+* Mon Feb 22 2010 Andrew Beekhof <andrew@beekhof.net> - 3.0.0-0.6.0daab7da36a8.hg
+- Correctly link to all required libraries when building
+
 * Thu Oct 15 2009 Andrew Beekhof <andrew@beekhof.net> - 3.0.0-0.5.0daab7da36a8.hg
 - Resolve file conflict, shellfuncs is provided by resource-agents
 
diff --git a/sources b/sources
index 6e2f616..1cb9905 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 278681d62d2c39b1748ac0eb8ae234d8  0daab7da36a8.tar.bz2
+8adb6c5433e1d5acf454f8c894afcd82  dso.patch