diff --git a/sources b/sources
index 9a5d558..1b35e82 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1217755c6287caa7ca0bfc1ddaa2d9ac  traceroute-1.0.4.tar.bz2
+04b8caad133cd5616fe287891b757700  traceroute-2.0.0.tar.gz
diff --git a/traceroute.spec b/traceroute.spec
index 664b8cc..04983bb 100644
--- a/traceroute.spec
+++ b/traceroute.spec
@@ -1,14 +1,13 @@
-Summary: Traces the route taken by packets over a TCP/IP network.
+Summary: Traces the route taken by packets over an IPv4/IPv6 network
 Name: traceroute
-Version: 1.0.4
-Release: 2
-Epoch: 2
-License: GPL
+Version: 2.0.0
+Release: 1%{?dist}
 Group: Applications/Internet
-Source: ftp://ftp.lst.de/pub/people/okir/traceroute/%{name}-%{version}.tar.bz2
-Patch0: traceroute-1.0.4-compat.patch
-Patch1: traceroute-1.0.4-trace_stop.patch
-BuildRoot: %{_tmppath}/%{name}-root
+License: GPL
+URL:  http://dmitry.butskoy.name/traceroute
+Source0: http://www.odu.neva.ru/buc/traceroute/traceroute-%{version}.tar.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 
 %description
 The traceroute utility displays the route used by IP packets on their
@@ -18,47 +17,50 @@ route taken by the packets.  Traceroute is used as a network debugging
 tool.  If you're having network connectivity problems, traceroute will
 show you where the trouble is coming from along the route.
 
-This is a small traceroute replacement that works without requiring a
-setuid bit. This implementation relies on a number of features of the
-2.4 Linux kernel. It also has IPv6 support, and does parallel probes,
-which makes it a little faster.
-
 Install traceroute if you need a tool for diagnosing network connectivity
 problems.
 
+
 %prep
 %setup -q
-%patch0 -p1 -b .compat
-%patch1 -p1 -b .trace_stop
+
 
 %build
-%ifarch s390 s390x
-export CFLAGS="$RPM_OPT_FLAGS -fPIC"
-%else
-export CFLAGS="$RPM_OPT_FLAGS -fpic"
-%endif
-export LDFLAGS="-pie"
+make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
 
-make CCOPT="$CFLAGS"
 
 %install
-rm -rf %{buildroot}
-install -m 755 -D %{name} %{buildroot}/bin/%{name}
-install -m 644 -D %{name}.1 %{buildroot}%{_mandir}/man8/%{name}.8
-#for IPv6 traceroute
-ln -sf %{name} %{buildroot}/bin/traceroute6
-ln -sf %{_mandir}/man8/%{name}.8 ${RPM_BUILD_ROOT}%{_mandir}/man8/%{name}6.8 
+rm -rf $RPM_BUILD_ROOT
+
+install -d $RPM_BUILD_ROOT/%{_bindir}
+install -m755 traceroute/traceroute $RPM_BUILD_ROOT/%{_bindir}
+pushd $RPM_BUILD_ROOT/%{_bindir}
+ln -s traceroute traceroute6
+ln -s traceroute tracert
+ln -s traceroute tcptraceroute
+popd
+
+install -d $RPM_BUILD_ROOT%{_mandir}/man8
+install -p traceroute.8 $RPM_BUILD_ROOT%{_mandir}/man8
+
 
 %clean
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
+
 
 %files
-%defattr(-,root,root)
-%doc ChangeLog COPYING.GPL README
-/bin/traceroute*
-%{_mandir}/man8/*
+%defattr(-,root,root,-)
+%doc COPYING README TODO CREDITS
+%{_bindir}/*
+%{_mandir}/*/*
+
 
 %changelog
+* Tue Oct 17 2006 Martin Bacovsky <mbacovsk@redhat.com>
+- new source
+- new features including ICMP support above all (#176587)
+- Thanks to Dmitry Butskoy
+
 * Wed Jul 19 2006 Radek Vokal <rvokal@redhat.com> - 2:1.0.4-2
 - traceroute can not continue past destination host (#199342)