diff --git a/.cvsignore b/.cvsignore
index 4e67359..b3a3d0c 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-tmpwatch-2.7.4.tar.gz
+tmpwatch-2.8.tar.gz
diff --git a/sources b/sources
index c0cf799..429f70f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-781d49a347be3a06b9e2540fbb6ed8e8  tmpwatch-2.7.4.tar.gz
+f647d44148ceb5a050eb6d908620a34a  tmpwatch-2.8.tar.gz
diff --git a/tmpwatch.spec b/tmpwatch.spec
index f5d6d71..2870112 100644
--- a/tmpwatch.spec
+++ b/tmpwatch.spec
@@ -1,9 +1,9 @@
 Summary: A utility for removing files based on when they were last accessed.
 Name: tmpwatch
-Version: 2.7.4
-Release: 1
-Source: tmpwatch-%{version}.tar.gz
-Copyright: GPL
+Version: 2.8
+Release: 2
+Source: %{name}-%{version}.tar.gz
+License: GPL
 Group: System Environment/Base
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Requires: psmisc
@@ -11,44 +11,57 @@ Requires: psmisc
 %description
 The tmpwatch utility recursively searches through specified
 directories and removes files which have not been accessed in a
-specified period of time.  Tmpwatch is normally used to clean up
-directories which are used for temporarily holding files (for example,
-/tmp).  Tmpwatch ignores symlinks, won't switch filesystems and only
-removes empty directories and regular files.
+specified period of time. Tmpwatch is normally used to clean up
+directories that are used for temporarily holding files (for example,
+/tmp). Tmpwatch ignores symlinks, will not switch filesystems, and
+only removes empty directories and regular files.
 
 %prep
 %setup -q
 
 %build
-make RPM_OPT_FLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE"
+make
 
 %install
 rm -rf %{buildroot}
-make PREFIX=%{buildroot} MANDIR=%{_mandir} install
+make PREFIX=%{buildroot} SBINDIR=%{_sbindir} MANDIR=%{_mandir} install
 
-( cd %{buildroot}
-  mkdir -p ./etc/cron.daily
-  echo '/usr/sbin/tmpwatch 240 /tmp' \
-	>> ./etc/cron.daily/tmpwatch
-  echo '/usr/sbin/tmpwatch 720 /var/tmp' \
-	>> ./etc/cron.daily/tmpwatch
-  echo 'for d in /var/{cache/man,catman}/{X11R6/cat?,cat?,local/cat?}; do
-    [ -d $d ] && /usr/sbin/tmpwatch -f 240 $d
-done' \
-	>> ./etc/cron.daily/tmpwatch
-  chmod +x ./etc/cron.daily/tmpwatch
-)
+mkdir -p %{buildroot}/etc/cron.daily
+cat > %{buildroot}/etc/cron.daily/tmpwatch <<EOF
+/usr/sbin/tmpwatch 240 /tmp
+/usr/sbin/tmpwatch 720 /var/tmp
+for d in /var/{cache/man,catman}/{cat?,X11R6/cat?,local/cat?}; do
+    if [ -d "\$d" ]; then
+	/usr/sbin/tmpwatch -f 720 \$d
+    fi
+done
+EOF
+chmod +x %{buildroot}/etc/cron.daily/tmpwatch
 
 %clean
 rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root)
-/usr/sbin/tmpwatch
+%{_sbindir}/tmpwatch
 %{_mandir}/man8/tmpwatch.8*
-%config /etc/cron.daily/tmpwatch
+%config(noreplace) /etc/cron.daily/tmpwatch
 
 %changelog
+* Wed Aug 29 2001 Preston Brown <pbrown@redhat.com>
+- cron script fix (#52785)
+
+* Tue Aug 28 2001 Preston Brown <pbrown@redhat.com>
+- rebuild for 5.x, 6.x, 7.x errata
+
+* Mon Aug 27 2001 Preston Brown <pbrown@redhat.com>
+- noreplace /etc/cron.daily/tmpwatch
+
+* Mon Aug  6 2001 Preston Brown <pbrown@redhat.com> 2.8-1
+- added a "nodirs" option which inhibits removal of empty directories.
+- Integrated race condition fixes from Martin Macok (#50148)
+- do not try to remove ext3 journal files (#50522)
+
 * Tue Jul  3 2001 Preston Brown <pbrown@redhat.com> 2.7.4-1
 - fix typo in cron script