diff --git a/tar.spec b/tar.spec
index f6dbbe7..c7b832e 100644
--- a/tar.spec
+++ b/tar.spec
@@ -1,7 +1,7 @@
 Summary: A GNU file archiving program.
 Name: tar
 Version: 1.13.25
-Release: 4.7.1
+Release: 7
 License: GPL
 Group: Applications/Archiving
 Source: ftp://ftp.gnu.org/pub/gnu/tar/tar-%{version}.tar.bz2
@@ -11,9 +11,9 @@ Patch2: tar-1.13.25-autoconf.patch
 Patch6: tar-1.13.22-nolibrt.patch
 Patch7: tar-1.13.19-error.patch
 Patch8: tar-1.13.19-absolutenames.patch
-Patch9: tar-dots.patch
+Patch9: tar-1.13.25-argv.patch
 Prereq: info
-BuildRequires: autoconf automake
+BuildRequires: autoconf253 automake15
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 
 %description
@@ -32,23 +32,39 @@ the rmt package.
 %setup -q
 %patch0 -p1 -b .manpage
 %patch1 -p1 -b .sock
-#%patch2 -p1 -b .253
-#%patch6 -p1 -b .librt
+%patch2 -p1 -b .253
+%patch6 -p1 -b .librt
 %patch7 -p1 -b .err
 %patch8 -p1 -b .absn
-%patch9 -p1 -b .dots
+%patch9 -p1 -b .argv
 
 %build
 
+%ifos linux
+unset LINGUAS || :
 %define optflags $RPM_OPT_FLAGS -DHAVE_STRERROR -D_GNU_SOURCE
+########### Start workaround for legacy auto* tools ############
+for i in autoconf autoheader autom4te autoreconf autoscan autoupdate ifnames; do
+	ln -s %{_bindir}/$i-2.53 $i
+done
+for i in aclocal automake; do
+	ln -s %{_bindir}/$i-1.5 $i
+done
+export PATH="`pwd`:$PATH"
+########### End workaround ###########
 %configure --bindir=/bin --libexecdir=/sbin
 make LIBS=-lbsd
+%else
+%configure
+make
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %ifos linux
 make prefix=${RPM_BUILD_ROOT}%{_prefix} \
+    localedir=${RPM_BUILD_ROOT}%{_prefix}/share/locale \
     bindir=${RPM_BUILD_ROOT}/bin \
     libexecdir=${RPM_BUILD_ROOT}/sbin \
     mandir=${RPM_BUILD_ROOT}%{_mandir} \
@@ -104,8 +120,11 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_infodir}/tar.info*
 
 %changelog
-* Tue Jun 18 2002 Trond Eivind Glomsrød <teg@redhat.com> 1.13.25-4.7
-- Security fix for path vulnerabilities
+* Mon Jul  1 2002 Bernhard Rosenkraenzer <bero@redhat.com> 1.13.25-7
+- Fix argv NULL termination (#64869)
+
+* Thu May 23 2002 Tim Powers <timp@redhat.com>
+- automated rebuild
 
 * Tue Apr  9 2002 Bernhard Rosenkraenzer <bero@redhat.com> 1.13.25-4
 - Fix build with autoconf253 (LIBOBJ change; autoconf252 worked)