diff --git a/.cvsignore b/.cvsignore
index 451c4d9..918f1e7 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-keepalived-1.1.17.tar.gz
+keepalived-1.1.19.tar.gz
diff --git a/keepalived-1.1.19-fix-ipvs-loading.patch b/keepalived-1.1.19-fix-ipvs-loading.patch
new file mode 100644
index 0000000..912914b
--- /dev/null
+++ b/keepalived-1.1.19-fix-ipvs-loading.patch
@@ -0,0 +1,12 @@
+diff -Naupr keepalived-1.1.19.orig/keepalived/check/ipvswrapper.c keepalived-1.1.19/keepalived/check/ipvswrapper.c
+--- keepalived-1.1.19.orig/keepalived/check/ipvswrapper.c	2009-09-28 13:03:40.000000000 +0200
++++ keepalived-1.1.19/keepalived/check/ipvswrapper.c	2009-11-24 22:41:56.220195007 +0100
+@@ -789,7 +789,7 @@ string_to_number(const char *s, int min,
+ static int
+ modprobe_ipvs(void)
+ {
+-	char *argv[] = { "/sbin/modprobe", "-s", "-k", "--", "ip_vs", NULL };
++	char *argv[] = { "/sbin/modprobe", "-s", "--", "ip_vs", NULL };
+ 	int child;
+ 	int status;
+ 	int rc;
diff --git a/keepalived.init b/keepalived.init
index 53909dd..fc5c39b 100755
--- a/keepalived.init
+++ b/keepalived.init
@@ -2,7 +2,7 @@
 #
 # keepalived   High Availability monitor built upon LVS and VRRP
 #
-# chkconfig:   - 21 79
+# chkconfig:   - 86 14
 # description: Robust keepalive facility to the Linux Virtual Server project \
 #              with multilayer TCP/IP stack checks.
 
@@ -10,8 +10,8 @@
 # Provides: keepalived
 # Required-Start: $local_fs $network $named $syslog
 # Required-Stop: $local_fs $network $named $syslog
-# Should-Start: httpd
-# Should-Stop:  httpd
+# Should-Start: smtpdaemon httpd
+# Should-Stop: smtpdaemon httpd
 # Default-Start: 
 # Default-Stop: 0 1 2 3 4 5 6
 # Short-Description: High Availability monitor built upon LVS and VRRP
diff --git a/keepalived.spec b/keepalived.spec
index b662c30..63e54ba 100644
--- a/keepalived.spec
+++ b/keepalived.spec
@@ -1,9 +1,6 @@
-# Ugly, but we need headers from a kernel to rebuild against
-%define kernel %(rpm -q kernel-devel --qf '%{RPMTAG_VERSION}-%{RPMTAG_RELEASE}\\n' 2>/dev/null | head -1)
-
 Summary: HA monitor built upon LVS, VRRP and service pollers
 Name: keepalived
-Version: 1.1.17
+Version: 1.1.19
 Release: 3%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -11,6 +8,7 @@ URL: http://www.keepalived.org/
 Source0: http://www.keepalived.org/software/keepalived-%{version}.tar.gz
 Source1: keepalived.init
 Patch0: keepalived-1.1.14-installmodes.patch
+Patch1: keepalived-1.1.19-fix-ipvs-loading.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/service, /sbin/chkconfig
@@ -39,6 +37,7 @@ healthchecks and LVS directors failover.
 %prep
 %setup -q
 %patch0 -p1 -b .installmodes
+%patch1 -p1 -b .fix-ipvs-loading
 # Fix file mode (600 as of 1.1.13, still as of 1.1.17)
 %{__chmod} a+r doc/samples/sample.misccheck.smbcheck.sh
 # Included as doc, so disable its dependencies
@@ -46,8 +45,8 @@ healthchecks and LVS directors failover.
 
 
 %build
-# Get the first available kernel build dir for our version, expanding arch
-KERNELDIR=$(ls -1d /lib/modules/%{kernel}*/build | head -1)
+# Get the most recent available kernel build dir, allows to expand arch too
+KERNELDIR=$(ls -1d --sort t /lib/modules/*/build | head -1)
 %configure --with-kernel-dir="${KERNELDIR}"
 %{__make} %{?_smp_mflags} STRIP=/bin/true
 
@@ -106,6 +105,16 @@ fi
 
 
 %changelog
+* Tue Dec  8 2009 Matthias Saou <http://freshrpms.net/> 1.1.19-3
+- Update init script to have keepalived start after the local MTA (#526512).
+- Simplify the kernel source detection, to avoid running rpm from rpmbuild.
+
+* Tue Nov 24 2009 Matthias Saou <http://freshrpms.net/> 1.1.19-2
+- Include patch to remove obsolete -k option to modprobe (#528465).
+
+* Wed Oct 21 2009 Matthias Saou <http://freshrpms.net/> 1.1.19-1
+- Update to 1.1.19.
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz@redhat.com> - 1.1.17-3
 - rebuilt with new openssl
 
diff --git a/sources b/sources
index 45cda45..9879826 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-324ef61a9eed389679f0a05edd1d1323  keepalived-1.1.17.tar.gz
+a35b8d9d462810f7650d292bd7457523  keepalived-1.1.19.tar.gz