diff --git a/mtr.spec b/mtr.spec
index a1814c3..f8692d4 100644
--- a/mtr.spec
+++ b/mtr.spec
@@ -1,7 +1,7 @@
 Summary: A network diagnostic tool.
 Name: mtr
 Version: 0.54
-Release: 1
+Release: 4
 Epoch:	2
 Group: Applications/Internet
 License: GPL
@@ -9,7 +9,11 @@ URL: http://www.BitWizard.nl/mtr
 Source:	ftp://ftp.bitwizard.nl/mtr/%{name}-%{version}.tar.gz
 Source1: xmtr.consolehelper
 Source2: xmtr.pam
-Patch0: mtr-0.49-s390x.patch
+Patch0:	mtr-0.49-s390x.patch
+Patch1:	mtr-0.54-ipv6-kame.patch
+Patch2:	mtr-0.48-nogtk.patch
+Patch3:	mtr-0.52-SA_LEN.patch
+
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 
 %description
@@ -31,22 +35,24 @@ diagnostic tool.
 %prep
 %setup -q
 %patch0 -p1 -b .s390x
+%patch1 -p1 -b .ipv6-kame
+%patch2 -p1 -b .nogtk
+%patch3 -p1 -b .SA_LEN
 aclocal
 automake -a
 autoconf
 
 %build
-%configure
+%configure --with-gtk --enable-ipv6
 make && mv mtr xmtr && make distclean
-# mmm, broken configure script
-export GTK_CONFIG=/dev/null 
-%configure
+%configure --without-gtk --enable-ipv6
 make
 
 %install
 if [ -d $RPM_BUILD_ROOT ]; then rm -rf $RPM_BUILD_ROOT; fi
 mkdir -p $RPM_BUILD_ROOT/usr/{X11R6/bin,bin,sbin,share/pixmaps}
 mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man8
+install -m 4755 mtr $RPM_BUILD_ROOT%{_sbindir}/mtr
 make DESTDIR=$RPM_BUILD_ROOT install
 
 install -m 4755 xmtr $RPM_BUILD_ROOT/usr/X11R6/bin
@@ -92,6 +98,17 @@ if [ -d $RPM_BUILD_ROOT ]; then rm -rf $RPM_BUILD_ROOT; fi
 %{_datadir}/pixmaps/mtr_icon.xpm
 
 %changelog
+* Mon Feb 16 2004 Phil Knirsch <pknirsch@redhat.com>
+- Added IPv6 patch from ftp://ftp.kame.net/pub/kame/misc/mtr-054-*
+- Enabled IPv6 in mtr.
+- Included fix from Robert Scheck to make GTK optional in configure.
+
+* Fri Feb 13 2004 Elliot Lee <sopwith@redhat.com>
+- rebuilt
+
+* Wed Feb 04 2004 Phil Knirsch <pknirsch@redhat.com> 0.54-2
+- Fix to build on current tree.
+
 * Sat Oct 18 2003 Florian La Roche <Florian.LaRoche@redhat.de>
 - update to 0.54