diff --git a/ChangeLog b/ChangeLog
index 76915d6c0..d268a19fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Mar  1 16:21:48 CET 2007 (tk)
+---------------------------------
+  * shared/output.c: fix handling of special characters in mprintf (bb#360)
+
 Thu Mar  1 14:56:44 GMT 2007 (njh)
 ----------------------------------
   * libclamav/mbox.c:	Fix bug 358
diff --git a/shared/output.c b/shared/output.c
index 782601045..47f9cf4d6 100644
--- a/shared/output.c
+++ b/shared/output.c
@@ -287,20 +287,20 @@ void mprintf(const char *str, ...)
     vsnprintf(buff, sizeof(buff), str, args);
     va_end(args);
 
-    if(buff[0] == '!') {
+    if(*str == '!') {
        if(!mprintf_stdout)
            fd = stderr;
 	fprintf(fd, "ERROR: %s", &buff[1]);
-    } else if(buff[0] == '@') {
+    } else if(*str == '@') {
        if(!mprintf_stdout)
            fd = stderr;
 	fprintf(fd, "ERROR: %s", &buff[1]);
     } else if(!mprintf_quiet) {
-	if(buff[0] == '^') {
+	if(*str == '^') {
            if(!mprintf_stdout)
                fd = stderr;
 	    fprintf(fd, "WARNING: %s", &buff[1]);
-	} else if(buff[0] == '*') {
+	} else if(*str == '*') {
 	    if(mprintf_verbose)
 		fprintf(fd, "%s", &buff[1]);
 	} else fprintf(fd, "%s", buff);