diff --git a/package/clifford/heartbeat/heartbeat.desc b/package/clifford/heartbeat/heartbeat.desc
index e62068ecd..995fca7a2 100644
--- a/package/clifford/heartbeat/heartbeat.desc
+++ b/package/clifford/heartbeat/heartbeat.desc
@@ -37,8 +37,8 @@
 
 [L] GPL
 [S] Stable
-[V] 2.0.2
+[V] 2.0.4
 [P] X -----5---9 133.200
 
-[D] 447556234 heartbeat-2.0.2.tar.gz http://linux-ha.org/download/index.html
+[D] 3715834972 heartbeat-2.0.4.tar.gz http://linux-ha.org/download/index.html
 
diff --git a/package/clifford/heartbeat/hotfixes.patch b/package/clifford/heartbeat/hotfixes.patch
new file mode 100644
index 000000000..9ef22560d
--- /dev/null
+++ b/package/clifford/heartbeat/hotfixes.patch
@@ -0,0 +1,32 @@
+--- ./crm/admin/Makefile.in.orig	2006-04-03 17:46:21.000000000 +0200
++++ ./crm/admin/Makefile.in	2006-04-03 17:47:50.000000000 +0200
+@@ -466,8 +466,7 @@
+ noinst_HEADERS = 
+ crmadmin_SOURCES = crmadmin.c
+ crmadmin_CFLAGS = -DHA_VARLIBDIR='"@HA_VARLIBDIR@"'
+-crmadmin_LDADD = $(COMMONLIBS) \
+-			$(top_builddir)/crm/pengine/libpengine.la
++crmadmin_LDADD = $(top_builddir)/crm/pengine/libpengine.la $(COMMONLIBS)
+ 
+ crm_uuid_SOURCES = crm_uuid.c
+ crm_uuid_CFLAGS = -DHA_VARLIBDIR='"@HA_VARLIBDIR@"'
+@@ -490,8 +489,7 @@
+ 
+ crm_verify_SOURCES = crm_verify.c
+ crm_verify_CFLAGS = -DHA_VARLIBDIR='"@HA_VARLIBDIR@"'
+-crm_verify_LDADD = $(COMMONLIBS) \
+-			$(top_builddir)/crm/pengine/libpengine.la
++crm_verify_LDADD = $(top_builddir)/crm/pengine/libpengine.la $(COMMONLIBS)
+ 
+ crm_master_SOURCES = crm_attribute.c
+ crm_master_CFLAGS = -DHA_VARLIBDIR='"@HA_VARLIBDIR@"'
+@@ -504,8 +502,7 @@
+ crm_attribute_LDADD = $(COMMONLIBS)
+ crm_resource_SOURCES = crm_resource.c
+ crm_resource_CFLAGS = -DHA_VARLIBDIR='"@HA_VARLIBDIR@"'
+-crm_resource_LDADD = $(COMMONLIBS) \
+-			$(top_builddir)/crm/pengine/libpengine.la
++crm_resource_LDADD = $(top_builddir)/crm/pengine/libpengine.la $(COMMONLIBS)
+ 
+ iso8601_SOURCES = test.iso8601.c
+ iso8601_CFLAGS = -DHA_VARLIBDIR='"@HA_VARLIBDIR@"'