diff --git a/.cvsignore b/.cvsignore
index ba63e37..cbccc07 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-tmpwatch-2.9.10.tar.gz
+tmpwatch-2.9.11.tar.bz2
diff --git a/sources b/sources
index de2ab29..b249320 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4fdcefdb36bc6c8ef5fea26eb4f1a2e3  tmpwatch-2.9.10.tar.gz
+4508aaaf26cb3d6c5cb313fb7eb93ce2  tmpwatch-2.9.11.tar.bz2
diff --git a/tmpwatch.daily b/tmpwatch.daily
new file mode 100644
index 0000000..9fcc2c7
--- /dev/null
+++ b/tmpwatch.daily
@@ -0,0 +1,9 @@
+#! /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 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 30d "$d"
+    fi
+done
diff --git a/tmpwatch.spec b/tmpwatch.spec
index 6c9ff79..5bc2a5b 100644
--- a/tmpwatch.spec
+++ b/tmpwatch.spec
@@ -1,8 +1,9 @@
 Summary: A utility for removing files based on when they were last accessed
 Name: tmpwatch
-Version: 2.9.10
+Version: 2.9.11
 Release: 1
-Source: %{name}-%{version}.tar.gz
+Source0: %{name}-%{version}.tar.bz2
+Source1: tmpwatch.daily
 License: GPL
 Group: System Environment/Base
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -27,17 +28,7 @@ rm -rf %{buildroot}
 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 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 30d "$d"
-    fi
-done
-EOF
+cp %{SOURCE1} %{buildroot}/etc/cron.daily/tmpwatch
 chmod +x %{buildroot}/etc/cron.daily/tmpwatch
 
 %clean
@@ -50,6 +41,12 @@ rm -rf %{buildroot}
 %config(noreplace) /etc/cron.daily/tmpwatch
 
 %changelog
+* Sat Mar 31 2007 Miloslav Trmac <mitr@redhat.com> - 2.9.11-1
+- Fix a misleading message in --test
+  Resolves: 234596
+- Compress the tarball using bzip2
+- Move the cron.daily script to a separate source file
+
 * Sun Nov  5 2006 Miloslav Trmac <mitr@redhat.com> - 2.9.10-1
 - Reallow --exclude with nonexistent paths
   Resolves: 214034