diff --git a/dhcp-4.1.1-P1-lpf-bind-msg-fix.diff b/dhcp-4.1.1-P1-lpf-bind-msg-fix.diff
new file mode 100644
index 0000000..96120f2
--- /dev/null
+++ b/dhcp-4.1.1-P1-lpf-bind-msg-fix.diff
@@ -0,0 +1,11 @@
+--- dhcp-4.1.1-P1/common/lpf.c
++++ dhcp-4.1.1-P1/common/lpf.c	2010/07/02 10:39:33
+@@ -92,7 +92,7 @@ int if_register_lpf (info)
+ 		if (errno == ENOPROTOOPT || errno == EPROTONOSUPPORT ||
+ 		    errno == ESOCKTNOSUPPORT || errno == EPFNOSUPPORT ||
+ 		    errno == EAFNOSUPPORT || errno == EINVAL) {
+-			log_error ("socket: %m - make sure");
++			log_error ("bind: %m - make sure");
+ 			log_error ("CONFIG_PACKET (Packet socket) %s",
+ 				   "and CONFIG_FILTER");
+ 			log_error ("(Socket Filtering) are enabled %s",
diff --git a/dhcp.changes b/dhcp.changes
index cb9437d..37dd6b4 100644
--- a/dhcp.changes
+++ b/dhcp.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jul  2 10:48:21 UTC 2010 - mt@suse.de
+
+- Added a fix for an lpf bind error messages making it easier to
+  localize problems (bnc#617795)
+
 -------------------------------------------------------------------
 Mon Jun 14 12:11:57 UTC 2010 - mt@suse.de
 
diff --git a/dhcp.spec b/dhcp.spec
index 35fdecd..9a58221 100644
--- a/dhcp.spec
+++ b/dhcp.spec
@@ -33,7 +33,7 @@ License:        BSD3c(or similar)
 Group:          Productivity/Networking/Boot/Servers
 AutoReqProv:    on
 Version:        4.1.1.P1
-Release:        1
+Release:        2
 Summary:        Common Files Used by ISC DHCP Software
 Url:            http://www.isc.org/software/dhcp
 Source0:        dhcp-%{isc_version}.tar.bz2
@@ -81,6 +81,7 @@ Patch30:        dhcp-4.1.1-ldap-patch-mt-01.diff.bz2
 %else
 Patch30:        dhcp-4.1.1-dhclient-no-libcrypto.diff
 %endif
+Patch40:        dhcp-4.1.1-P1-lpf-bind-msg-fix.diff
 ##
 PreReq:         /bin/touch /sbin/chkconfig sysconfig
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -203,6 +204,7 @@ Authors:
 %else
 %patch30 -p1
 %endif
+%patch40 -p1
 ##
 find . -type f -name \*.cat\* -exec rm -f {} \;
 dos2unix contrib/ms2isc/*