diff --git a/.cvsignore b/.cvsignore
index 2976ff0..ed37a95 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-heartbeat-2.0.7.tar.gz
+heartbeat-2.0.8.tar.gz
diff --git a/heartbeat.spec b/heartbeat.spec
index a2cdaf2..7aef123 100644
--- a/heartbeat.spec
+++ b/heartbeat.spec
@@ -5,8 +5,8 @@
 %define           uname hacluster
 Summary:          Heartbeat subsystem for High-Availability Linux
 Name:             heartbeat
-Version:          2.0.7
-Release:          3%{?dist}
+Version:          2.0.8
+Release:          1%{?dist}
 License:          GPL/LGPL
 URL:              http://linux-ha.org/
 Group:            System Environment/Daemons
@@ -18,7 +18,7 @@ BuildRequires:    glib2-devel
 BuildRequires:    iputils
 BuildRequires:    libnet-devel
 BuildRequires:    libtool-ltdl-devel
-BuildRequires:    net-snmp-devel
+BuildRequires:    net-snmp-devel >= 5.4
 BuildRequires:    bzip2-devel 
 BuildRequires:    ncurses-devel
 %if %{ENABLE_MGMT}
@@ -72,6 +72,7 @@ and works with the heartbeat code (http://www.linux-ha.org/).
 
 %package -n stonith
 Requires:       pils = %{version}-%{release}
+Requires:       net-snmp-libs
 Summary:        Provides an interface to Shoot The Other Node In The Head 
 Group:          System Environment/Daemons
 
@@ -139,7 +140,7 @@ sed -i -e '1i# -*-Shell-script-*-' $RPM_BUILD_ROOT/%{_libdir}/heartbeat/ocf-shel
 sed -i -e '1i# -*-Shell-script-*-' $RPM_BUILD_ROOT/%{_sysconfdir}/ha.d/shellfuncs
 chmod -x $RPM_BUILD_ROOT/%{_libdir}/heartbeat/ocf-shellfuncs
 chmod -x $RPM_BUILD_ROOT/%{_sysconfdir}/ha.d/shellfuncs
-chmod -x $RPM_BUILD_ROOT/%{_libdir}/heartbeat/pymgmt.py
+chmod -x $RPM_BUILD_ROOT/%{_libdir}/heartbeat-gui/pymgmt.py
 
 %clean
 if [ -n "${RPM_BUILD_ROOT}"  -a "${RPM_BUILD_ROOT}" != "/" ]; then
@@ -189,6 +190,7 @@ test "$1" != 0 || /usr/sbin/fedora-groupdel %{gname} &>/dev/null || :
 %{_sysconfdir}/ha.d/rc.d
 %config(noreplace) %{_sysconfdir}/ha.d/README.config
 %{_libdir}/heartbeat
+%{_libdir}/heartbeat-gui
 %{_libdir}/libapphb.so.*
 %{_libdir}/libccmclient.so.*
 %{_libdir}/libcib.so.*
@@ -213,7 +215,7 @@ test "$1" != 0 || /usr/sbin/fedora-groupdel %{gname} &>/dev/null || :
 %dir %attr (0755, nobody, nobody) %{_var}/lib/heartbeat/cores/nobody
 %dir %attr (0755, hacluster, haclient) %{_var}/lib/heartbeat/cores/hacluster
 %dir %{_var}/run/heartbeat
-%attr (0755, hacluster, haclient) %{_bindir}/cl_status
+%attr (2755, hacluster, haclient) %{_bindir}/cl_status
 %{_bindir}/cl_respawn
 %{_sbindir}/crmadmin
 %{_sbindir}/cibadmin
@@ -221,6 +223,7 @@ test "$1" != 0 || /usr/sbin/fedora-groupdel %{gname} &>/dev/null || :
 %{_sbindir}/crm_diff
 %{_sbindir}/crm_uuid
 %{_sbindir}/crm_mon
+%{_sbindir}/crm_sh
 %{_sbindir}/iso8601
 %{_sbindir}/crm_master
 %{_sbindir}/crm_standby
@@ -229,7 +232,7 @@ test "$1" != 0 || /usr/sbin/fedora-groupdel %{gname} &>/dev/null || :
 %{_sbindir}/crm_verify
 %{_sbindir}/attrd_updater
 %{_sbindir}/crm_failcount
-%{_sbindir}/crm_primitive.*
+%{_sbindir}/ocf-tester
 %dir %attr (755, hacluster, haclient) %{_var}/run/heartbeat/ccm
 %dir %attr (755, hacluster, haclient) %{_var}/run/heartbeat/crm
 %dir %attr (755, hacluster, haclient) %{_var}/lib/heartbeat/crm
@@ -244,6 +247,7 @@ test "$1" != 0 || /usr/sbin/fedora-groupdel %{gname} &>/dev/null || :
 %{_mandir}/man8/apphbd.8*
 %{_mandir}/man8/ha_logd.8*
 %{_mandir}/man8/cibadmin.8.gz
+%{_mandir}/man8/crm_resource.8.gz
 %if %{ENABLE_SNMP_SUBAGENT}
 /LINUX-HA-MIB.mib
 %endif
@@ -261,7 +265,6 @@ test "$1" != 0 || /usr/sbin/fedora-groupdel %{gname} &>/dev/null || :
 %doc doc/README
 %doc ldirectord/ldirectord.cf
 %defattr(-,root,root)
-%{_sysconfdir}/ha.d/conf
 %{_sbindir}/ldirectord
 %{_sbindir}/supervise-ldirectord-config
 %config(noreplace) %{_sysconfdir}/logrotate.d/ldirectord
@@ -301,6 +304,16 @@ test "$1" != 0 || /usr/sbin/fedora-groupdel %{gname} &>/dev/null || :
 %{_libdir}/*.so
 
 %changelog
+* Sun Jan 21 2007 Joost Soeterbroek <joost.soeterbroek@gmail.com> - 2.0.8-1
+- upstream version 2.0.8
+- fix cl_status commands fail (bz #219765)
+
+* Thu Nov 30 2006 Joost Soeterbroek <joost.soeterbroek@gmail.com> - 2.0.7-5
+- add Requires net-snmp-libs to stonith , add BuildReqs net-snmp-devel >= 5.4
+
+* Tue Nov 28 2006 Joost Soeterbroek <joost.soeterbroek@gmail.com> - 2.0.7-4
+- rebuild for updated net-snmp, soname change
+
 * Sun Oct 29 2006 Joost Soeterbroek <fedora@soeterbroek.com> - 2.0.7-3
 - fix preun, postun to check for upgrade (#212133)
 
diff --git a/sources b/sources
index c25f277..b60cb63 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-41233e5097c42341bf2162806d4cb99c  heartbeat-2.0.7.tar.gz
+39d7d12d2a7d5c98d1e3f8ae7977a3e6  heartbeat-2.0.8.tar.gz