diff --git a/net-tools-1.57-bug22040.patch b/net-tools-1.57-bug22040.patch
new file mode 100644
index 0000000..76f04d5
--- /dev/null
+++ b/net-tools-1.57-bug22040.patch
@@ -0,0 +1,50 @@
+--- net-tools-1.57/arp.c.orig	Sun May 14 17:57:41 2000
++++ net-tools-1.57/arp.c	Sat Nov 25 15:05:27 2000
+@@ -618,6 +618,7 @@
+     fprintf(stderr, _("  arp [-v]   [<HW>] [-i <if>] -Ds <hostname> <if> [netmask <nm>] pub      <-''-\n\n"));
+     
+     fprintf(stderr, _("        -a                       display (all) hosts in alternative (BSD) style\n"));
++    fprintf(stderr, _("        -e                       display (all) hosts in default (Linux) style\n"));
+     fprintf(stderr, _("        -s, --set                set a new ARP entry\n"));
+     fprintf(stderr, _("        -d, --delete             delete a specified entry\n"));
+     fprintf(stderr, _("        -v, --verbose            be verbose\n"));
+--- net-tools-1.57/man/en_US/arp.8.orig	Sat Nov 25 15:13:26 2000
++++ net-tools-1.57/man/en_US/arp.8	Sat Nov 25 15:15:12 2000
+@@ -3,7 +3,7 @@
+ arp \- manipulate the system ARP cache
+ .SH SYNOPSIS
+ .B arp 
+-.RB [ \-vn ] 
++.RB [ \-evn ] 
+ .RB [ "\-H type" ] 
+ .RB [ "-i if" ] 
+ .B -a 
+@@ -60,7 +60,7 @@
+ shows numerical addresses instead of trying to determine symbolic host, port
+ or user names.
+ .TP
+-.B "\-H type, \-\-hw-type type"
++.B "\-H type, \-\-hw-type type, \-t type"
+ When setting or reading the ARP cache, this optional parameter tells
+ .B arp
+ which class of entries it should check for.  The default value of
+@@ -81,7 +81,8 @@
+ .B hostname
+ parameter is not used,
+ .B all
+-entries will be displayed.
++entries will be displayed.  
++The entries will be displayed in alternate (BSD) style.
+ .TP
+ .B "\-d hostname, \-\-delete hostname"
+ Remove any entry for the specified host.  This can be used if the
+@@ -91,6 +92,9 @@
+ Use the interface
+ .BR ifa "'s"
+ hardware address.
++.TP
++.B "\-e"
++Shows the entries in default (Linux) style.
+ .TP
+ .B "\-i If, \-\-device If"
+ Select an interface. When dumping the ARP cache only entries matching
diff --git a/net-tools.spec b/net-tools.spec
index d823e36..da6f458 100644
--- a/net-tools.spec
+++ b/net-tools.spec
@@ -1,15 +1,19 @@
 Summary: The basic tools for setting up networking.
 Name: net-tools
 Version: 1.57
-Release: 1
+Release: 6
 Copyright: GPL
 Group: System Environment/Base
 Source0: http://www.tazenda.demon.co.uk/phil/net-tools/net-tools-%{version}.tar.bz2
 Source1: net-tools-%{version}-config.h
 Source2: net-tools-%{version}-config.make
-Patch0: net-tools-1.56-fhs.patch
+Patch0: net-tools-1.57-fhs.patch
 Patch1: net-tools-1.57-bug9215.patch
 Patch2: net-tools-1.57-bug9129.patch
+Patch3: net-tools-1.57-bug20570.patch
+Patch4: net-tools-1.57-bug22040.patch
+Patch5: net-tools-1.57-bug25474.patch
+Patch6: net-tools-1.57-bug25921.patch
 BuildRoot: %{_tmppath}/%{name}-root
 
 %description
@@ -21,6 +25,10 @@ networking:  ethers, route and others.
 %patch0 -p 1 -b .fhs
 %patch1 -p 1 -b .bug9215
 %patch2 -p 1 -b .bug9129
+%patch3 -p 1 -b .bug20570
+%patch4 -p 1 -b .bug22040
+%patch5 -p 1 -b .bug25474
+%patch6 -p 1 -b .bug25921
 
 cp %SOURCE1 ./config.h
 cp %SOURCE2 ./config.make
@@ -33,24 +41,42 @@ rm -rf $RPM_BUILD_ROOT
 
 make BASEDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install
 
+rm %{buildroot}/sbin/rarp
+rm %{buildroot}%{_mandir}/man8/rarp.8*
+
+%find_lang %{name}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root)
 /bin/*
 /sbin/*
 %{_mandir}/man[158]/*
-%lang(cs)	%{_datadir}/locale/cs/LC_MESSAGES/net-tools.mo
-%lang(de)	%{_mandir}/de_DE/man[158]/*
-%lang(de)	%{_datadir}/locale/de/LC_MESSAGES/net-tools.mo
-%lang(et)	%{_datadir}/locale/et_EE/LC_MESSAGES/net-tools.mo
-%lang(fr)	%{_mandir}/fr_FR/man[158]/*
-%lang(fr)	%{_datadir}/locale/fr/LC_MESSAGES/net-tools.mo
-%lang(pt_BR)	%{_mandir}/pt_BR/man[158]/*
-%lang(pt_BR)	%{_datadir}/locale/pt_BR/LC_MESSAGES/net-tools.mo
+%lang(de)	%{_mandir}/de/man[158]/*
+%lang(fr)	%{_mandir}/fr/man[158]/*
+%lang(pt_BR)	%{_mandir}/pt/man[158]/*
 
 %changelog
+* Sun Apr  8 2001 Preston Brown <pbrown@redhat.com>
+- use find_lang macro
+- less specific locale dirs for man pages
+
+* Mon Apr  2 2001 Preston Brown <pbrown@redhat.com>
+- don't use this version of rarp, doesn't work with our 2.4.
+
+* Tue Feb  6 2001 Crutcher Dunnavant <crutcher@redhat.com>
+- fixed man page typo, closing bug #25921
+
+* Fri Feb  1 2001 Crutcher Dunnavant <crutcher@redhat.com>
+- applied twaugh's patch to close bug #25474
+- which was a buffer length bug.
+
+* Wed Dec 27 2000 Jeff Johnson <jbj@redhat.com>
+- locales not initialized correctly (#20570).
+- arp: document -e option (#22040).
+
 * Sat Oct  7 2000 Jeff Johnson <jbj@redhat.com>
 - update to 1.57.
 - MTU (and other) option(s) not parsed correctly (#9215).