diff --git a/logwatch-7.3.6-clamav-milter.patch b/logwatch-7.3.6-clamav-milter.patch
new file mode 100644
index 0000000..c546a53
--- /dev/null
+++ b/logwatch-7.3.6-clamav-milter.patch
@@ -0,0 +1,14 @@
+diff -up logwatch-7.3.6/scripts/services/clamav-milter.pom logwatch-7.3.6/scripts/services/clamav-milter
+--- logwatch-7.3.6/scripts/services/clamav-milter.pom	2006-12-15 05:58:30.000000000 +0100
++++ logwatch-7.3.6/scripts/services/clamav-milter	2007-11-06 15:02:42.000000000 +0100
+@@ -16,7 +16,9 @@ while (defined($ThisLine = <STDIN>)) {
+        ( $ThisLine =~ /^clamav-milter (startup|shutdown) succeeded$/ ) or
+        ( $ThisLine =~ /^Quarantined infected mail as/ ) or 
+        ( $ThisLine =~ /^File quarantined as/ ) or
+-       ( $ThisLine =~ /^ClamAv: mi_stop/ )) {
++       ( $ThisLine =~ /^ClamAv: mi_stop/ ) or
++       ( $ThisLine =~ m#^\/tmp\/clamav-.* .* FOUND# )) {
++       
+        # We do not care about these.
+    } elsif (($ThisLine =~ /clean message from/)) {
+       $CleanMessage++;
diff --git a/logwatch.spec b/logwatch.spec
index bb291ff..fc38337 100644
--- a/logwatch.spec
+++ b/logwatch.spec
@@ -1,7 +1,7 @@
 Summary: A log file analysis program
 Name: logwatch
 Version: 7.3.6
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: MIT
 Group: Applications/System
 URL: http://www.logwatch.org/
@@ -26,6 +26,7 @@ Patch19: logwatch-7.3.6-pam_unix2.patch
 Patch20: logwatch-7.3.6-secure1.patch
 Patch21: logwatch-7.3.6-sudo.patch
 Patch22: logwatch-7.3.6-sshd1.patch
+Patch23: logwatch-7.3.6-clamav-milter.patch
 
 Requires: textutils sh-utils grep mailx
 Requires: perl(Date::Manip)
@@ -60,6 +61,7 @@ of the package on many systems.
 %patch20 -p1
 %patch21 -p1
 %patch22 -p1
+%patch23 -p1
 
 %build
 
@@ -172,6 +174,10 @@ rm -rf %{buildroot}
 %doc License project/CHANGES 
 
 %changelog
+* Tue Nov  6 2007 Ivana Varekova <varekova@redhat.com> 7.3.6-11
+- Resolves: #361921
+  fix clamav-milter service
+
 * Tue Oct 30 2007 Ivana Varekova <varekova@redhat.com> 7.3.6-10
 - add perl requirement (#356481)