diff --git a/ChangeLog b/ChangeLog
index b6780eb..a772888 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-01-15 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
+
+	* redhat/quagga.spec.in: Fix postun script to avoid misleading error
+	  message saying the postun scriptlet failed when watchquagga
+	  is not running.
+
 2005-01-12 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
 
 	* configure.ac: Test for header file <ucontext.h> (for use in
diff --git a/redhat/quagga.spec.in b/redhat/quagga.spec.in
index b22ebc5..e45ec1f 100644
--- a/redhat/quagga.spec.in
+++ b/redhat/quagga.spec.in
@@ -306,8 +306,9 @@
 			/etc/rc.d/init.d/$daemon start >/dev/null 2>&1
 	done
 	# Start watchquagga last.
+	# Avoid postun scriptlet error if watchquagga is not running. 
 	[ "$running_watchquagga" = yes ] && \
-		/etc/rc.d/init.d/watchquagga start >/dev/null 2>&1
+		/etc/rc.d/init.d/watchquagga start >/dev/null 2>&1 || :
 fi
 
 %preun