diff --git a/.cvsignore b/.cvsignore
index 75a9eba..0349f88 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-mrtg-2.9.6.tar.gz
+mrtg-2.9.17.tar.gz
diff --git a/mrtg.spec b/mrtg.spec
index e47a20a..db515e7 100644
--- a/mrtg.spec
+++ b/mrtg.spec
@@ -2,14 +2,14 @@
 
 Summary:   Multi Router Traffic Grapher
 Name:      mrtg
-Version:   2.9.6
-Release:   6
+Version:   2.9.17
+Release:   3
 URL:       http://ee-staff.ethz.ch/~oetiker/webtools/mrtg/mrtg.html
 Source0:   http://www.ee.ethz.ch/~oetiker/webtools/mrtg/pub/%{name}-%{version}.tar.gz
 Source1:   mrtg.cfg
 Source2:   README-14allcgi
 Source3:   14all.cgi
-Copyright: distributable
+License:   GPL
 Group:     Applications/Internet
 Requires:  perl >= 5.004
 Requires:  gd
@@ -24,27 +24,23 @@ images which provide a LIVE visual representation of this traffic.
 %prep
 %setup -q
 
-echo "Removing..."
-find . -name "*.orig" -print -exec rm -f {} \;
-
 %build
-LDFLAGS="-lgd -lpng -lz -lfreetype"; export LDFLAGS; %configure
+LIBS="-lgd -lpng -lz -lfreetype"; export LIBS
+%configure
 make
-
-cd contrib
-find . -type f -exec /usr/bin/perl -e 's/^#!\/.*/#!\/usr\/bin\/perl/gi' -p -i \{\} \;
-find . -name "*.pl" -exec perl -e 's;\015;;gi' -p -i \{\} \;
+find contrib -type f -exec /usr/bin/perl -e 's,^#!/.*,#!%{__perl},gi' -p -i \{\} \;
+find contrib -name "*.pl" -exec perl -e 's;\015;;gi' -p -i \{\} \;
 
 %install
 rm -rf   $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/etc/mrtg
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/mrtg
 mkdir -p $RPM_BUILD_ROOT%{contentdir}
-mkdir -p $RPM_BUILD_ROOT/usr/bin
-mkdir -p $RPM_BUILD_ROOT/usr/lib/mrtg2/Pod
+mkdir -p $RPM_BUILD_ROOT%{_bindir}
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/mrtg2/Pod
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
 
-install -m 644 doc/*.png  $RPM_BUILD_ROOT%{contentdir}
-install -m 644 doc/*.html $RPM_BUILD_ROOT%{contentdir}
+install -m 644 images/*   $RPM_BUILD_ROOT%{contentdir}/
+install -m 644 doc/*.html $RPM_BUILD_ROOT%{contentdir}/
 install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/etc/mrtg
 perl -e 's|\@WORKDIR@|%{contentdir}|g' -pi $RPM_BUILD_ROOT/etc/mrtg/mrtg.cfg
 
@@ -52,15 +48,15 @@ install -m 644 %{SOURCE2} contrib/14all/README
 install -m 755 %{SOURCE3} contrib/14all
 
 for i in bin/mrtg bin/rateup bin/cfgmaker bin/indexmaker; do
-  install -m 755 -c $i $RPM_BUILD_ROOT/usr/bin/
+  install -m 755 -c $i $RPM_BUILD_ROOT%{_bindir}/
 done
 
 for i in lib/mrtg2/*.pm; do
-	install -m 644 $i $RPM_BUILD_ROOT/usr/lib/mrtg2/
+	install -m 644 $i $RPM_BUILD_ROOT%{_libdir}/mrtg2/
 done
 
 for i in lib/mrtg2/Pod/*.pm; do
-	install -m 644 $i $RPM_BUILD_ROOT/usr/lib/mrtg2/Pod/
+	install -m 644 $i $RPM_BUILD_ROOT%{_libdir}/mrtg2/Pod/
 done
 
 for i in doc/*.1; do
@@ -68,15 +64,16 @@ for i in doc/*.1; do
 done 
 
 %post
-if ! grep '* * * * root /usr/bin/mrtg' /etc/crontab > /dev/null; then
+if ! grep '* * * * root %{_bindir}/mrtg' /etc/crontab > /dev/null; then
 	echo "" >> /etc/crontab
-	echo "0-59/5 * * * * root /usr/bin/mrtg /etc/mrtg/mrtg.cfg" >> /etc/crontab
+	echo "0-59/5 * * * * root %{_bindir}/mrtg %{_sysconfdir}/mrtg/mrtg.cfg" >> /etc/crontab
 fi
 
 %postun
 if [ $1 = 0 ]; then
-	grep -v '* * * * root /usr/bin/mrtg' /etc/crontab > /etc/crontab.new
-	mv /etc/crontab.new /etc/crontab
+	grep -v '* * * * root %{_bindir}/mrtg' /etc/crontab > /etc/crontab.new &&\
+	cat /etc/crontab.new > /etc/crontab &&
+	rm /etc/crontab.new
 fi
 
 %clean
@@ -84,18 +81,27 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%doc 				contrib/
-%doc 				ANNOUNCE CHANGES COPYING COPYRIGHT MANIFEST README 
-%dir				/etc/mrtg
-%dir				/usr/lib/mrtg2
-%dir				%{contentdir}
-%config(noreplace) 	/etc/mrtg/mrtg.cfg
-%{contentdir}/*
-/usr/bin/*
-/usr/lib/mrtg2/*
-%{_mandir}/man1/*
+%doc contrib ANNOUNCE CHANGES COPYING COPYRIGHT MANIFEST README THANKS
+%dir %{_sysconfdir}/mrtg
+%config(noreplace) %{_sysconfdir}/mrtg/mrtg.cfg
+%{contentdir}
+%{_bindir}/*
+%{_libdir}/mrtg2
+%{_mandir}/*/*
 
 %changelog
+* Fri Feb 22 2002 Nalin Dahyabhai <nalin@redhat.com> 2.9.17-3
+- rebuild
+
+* Wed Jan 09 2002 Tim Powers <timp@redhat.com>
+- automated rebuild
+
+* Wed Nov  1 2001 Nalin Dahyabhai <nalin@redhat.com> 2.9.17-1
+- update to 2.9.17
+- use FHS macros
+- install the .gif files as well
+- copyright: distributable -> license: GPL
+
 * Tue Jul  3 2001 Tim Powers <timp@redhat.com>
 - changed description to indicate that it creates PNG images and not GIF images
 
diff --git a/sources b/sources
index de54148..27505d8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9659338e8b52fba6022a11af56aa5031  mrtg-2.9.6.tar.gz
+fdddc249de0c8e63f1af4b994248133b  mrtg-2.9.17.tar.gz