diff --git a/ChangeLog b/ChangeLog
index bd75bacb1..297c28d01 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jun  2 17:49:50 CEST 2008 (tk)
+----------------------------------
+  * clamdscan/clamdscan.c: don't show scan summary when clamd cannot be
+			   contacted (bb#1041)
+
 Mon Jun  2 17:59:15 EEST 2008 (edwin)
 -------------------------------------
   * libclamav/hashtab.[ch], scanners.c: avoid using C99 flexible array members
diff --git a/clamdscan/clamdscan.c b/clamdscan/clamdscan.c
index bd4ea4f86..bfc88834b 100644
--- a/clamdscan/clamdscan.c
+++ b/clamdscan/clamdscan.c
@@ -122,7 +122,7 @@ int main(int argc, char **argv)
     ret = client(opt, &infected);
 
     /* TODO: Implement STATUS in clamd */
-    if(!opt_check(opt, "disable-summary") && !opt_check(opt, "no-summary")) {
+    if((infected || ret != 2) && !opt_check(opt, "disable-summary") && !opt_check(opt, "no-summary")) {
 	gettimeofday(&t2, &tz);
 	ds = t2.tv_sec - t1.tv_sec;
 	dms = t2.tv_usec - t1.tv_usec;