diff --git a/.cvsignore b/.cvsignore
index 0c3a573..1ec975d 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
+2198dc90bec4.tar.bz2
 resource-agents-3.0.0.tar.gz
-3aa338887920.tar.bz2
diff --git a/resource-agents.spec b/resource-agents.spec
index 9d3183d..b6104d3 100644
--- a/resource-agents.spec
+++ b/resource-agents.spec
@@ -20,12 +20,12 @@
 # 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
+%define altversion 2198dc90bec4
 
 Name: resource-agents
 Summary: Open Source HA Resource Agents for Red Hat Cluster
 Version: 3.0.0
-Release: 15%{?alphatag:.%{alphatag}}%{?dist}
+Release: 16%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
 URL: http://sources.redhat.com/cluster/wiki/
@@ -44,6 +44,35 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires: cluster-glue-libs-devel glib2-devel
 BuildRequires: automake autoconf pkgconfig
 
+%description
+A set of scripts to interface with several services to operate in a
+High Availability environment for both Pacemaker and rgmanager
+service managers.
+
+%package -n ldirectord
+Summary:          Monitor daemon for maintaining high availability resources
+Group:            System Environment/Daemons
+Requires:         ipvsadm
+Requires(post):   /sbin/chkconfig
+Requires(preun):  /sbin/chkconfig
+
+# We were originally ldirectord, then renamed with a heartbeat- prefix.
+# Upstream maintainer wishes to use no prefix, which is consistent with 
+# how it is packaged for other distributions
+Provides:  ldirectord = 3.0.0-15
+Obsoletes: ldirectord < 3.0.0-15
+Provides:  heartbeat-ldirectord = 3.0.0-15
+Obsoletes: heartbeat-ldirectord < 3.0.0-15
+
+# removed for now until it's in Fedora
+#Requires:  perl(Net::IMAP::Simple::SSL)
+
+%description -n ldirectord
+ldirectord is a stand-alone daemon to monitor services of real 
+for virtual services provided by The Linux Virtual Server
+(http://www.linuxvirtualserver.org/). It is simple to install 
+and works with the heartbeat code (http://www.linux-ha.org/).
+
 # 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
@@ -61,9 +90,7 @@ BuildRequires: automake autoconf pkgconfig
 # prepare pacemaker RAs
 cd %{altprefix}%{altversion}
 ./autogen.sh
-%{_configure} \
-	CFLAGS="$(echo '%{optflags}')" \
-	--enable-fatal-warnings=no
+%{configure} --enable-fatal-warnings=no
 
 %build
 ##CFLAGS="$(echo '%{optflags}')" make %{_smp_mflags}
@@ -88,10 +115,13 @@ chmod 755 %{buildroot}/%{_datadir}/cluster/ocf-shellfuncs
 %clean
 rm -rf %{buildroot}
 
-%description
-A set of scripts to interface with several services to operate in a
-High Availability environment for both Pacemaker and rgmanager
-service managers.
+%post -n ldirectord
+/sbin/chkconfig --add ldirectord
+
+%postun -n ldirectord -p /sbin/ldconfig
+
+%preun -n ldirectord
+/sbin/chkconfig --del ldirectord
 
 %files
 %defattr(-,root,root,-)
@@ -105,14 +135,49 @@ service managers.
 %{_sbindir}/ocf-tester
 %{_sbindir}/sfex_init
 
-%dir %{_datadir}/glue
-%doc %{_datadir}/glue/ra-api-1.dtd
+%dir %{_datadir}/resource-agents
+%doc %{_datadir}/resource-agents/ra-api-1.dtd
 
 %dir %{_libdir}/heartbeat
+%{_libdir}/heartbeat/findif
 %{_libdir}/heartbeat/send_arp  
 %{_libdir}/heartbeat/sfex_daemon
 
+%files -n ldirectord
+%defattr(-,root,root,-)
+%doc %{altprefix}%{altversion}/COPYING 
+%doc %{altprefix}%{altversion}/ldirectord/ldirectord.cf
+%{_sbindir}/ldirectord
+%config(noreplace) %{_sysconfdir}/logrotate.d/ldirectord
+%{_sysconfdir}/init.d/ldirectord
+%{_sysconfdir}/ha.d/resource.d/ldirectord
+%{_mandir}/man8/ldirectord.8*
+/usr/lib/ocf/resource.d/heartbeat/ldirectord
+
 %changelog
+* Tue Aug 18 2009 Andrew Beekhof <andrew@beekhof.net> - 3.0.0-16
+- Create an ldirectord package
+- Update Pacameker agents to upstream version: 2198dc90bec4
+  + Build: Import ldirectord.
+  + Ensure HA_VARRUNDIR has a value to substitute
+  + High: Add findif tool (mandatory for IPaddr/IPaddr2)
+  + High: IPv6addr: new nic and cidr_netmask parameters
+  + High: postfix: new resource agent
+  + Include license information
+  + Low (LF 2159): Squid: make the regexp match more precisely output of netstat
+  + Low: configure: Fix package name.
+  + Low: ldirectord: add dependency on $remote_fs.
+  + Low: ldirectord: add mandatory required header to init script.
+  + Medium (LF 2165): IPaddr2: remove all colons from the mac address before passing it to send_arp
+  + Medium: VirtualDomain: destroy domain shortly before timeout expiry
+  + Medium: shellfuncs: Make the mktemp wrappers work.
+  + Remove references to Echo function
+  + Remove references to heartbeat shellfuncs.
+  + Remove useless path lookups
+  + findif: actually include the right header. Simplify configure.
+  + ldirectord: Remove superfluous configure artifact.
+  + ocf-tester: Fix package reference and path to DTD.
+
 * Tue Aug 11 2009 Ville Skyttä <ville.skytta@iki.fi> - 3.0.0-15
 - Use bzipped upstream hg tarball.
 
diff --git a/sources b/sources
index 85e6688..9e4ef2d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
+af99c03587de9d314dc1b47b3ea9f6aa  2198dc90bec4.tar.bz2
 485253db9ea4d48d38d7a0aef84cf660  resource-agents-3.0.0.tar.gz
-33048577b70aca705a62677e54c1d339  3aa338887920.tar.bz2