diff --git a/iputils-ss021109-ping-interrupt.diff b/iputils-ss021109-ping-interrupt.diff
new file mode 100644
index 0000000..831bfda
--- /dev/null
+++ b/iputils-ss021109-ping-interrupt.diff
@@ -0,0 +1,29 @@
+--- ping.c	2008-08-18 11:19:05.000000000 +0200
++++ ping.c	2008-08-18 11:19:10.000000000 +0200
+@@ -95,6 +95,7 @@
+ static u_short in_cksum(const u_short *addr, int len, u_short salt);
+ static void pr_icmph(__u8 type, __u8 code, __u32 info, struct icmphdr *icp);
+ static int parsetos(char *str);
++static void doexit (int);
+ 
+ static struct {
+ 	struct cmsghdr cm;
+@@ -237,6 +238,8 @@
+ 			options |= F_SOURCEROUTE;
+ 		}
+ 	}
++	set_signal(SIGINT, doexit);
++
+ 	while (argc > 0) {
+ 		target = *argv;
+ 
+@@ -1231,3 +1234,9 @@
+ "            [ -T timestamp option ] [ -Q tos ] [hop1 ...] destination\n");
+ 	exit(2);
+ }
++
++static void doexit(int signo)
++{
++	exit (1);
++}
++
diff --git a/iputils.changes b/iputils.changes
index a956a07..c9ce8d6 100644
--- a/iputils.changes
+++ b/iputils.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Sep  4 14:40:01 CEST 2008 - ms@suse.de
+
+- fixed ping signal handling during address lookup (bnc #416404)
+
 -------------------------------------------------------------------
 Wed Dec 12 15:44:07 CET 2007 - rguenther@suse.de
 
diff --git a/iputils.spec b/iputils.spec
index a1f8a2c..2f74ef4 100644
--- a/iputils.spec
+++ b/iputils.spec
@@ -1,19 +1,27 @@
 #
 # spec file for package iputils (Version ss021109)
 #
-# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
+# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
 # norootforbuild
 
+
 Name:           iputils
 Summary:        IPv4and IPv6 Networking Utilities
 Version:        ss021109
-Release:        237
+Release:        285
 License:        BSD 3-Clause; GPL v2 or later
 Group:          Productivity/Networking/Other
 Provides:       nkitb
@@ -38,6 +46,7 @@ Patch14:        %name-%version-ping6_getaddrinfo.patch
 Patch15:        %name-%version-ping_common.dif
 Patch16:        %name-ss021109-traceroute6-ttab.diff
 Patch17:        %name-%version-open_max.diff
+Patch18:        %name-%version-ping-interrupt.diff
 Prefix:         %_prefix
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -71,6 +80,7 @@ Authors:
 %patch15
 %patch16
 %patch17 -p1
+%patch18
 mkdir linux
 touch linux/autoconf.h
 
@@ -117,114 +127,116 @@ rm -rf $RPM_BUILD_ROOT
 %attr(644,root,root) %_mandir/man8/*
 
 %changelog
-* Wed Dec 12 2007 - rguenther@suse.de
+* Thu Sep 04 2008 ms@suse.de
+- fixed ping signal handling during address lookup (bnc #416404)
+* Wed Dec 12 2007 rguenther@suse.de
 - use sysconf(_SC_OPEN_MAX) instead of OPEN_MAX to fix build
-* Tue Mar 06 2007 - ms@suse.de
+* Tue Mar 06 2007 ms@suse.de
 - fixed overbound ttab2 array access (#251195)
-* Wed Dec 06 2006 - ms@suse.de
+* Wed Dec 06 2006 ms@suse.de
 - ping_common.c: added check for oversized packages (-s) (#222010)
-* Thu Nov 23 2006 - olh@suse.de
+* Thu Nov 23 2006 olh@suse.de
 - move ifenslave.c to the first patch to allow quilt setup *.spec
-* Wed Nov 22 2006 - ms@suse.de
+* Wed Nov 22 2006 ms@suse.de
 - ping6: use getaddrinfo() instead of gethostbyname2 (#221745)
-* Fri Nov 10 2006 - ro@suse.de
+* Fri Nov 10 2006 ro@suse.de
 - fix manpage permissions
-* Mon Aug 07 2006 - aj@suse.de
+* Mon Aug 07 2006 aj@suse.de
 - use sysconf(_SC_CLK_TCK) instead of HZ
-* Wed Mar 01 2006 - schwab@suse.de
+* Wed Mar 01 2006 schwab@suse.de
 - ifenslave: fix display of interface address.
 - Don't strip binaries.
-* Wed Jan 25 2006 - mls@suse.de
+* Wed Jan 25 2006 mls@suse.de
 - converted neededforbuild to BuildRequires
-* Mon Jan 23 2006 - mmj@suse.de
+* Mon Jan 23 2006 mmj@suse.de
 - Fix ping6 [#143932]
-* Fri Jul 08 2005 - mmj@suse.de
+* Fri Jul 08 2005 mmj@suse.de
 - Patch from ak which allows to use the standard ping6
   link-local-addr%%interface syntax instead of ping6 -I interface
   link-local-addr.
-* Thu Jun 16 2005 - mmj@suse.de
+* Thu Jun 16 2005 mmj@suse.de
 - Compile with -fpie, link with -pie
-* Fri Sep 03 2004 - kukuk@suse.de
+* Fri Sep 03 2004 kukuk@suse.de
 - Fix compiling with new glibc headers
-* Fri Mar 19 2004 - mmj@suse.de
+* Fri Mar 19 2004 mmj@suse.de
 - Use correct permissions for manpages [#36321]
-* Wed Mar 17 2004 - mmj@suse.de
+* Wed Mar 17 2004 mmj@suse.de
 - Add Olaf Kirch patch to only do name lookup once in ping [#36161]
-* Mon Jan 12 2004 - mmj@suse.de
+* Mon Jan 12 2004 mmj@suse.de
 - Update ifenslave.c to the one from linux-2.6.1
-* Thu Oct 16 2003 - mmj@suse.de
+* Thu Oct 16 2003 mmj@suse.de
 - Don't build as root
 - Cleanup a bit
-* Wed Jun 04 2003 - kukuk@suse.de
+* Wed Jun 04 2003 kukuk@suse.de
 - Don't include net/if.h and linux/if.h at the same time
-* Mon May 12 2003 - mmj@suse.de
+* Mon May 12 2003 mmj@suse.de
 - Update to newest snapshot, ss021109
-* Mon Feb 24 2003 - schwab@suse.de
+* Mon Feb 24 2003 schwab@suse.de
 - Fix use of kernel headers.
-* Wed Oct 30 2002 - mmj@suse.de
+* Wed Oct 30 2002 mmj@suse.de
 - Apply patch for the ping/ping6 manpage to mention the -R option
   is for IPv4 only.
 - Clean up the specfile a bit.
-* Fri Oct 25 2002 - mmj@suse.de
+* Fri Oct 25 2002 mmj@suse.de
 - Apply patch for setuid() return value check from Thomas Biege
-* Wed Oct 02 2002 - mmj@suse.de
+* Wed Oct 02 2002 mmj@suse.de
 - Add the ifenslave binary from the kernel Documentation directory
   [#20372]
-* Tue Oct 01 2002 - mmj@suse.de
+* Tue Oct 01 2002 mmj@suse.de
 - Update to snapshot 020927 which among other things should have
   below fix merged.
-* Thu Aug 08 2002 - mmj@suse.de
+* Thu Aug 08 2002 mmj@suse.de
 - Apply other patch to fix the dynamic IP problem and still allows
   the from address to be printed. Thanks to Olaf Kirch. [#17519]
-* Sun Jul 28 2002 - kukuk@suse.de
+* Sun Jul 28 2002 kukuk@suse.de
 - remove unused tetex from neededforbuild
-* Thu Jul 25 2002 - mmj@suse.de
+* Thu Jul 25 2002 mmj@suse.de
 - Disabled traceroute6
-* Fri Jul 05 2002 - bk@suse.de
+* Fri Jul 05 2002 bk@suse.de
 - fix build on ia64(use glibc kernel headers, not /usr/src/linux)
 - add optflags
-* Thu Jul 04 2002 - bk@suse.de
+* Thu Jul 04 2002 bk@suse.de
 - add fix for buffer overflow problem in traceroute6.c(datalen.patch)
 - add fix for ipv6 error printing problem (ping6-errorprinting.patch)
 - add patch to activate the rdisc server  (rdisc-server.patch)
-* Mon Jun 17 2002 - mmj@suse.de
+* Mon Jun 17 2002 mmj@suse.de
 - Revert back to the ping from iputils, and apply patch to fix
   the dynamic ip problem.
-* Mon Jun 10 2002 - mmj@suse.de
+* Mon Jun 10 2002 mmj@suse.de
 - Use old nkitb ping which works with dynamic IP [#12568]
-* Mon Feb 04 2002 - mmj@suse.de
+* Mon Feb 04 2002 mmj@suse.de
 - Update to snapshot from January 24th 2002
-* Tue Jan 22 2002 - mmj@suse.de
+* Tue Jan 22 2002 mmj@suse.de
 - Update to snapshot from December 2nd 2001
-* Mon Dec 10 2001 - bjacke@suse.de
+* Mon Dec 10 2001 bjacke@suse.de
 - move arping to /sbin/
-* Wed Oct 10 2001 - mmj@suse.de
+* Wed Oct 10 2001 mmj@suse.de
 - Update to snapshot from October 2 2001
-* Thu Sep 06 2001 - kukuk@suse.de
+* Thu Sep 06 2001 kukuk@suse.de
 - Remove wrong warning about to old kernel and warning about
   problems with the clock from ping (ping has a special handler
   for this, so it is okay). Both only confuses tester [Bug #10141
   and Bug #10146].
-* Sat Aug 25 2001 - kukuk@suse.de
+* Sat Aug 25 2001 kukuk@suse.de
 - Update to snapshot from 24 Aug 2001
 - Use included ping like all other distributions do
 - Don't use included rarpd and tftpd
 - Lot of new functions and minor bug fixes
-* Mon Jun 18 2001 - schwab@suse.de
+* Mon Jun 18 2001 schwab@suse.de
 - Fix use of cpp directives inside macro call.
-* Fri Mar 30 2001 - kukuk@suse.de
+* Fri Mar 30 2001 kukuk@suse.de
 - Use ping6 from inet6-apps package [Bug #6354]
-* Mon Mar 12 2001 - schwab@suse.de
+* Mon Mar 12 2001 schwab@suse.de
 - Fix use of kernel headers.
-* Fri Mar 09 2001 - kukuk@suse.de
+* Fri Mar 09 2001 kukuk@suse.de
 - Add ping and ping.8 manual page from OpenBSD.
-* Mon Mar 05 2001 - kukuk@suse.de
+* Mon Mar 05 2001 kukuk@suse.de
 - fix to build with current glibc
-* Wed Feb 14 2001 - uli@suse.de
+* Wed Feb 14 2001 uli@suse.de
 - fixed to build on PPC
-* Sat Nov 11 2000 - kukuk@suse.de
+* Sat Nov 11 2000 kukuk@suse.de
 - Update to new version (20001110).
-* Sat Oct 14 2000 - kukuk@suse.de
+* Sat Oct 14 2000 kukuk@suse.de
 - spec file fixes
-* Sat Oct 14 2000 - kukuk@suse.de
+* Sat Oct 14 2000 kukuk@suse.de
 - Initial version