diff --git a/.cvsignore b/.cvsignore
index 747037d..94bd31c 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1 @@
-eggdrop1.6.18.tar.gz
-01_CVE-2007-2807_servmsg.patch
+eggdrop1.6.19.tar.gz
diff --git a/eggdrop-1.6.19-no_libdns.patch b/eggdrop-1.6.19-no_libdns.patch
new file mode 100644
index 0000000..838fba5
--- /dev/null
+++ b/eggdrop-1.6.19-no_libdns.patch
@@ -0,0 +1,16 @@
+A patch by Adam Tkac <atkac@redhat.com> for eggdrop >= 1.6.19, which makes
+the configure script looking for gethostbyname() in libc rather in libdns.
+The problem especially comes up, once bind-devel gets added into buildroot
+at the build system (#433111).
+
+--- eggdrop1.6.19/aclocal.m4		2008-04-19 06:21:20.000000000 +0200
++++ eggdrop1.6.19/aclocal.m4.no_libdns	2008-04-22 19:59:44.000000000 +0200
+@@ -764,7 +764,7 @@
+   else
+     AC_CHECK_LIB(socket, socket)
+     AC_CHECK_LIB(nsl, connect)
+-    AC_CHECK_LIB(dns, gethostbyname)
++    AC_CHECK_LIB(c, gethostbyname)
+     AC_CHECK_LIB(dl, dlopen)
+     AC_CHECK_LIB(m, tan, EGG_MATH_LIB="-lm")
+ 
diff --git a/eggdrop.spec b/eggdrop.spec
index 5dc3ead..2e713e0 100644
--- a/eggdrop.spec
+++ b/eggdrop.spec
@@ -1,16 +1,16 @@
 Summary:	The world's most popular Open Source IRC bot
 Name:		eggdrop
-Version:	1.6.18
-Release:	16%{?dist}
+Version:	1.6.19
+Release:	1%{?dist}
 License:	GPLv2+
 Group:		Applications/Communications
 URL:		http://www.eggheads.org/
 Source:		ftp://ftp.eggheads.org/pub/eggdrop/source/1.6/%{name}%{version}.tar.gz
 Patch0:		eggdrop-1.6.17-conf.patch
 Patch1:		eggdrop-1.6.17-langdir.patch
-Patch2:		http://nion.modprobe.de/01_CVE-2007-2807_servmsg.patch
+Patch2:		eggdrop-1.6.19-no_libdns.patch
 Patch3:		eggdrop-1.6.18-suzi_sp0007.patch
-BuildRequires:	tcl-devel >= 8.3, zlib-devel
+BuildRequires:	tcl-devel >= 8.3, zlib-devel, autoconf
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -23,8 +23,9 @@ able to form botnets, share partylines and userfiles between bots.
 %setup -q -n %{name}%{version}
 %patch0 -p1 -b .conf
 %patch1 -p1 -b .langdir
-%patch2 -p0 -b .servmsg
+%patch2 -p1 -b .no_libdns
 %patch3 -p1 -b .suzi_sp0007
+autoconf
 
 %build
 %configure
@@ -72,6 +73,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man?/*
 
 %changelog
+* Wed Apr 22 2008 Robert Scheck <robert@fedoraproject.org> 1.6.19-1
+- Upgrade to 1.6.19
+
 * Mon Feb 25 2008 Robert Scheck <robert@fedoraproject.org> 1.6.18-16
 - Cause the DNS linking against libc rather libdns (#433111)
 
diff --git a/sources b/sources
index 8f47144..b35b91a 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-c2734a51926bdf0380d8bb53f5a7b2ee  eggdrop1.6.18.tar.gz
-2fbfe01fcd56b94d364b5af81569ef7c  01_CVE-2007-2807_servmsg.patch
+4d89a901e95f0f9937f4ffac783d55d8  eggdrop1.6.19.tar.gz