diff --git a/.cvsignore b/.cvsignore
index d4b0966..dddcc07 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-tmpwatch-2.9.7.tar.gz
+tmpwatch-2.9.8.tar.gz
diff --git a/sources b/sources
index adf58f0..15cc245 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-25a4b60610fbbd8e8b3b7b741ddb90aa  tmpwatch-2.9.7.tar.gz
+04b7a31065d067ffb05b371afe123967  tmpwatch-2.9.8.tar.gz
diff --git a/tmpwatch.spec b/tmpwatch.spec
index 26970f9..ab632df 100644
--- a/tmpwatch.spec
+++ b/tmpwatch.spec
@@ -1,7 +1,7 @@
-Summary: A utility for removing files based on when they were last accessed.
+Summary: A utility for removing files based on when they were last accessed
 Name: tmpwatch
-Version: 2.9.7
-Release: 1.1
+Version: 2.9.8
+Release: 1
 Source: %{name}-%{version}.tar.gz
 License: GPL
 Group: System Environment/Base
@@ -28,12 +28,13 @@ make ROOT=%{buildroot} SBINDIR=%{_sbindir} MANDIR=%{_mandir} install
 
 mkdir -p %{buildroot}/etc/cron.daily
 cat > %{buildroot}/etc/cron.daily/tmpwatch <<\EOF
+#! /bin/sh
 /usr/sbin/tmpwatch -x /tmp/.X11-unix -x /tmp/.XIM-unix -x /tmp/.font-unix \
-	-x /tmp/.ICE-unix -x /tmp/.Test-unix 240 /tmp
-/usr/sbin/tmpwatch 720 /var/tmp
+	-x /tmp/.ICE-unix -x /tmp/.Test-unix 10d /tmp
+/usr/sbin/tmpwatch 30d /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"
+	/usr/sbin/tmpwatch -f 30d "$d"
     fi
 done
 EOF
@@ -49,6 +50,12 @@ rm -rf %{buildroot}
 %config(noreplace) /etc/cron.daily/tmpwatch
 
 %changelog
+* Wed Nov  1 2006 Miloslav Trmac <mitr@redhat.com> - 2.9.8-1
+- Add optional unit suffix to the "hours" (now "time") parameter (original
+  patch by Alan J Rosenthal <flaps@dgp.toronto.edu>)
+- Fix some format string vs. arguments mismatches
+- Fix some rpmlint warnings
+
 * Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 2.9.7-1.1
 - rebuild
 
@@ -228,7 +235,7 @@ rm -rf %{buildroot}
 
 * Wed Oct 22 1997 Erik Troan <ewt@redhat.com>
 - added man page to package
-- uses a buildroot and %attr
+- uses a buildroot and %%attr
 - fixed error message generation for directories
 - fixed flag propagation