diff --git a/.cvsignore b/.cvsignore
index 7b48d38..49eba6e 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-fence-agents-3.0.5.tar.gz
+fence-agents-3.0.6.tar.gz
diff --git a/fence-agents.spec b/fence-agents.spec
index 526bab7..0bcf9c9 100644
--- a/fence-agents.spec
+++ b/fence-agents.spec
@@ -10,30 +10,32 @@
 ###############################################################################
 ###############################################################################
 
-# 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 git0a6184070
 
 Name: fence-agents
 Summary: Fence Agents for Red Hat Cluster
-Version: 3.0.5
-Release: 1%{?alphatag:.%{alphatag}}%{?dist}
+Version: 3.0.6
+Release: 2%{?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/fence-agents-%{version}%{?alphatag:.%{alphatag}}.tar.gz
+Source0: https://fedorahosted.org/releases/c/l/cluster/%{name}-%{version}.tar.gz
 
 ## Runtime deps
-Requires: sg3_utils OpenIPMI telnet openssh-clients
+Requires: sg3_utils telnet openssh-clients
 Requires: pexpect net-snmp-utils
 Requires: perl-Net-Telnet
+Requires: fence-virt >= 0.1.3-1
 
 # This is required by fence_virsh. Per discussion on fedora-devel
 # switching from package to file based require.
 Requires: /usr/bin/virsh
 
+# This is required by fence_ipmilan. it appears that the packages
+# have changed Requires around. Make sure to get the right one.
+Requires: /usr/bin/ipmitool
+
 ## Setup/build bits
 
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -49,7 +51,7 @@ BuildRequires: corosynclib-devel >= 1.0.0-1
 BuildRequires: openaislib-devel >= 1.0.0-1
 
 %prep
-%setup -q -n fence-agents-%{version}%{?alphatag:.%{alphatag}}
+%setup -q -n %{name}-%{version}
 
 # we inherit configure from cluster project. Configure it for vars we need.
 # building from source directly without those parameters will NOT work.
@@ -89,6 +91,22 @@ power management for several devices.
 %{_mandir}/man8/fence*
 
 %changelog
+* Mon Dec  7 2009 Fabio M. Di Nitto <fdinitto@redhat.com> - 3.0.6-2
+- Use the correct tarball from upstream
+
+* Mon Dec  7 2009 Fabio M. Di Nitto <fdinitto@redhat.com> - 3.0.6-1
+- New upstream release (drop fence_head.diff)
+- spec file updates:
+  * use new Source0 url
+  * use file based Requires for ipmitools (rhbz: 545237)
+
+* Fri Dec  4 2009 Fabio M. Di Nitto <fdinitto@redhat.com> - 3.0.5-2.git0a6184070
+- Drop fence_xvm from upstream (fence_head.diff)
+- spec file updates:
+  * Drop unrequired comments
+  * Readd alpha tag and clean it's usage around
+  * Requires: fence-virt in sufficient version to provide fence_xvm
+
 * Fri Nov 20 2009 Fabio M. Di Nitto <fdinitto@redhat.com> - 3.0.5-1
 - New upstream release
 
diff --git a/sources b/sources
index 7567fb6..3b4d5d6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-30709b427b0271cb47d2eab800f79bcb  fence-agents-3.0.5.tar.gz
+5fc06dc26a14106ee6e21977a75b1b7f  fence-agents-3.0.6.tar.gz