diff --git a/.cvsignore b/.cvsignore
index 608d45d..fa05e0e 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-traceroute-1.4a12.tar.gz
+traceroute-1.4a12.tar.bz2
diff --git a/sources b/sources
index c7e396d..cfe9ce6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3bdae61d5eea429e893f97f78c09e44e  traceroute-1.4a12.tar.gz
+3af0b55b2f9f5c330631fb540ffda11d  traceroute-1.4a12.tar.bz2
diff --git a/traceroute.spec b/traceroute.spec
index c3a3c5a..5ddecde 100644
--- a/traceroute.spec
+++ b/traceroute.spec
@@ -1,10 +1,10 @@
 Summary: Traces the route taken by packets over a TCP/IP network.
 Name: traceroute
 Version: 1.4a12
-Release: 9
+Release: 20.1
 License: BSD
 Group: Applications/Internet
-Source: ftp://ftp.ee.lbl.gov/traceroute-1.4a12.tar.gz
+Source: traceroute-1.4a12.tar.bz2
 Patch0: traceroute-1.4a5-fix.patch
 Patch1: traceroute-1.4a5-secfix.patch
 Patch2: traceroute-1.4a5-alpha.patch
@@ -20,6 +20,9 @@ Patch11: traceroute-1.4a5-bigpacklen.patch
 Patch12: traceroute-1.4a5-lsrr.patch
 Patch13: traceroute-1.4a12-sockopt.patch
 Patch14: traceroute-1.4a12-sockopt2.patch
+Patch15: traceroute-1.4a12-tos-monitoring.patch
+Patch16: traceroute-1.4a12-mpls-icmp-02.patch
+URL: ftp://ftp.ee.lbl.gov/
 Prefix: %{_prefix}
 BuildRoot: %{_tmppath}/%{name}-root
 
@@ -51,6 +54,8 @@ problems.
 %patch12 -p1 -b .lsrr
 %patch13 -p1 -b .sockopt
 %patch14 -p1 -b .sockopt2
+%patch15 -p1 -b .tos-monitoring
+%patch16 -p1 -b .mpls-icmp-02
 
 %build
 
@@ -61,22 +66,67 @@ make CCOPT="$RPM_OPT_FLAGS"
 
 %install
 rm -rf $RPM_BUILD_ROOT
+mkdir -p ${RPM_BUILD_ROOT}/bin
 mkdir -p ${RPM_BUILD_ROOT}%{_sbindir}
 mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man8
 
 make DESTDIR=${RPM_BUILD_ROOT} install install-man
 
+ln -s /bin/traceroute ${RPM_BUILD_ROOT}%{_sbindir}
+
+# remove sugid apps to get proper debuginfo
+chmod 755 ${RPM_BUILD_ROOT}/bin/*
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
 # this is set as 4555 by make install, which I don't really like
-%attr(4755,root,root)	%{_sbindir}/traceroute
+%attr(4755,root,root)	/bin/traceroute
+%{_sbindir}/traceroute
 %{_mandir}/man8/*
 
 %changelog
-* Wed Jan 22 2003 Tim Powers <timp@redhat.com>
+* Mon Sep 01 2003 Phil Knirsch <pknirsch@redhat.com> 1.4a12-20.1
+- rebuilt
+
+* Mon Sep 01 2003 Phil Knirsch <pknirsch@redhat.com> 1.4a12-20
+- Added patch from Jesper Skriver supplied by Kaj J. Niemi to support
+  draft-ietf-mpls-icmp-02.txt.
+
+* Thu Aug 28 2003 Florian La Roche <Florian.LaRoche@redhat.de>
+- move debuginfo stuff into proper rpms
+
+* Wed Jun 04 2003 Elliot Lee <sopwith@redhat.com>
+- rebuilt
+
+* Tue May 13 2003 Phil Knirsch <pknirsch@redhat.com> 1.4a12-17
+- Bumped release and rebuilt
+
+* Tue May 13 2003 Phil Knirsch <pknirsch@redhat.com> 1.4a12-16
+- Moved binary to /bin and symlink to old /usr/sbin place for compatibility.
+
+* Mon May 12 2003 Phil Knirsch <pknirsch@redhat.com> 1.4a12-15
+- Bumped release and rebuilt
+
+* Mon May 12 2003 Phil Knirsch <pknirsch@redhat.com> 1.4a12-14
+- Added -t option (#71790).
+
+* Mon May 12 2003 Phil Knirsch <pknirsch@redhat.com> 1.4a12-13
+- Bumped release and rebuilt
+
+* Mon May 12 2003 Phil Knirsch <pknirsch@redhat.com> 1.4a12-12
+- Switch to bz2 tarball to save space
+- Added URL tag.
+
+* Mon May 12 2003 Phil Knirsch <pknirsch@redhat.com> 1.4a12-11
+- Bumped release and rebuilt
+
+* Mon May 12 2003 Phil Knirsch <pknirsch@redhat.com> 1.4a12-10
+- Added symlink to /usr/bin (#18313).
+
+* Wed Jan 22 2003 Tim Powers <timp@redhat.com> 1.4a12-9
 - rebuilt
 
 * Wed Jan 08 2003 Phil Knirsch <pknirsch@redhat.com> 1.4a12-8