diff --git a/mtr.spec b/mtr.spec
index 43c4b46..5ffa49f 100644
--- a/mtr.spec
+++ b/mtr.spec
@@ -1,7 +1,7 @@
 Summary: A network diagnostic tool.
 Name: mtr
 Version: 0.54
-Release: 7
+Release: 8
 Epoch:	2
 Group: Applications/Internet
 License: GPL
@@ -14,7 +14,8 @@ Patch1:	mtr-0.54-ipv6-kame.patch
 Patch2:	mtr-0.48-nogtk.patch
 Patch3:	mtr-0.52-SA_LEN.patch
 Patch4:	mtr-0.54-servfail.patch
-BuildPreReq: ncurses-devel libtermcap-devel
+BuildRequires: ncurses-devel libtermcap-devel
+BuildRequires: automake, gtk+-devel
 
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 
@@ -26,9 +27,9 @@ useful for using Mtr from a telnet session; and a GTK+ interface for X
 
 %package gtk
 Summary: The GTK+ interface for mtr.
-Epoch:	%{epoch}
 Group: Applications/Internet
-Requires: mtr, usermode >= 1.37, gtk+
+Requires: mtr = %{epoch}:%{version}-%{release}
+Requires: usermode >= 1.37
 
 %description gtk
 The mtr-gtk package provides the GTK+ interface for the mtr network
@@ -49,10 +50,10 @@ autoconf
 %configure --with-gtk --enable-ipv6
 make && mv mtr xmtr && make distclean
 %configure --without-gtk --enable-ipv6
-make
+make %{?_smp_mflags}
 
 %install
-if [ -d $RPM_BUILD_ROOT ]; then rm -rf $RPM_BUILD_ROOT; fi
+rm -rf $RPM_BUILD_ROOT
 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
@@ -67,8 +68,8 @@ install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/etc/pam.d/xmtr
 mkdir -p  $RPM_BUILD_ROOT/%{_bindir}
 ln -fs consolehelper $RPM_BUILD_ROOT/%{_bindir}/xmtr
 
-mkdir -p %{buildroot}/%{_datadir}/applications
-cat > %{buildroot}/%{_datadir}/applications/net-xmtr.desktop <<EOF
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications
+cat > $RPM_BUILD_ROOT/%{_datadir}/applications/net-xmtr.desktop <<EOF
 [Desktop Entry]
 Name=Traceroute
 Type=Application
@@ -82,17 +83,16 @@ Categories=X-Red-Hat-Base;System;Application;
 EOF
 
 %clean
-if [ -d $RPM_BUILD_ROOT ]; then rm -rf $RPM_BUILD_ROOT; fi
+rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%doc AUTHORS COPYING FORMATS INSTALL NEWS README SECURITY TODO
+%doc AUTHORS COPYING FORMATS NEWS README SECURITY
 %attr(0755,root,root) %{_sbindir}/mtr
 %{_mandir}/*/*
 
 %files gtk
 %defattr(-,root,root)
-%doc AUTHORS COPYING FORMATS INSTALL NEWS README SECURITY TODO
 %config(missingok) %{_datadir}/applications/net-xmtr.desktop
 %attr(0755,root,root) /usr/X11R6/bin/xmtr
 %{_bindir}/xmtr
@@ -101,6 +101,10 @@ if [ -d $RPM_BUILD_ROOT ]; then rm -rf $RPM_BUILD_ROOT; fi
 %{_datadir}/pixmaps/mtr_icon.xpm
 
 %changelog
+* Tue Aug 24 2004 Warren Togami <wtogami@redhat.com> 2:0.54-8
+- #121705 and other spec cleanups
+- remove redundant documentation
+
 * Thu Jul 01 2004 Phil Knirsch <pknirsch@redhat.com> 0.54-7
 - Fixed broken behaviour with resolver SERVFAIL results (#125392)
 - Added ncurses-devel libtermcap-devel as BuildPreReq (#124553)