diff --git a/net-tools-1.60-manydevs.patch b/net-tools-1.60-manydevs.patch
new file mode 100644
index 0000000..d07ffba
--- /dev/null
+++ b/net-tools-1.60-manydevs.patch
@@ -0,0 +1,13 @@
+--- lib/nstrcmp.c.bak	Fri Apr 12 00:15:01 2002
++++ lib/nstrcmp.c	Fri Apr 12 00:15:29 2002
+@@ -16,8 +16,8 @@
+ 	b++;
+     }
+     if (isdigit(*a)) {
+-	if (!isdigit(*b))
+-	    return -1;
++        if (!isdigit(*b))
++	    return 1;
+ 	while (a > astr) {
+ 	    a--;
+ 	    if (!isdigit(*a)) {
diff --git a/net-tools-1.60-virtualname.patch b/net-tools-1.60-virtualname.patch
deleted file mode 100644
index f56f171..0000000
--- a/net-tools-1.60-virtualname.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -uNr net-tools-1.60/lib/interface.c net-tools-1.60-2/lib/interface.c
---- net-tools-1.60/lib/interface.c	Sat Feb 10 14:31:15 2001
-+++ net-tools-1.60-2/lib/interface.c	Thu Jul 18 13:15:37 2002
-@@ -579,7 +579,7 @@
- 
- void ife_print_short(struct interface *ptr)
- {
--    printf("%-5.5s ", ptr->name);
-+    printf("%-9.8s ", ptr->name);
-     printf("%5d %3d", ptr->mtu, ptr->metric);
-     /* If needed, display the interface statistics. */
-     if (ptr->statistics_valid) {
-diff -uNr net-tools-1.60/netstat.c net-tools-1.60-2/netstat.c
---- net-tools-1.60/netstat.c	Sun Apr 15 10:41:17 2001
-+++ net-tools-1.60-2/netstat.c	Thu Jul 18 12:48:33 2002
-@@ -1449,7 +1449,7 @@
-     }
-     if (flag_exp < 2) {
- 	ife_short = 1;
--	printf(_("Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR   TX-OK TX-ERR TX-DRP TX-OVR Flg\n"));
-+	printf(_("Iface     MTU Met   RX-OK RX-ERR RX-DRP RX-OVR   TX-OK TX-ERR TX-DRP TX-OVR Flg\n"));
-     }
- 
-     if (for_all_interfaces(do_if_print, &flag_all) < 0) {
diff --git a/net-tools.spec b/net-tools.spec
index e5c7668..f470433 100644
--- a/net-tools.spec
+++ b/net-tools.spec
@@ -1,7 +1,7 @@
 Summary: Basic networking tools.
 Name: net-tools
 Version: 1.60
-Release: 3msdw.2
+Release: 4
 Copyright: GPL
 Group: System Environment/Base
 Source0: http://www.tazenda.demon.co.uk/phil/net-tools/net-tools-%{version}.tar.bz2
@@ -10,7 +10,7 @@ Source2: net-tools-%{version}-config.make
 Source3: ether-wake.c
 Patch4: net-tools-1.57-bug22040.patch
 Patch5: net-tools-1.60-miiioctl.patch
-Patch6: net-tools-1.60-virtualname.patch 
+Patch6: net-tools-1.60-manydevs.patch
 BuildRoot: %{_tmppath}/%{name}-root
 
 %description
@@ -21,7 +21,8 @@ ifconfig, netstat, route, and others.
 %setup -q
 %patch4 -p 1 -b .bug22040
 %patch5 -p 1 -b .miiioctl
-%patch6 -p 1
+%patch6 -p0 -b .manydevs
+
 cp %SOURCE1 ./config.h
 cp %SOURCE2 ./config.make
 cp %SOURCE3 .
@@ -55,6 +56,10 @@ rm -rf $RPM_BUILD_ROOT
 %lang(pt_BR)	%{_mandir}/pt_BR/man[158]/*
 
 %changelog
+* Fri Apr 12 2002 Jeremy Katz <katzj@redhat.com>
+- fix nstrcmp() to be correct in the case where there are many devices 
+  of the same type, eg, "eth10" > "eth1"  (#61436)
+
 * Tue Jul 31 2001 Bill Nottingham <notting@redhat.com>
 - do *not* use SIOCDEVPRIVATE for MII ioctls