diff --git a/ChangeLog b/ChangeLog
index d5e7dd7a..3a917a99 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,8 @@ v0.95.1		07-Jan-2008
 
 	mbselib.h:
 		Added file virscan function.
+		Added stream scanning for ClamAV, scanning is 10 times faster
+		compared to the commandline scanner.
 
 	mbtask:
 		Added last changes for MIB counters.
diff --git a/lib/virscan.c b/lib/virscan.c
index 26dd0c39..e8985e51 100644
--- a/lib/virscan.c
+++ b/lib/virscan.c
@@ -34,17 +34,150 @@
 
 extern pid_t	mypid;
 
+
+/*
+ * ClamAV stream check.
+ * Original written bu Laurent Wacrenier as part of the
+ * clamd-stream-client.
+ * Returns: 0 = Ok, no virus found.
+ *          1 = Virus found.
+ *          2 = Internal error.
+ */
+int clam_stream_check(char *server, char *port, char *filename)
+{
+    struct sockaddr_in	sa_in;
+    struct addrinfo	hints, *res;
+    int			s, ss, buf_len = 0, err;
+    char		buf[1024], *buf_c, *port_s;
+    FILE		*fp;
+
+    Syslog('f', "clam_stream_check(%s, %s, %s)", server, port, filename);
+    memset(&hints, 0, sizeof(hints));
+    hints.ai_family = PF_INET;
+    hints.ai_socktype = SOCK_STREAM;
+
+    if ((err = getaddrinfo(server, port, &hints, &res)) != 0) {
+	WriteError("getaddrinfo(%s:%s): %s\n", server, port, gai_strerror(err));
+	return 2;
+    }
+
+    while (res) {
+	s = socket(PF_INET, SOCK_STREAM, 0);
+	if (s == -1) {
+	    WriteError("$socket()");
+	    return 2;
+	}
+
+	if (connect(s, res->ai_addr, sizeof(struct sockaddr)) == -1) {
+	    struct sockaddr_in *sa = (struct sockaddr_in *)res->ai_addr;
+	    WriteError("$connect(%s:%d)", inet_ntoa(sa->sin_addr), (int)ntohs(sa->sin_port));
+	    res = res->ai_next;
+	    close(s);
+	} else {
+	    break;
+	}
+    }
+
+    if (res == NULL) {
+	WriteError("unable to connect to %s", server);
+	return 2;
+    }
+
+#define COMMAND "STREAM\r\n"
+
+    Syslog('f', "snd: %s", printable((char *)COMMAND, 0));
+    if (write(s, COMMAND, sizeof(COMMAND)-1) == -1) {
+	WriteError("$write()");
+	return 2;
+    }
+    if ((buf_len = read(s, buf, sizeof(buf)-1)) == -1) {
+	WriteError("$read()");
+	return 2;
+    }
+    Syslog('f', "got: %s", printable(buf, 0));
+	  
+    buf[buf_len] = 0;
+    if (strncasecmp(buf, "PORT ", sizeof("PORT ") -1) != 0) {
+	return 2;
+    }
+	      
+    port_s = buf + sizeof("PORT ") -1;
+    while(*port_s == ' ') port_s ++;
+
+    memcpy(&sa_in, res->ai_addr, sizeof(sa_in));
+    sa_in.sin_port = htons(strtoul(port_s, NULL, 10));
+    sa_in.sin_family = AF_INET;
+    ss = socket(PF_INET, SOCK_STREAM, 0);
+    if (ss == -1) {
+	WriteError("$socket()");
+	return 2;
+    }
+
+    sa_in.sin_port = htons(strtoul(port_s, NULL, 10));
+    if (connect(ss, (struct sockaddr *)&sa_in, sizeof(struct sockaddr_in)) == -1) {
+	WriteError("$connect2()");
+	return 2;
+    }
+
+    if ((fp = fopen(filename, "r")) == NULL) {
+	WriteError("$can't open %s", filename);
+	return 2;
+    }
+
+    while ((buf_len = fread(buf, 1, sizeof(buf), fp)) > 0) {
+	if (write(ss, buf, buf_len) == -1) {
+	    if (errno == EPIPE)
+		break;
+	    WriteError("$write2()");
+	    return 2;
+	}
+    }
+    if (buf_len == 0 && ferror(fp)) {
+	WriteError("$read2()");
+	return 2;
+    }
+    close(ss);
+
+    if ((buf_len = read(s, buf, sizeof(buf)-1)) == -1) { 
+	WriteError("$read3()");
+	return 2;
+    }
+    buf[buf_len] = 0;
+    Syslog('f', "res: %s", printable(buf, 0));
+
+    /*  fwrite(buf, 1, buf_len, stderr); */
+    buf_c = buf + buf_len;
+    while(*buf_c=='\r' || *buf_c == '\r' || *buf_c == ' ')
+	*buf_c --;
+    if (buf_c - buf >= sizeof(" FOUND") && strncasecmp(buf_c - sizeof(" FOUND"), " FOUND", sizeof(" FOUND")-1) == 0) {
+	char *buf_s = buf;
+	buf_c -= sizeof(" FOUND");
+	if (strncasecmp(buf_s, "stream:", sizeof("stream:")-1) == 0) {
+	    buf_s += sizeof("stream:")-1;
+	    while(*buf_s == ' ') 
+		buf_s ++;
+	    Syslog('!', "ClamAV stream check, virus found: %.*s", (int)(buf_c - buf_s), buf_s);
+	}
+	return 1;
+    }
+
+    Syslog('f', "clam_stream_check(): no virus found");
+    return 0;
+}
+
+
+
 /*
  *  Virusscan on a file.
  */
 int VirScanFile(char *filename)
 {
-    char    *temp, *stdlog, *errlog, buf[256];
-    FILE    *fp, *lp;
-    int	    vrc, rc = FALSE, has_scan = FALSE;
+    char    		*temp, *stdlog, *errlog, buf[256], *port;
+    FILE    		*fp, *lp;
+    int	    		vrc, rc = FALSE, has_scan = FALSE;
 
     temp = calloc(PATH_MAX, sizeof(char));
-    snprintf(temp,   PATH_MAX, "%s/etc/virscan.data", getenv("MBSE_ROOT"));
+    snprintf(temp, PATH_MAX, "%s/etc/virscan.data", getenv("MBSE_ROOT"));
 
     if ((fp = fopen(temp, "r")) == NULL) {
 	WriteError("No virus scanners defined");
@@ -54,13 +187,16 @@ int VirScanFile(char *filename)
     fread(&virscanhdr, sizeof(virscanhdr), 1, fp);
 
     while (fread(&virscan, virscanhdr.recsize, 1, fp) == 1) {
-	if (virscan.available) {
+	if (virscan.available && (virscan.scantype == SCAN_EXTERN)) {
 	    if (file_exist(virscan.scanner, X_OK) == 0) {
 	    	has_scan = TRUE;
 	    } else {
 		Syslog('+', "Warning: virusscanner %s marked active but not present", virscan.comment);
 	    }
 	}
+	if (virscan.available && (virscan.scantype != SCAN_EXTERN)) {
+	    has_scan = TRUE;
+	}
     }
     if (!has_scan) {
 	Syslog('+', "No active virus scanners, skipping scan");
@@ -76,34 +212,48 @@ int VirScanFile(char *filename)
 
     fseek(fp, virscanhdr.hdrsize, SEEK_SET);
     while (fread(&virscan, virscanhdr.recsize, 1, fp) == 1) {
-        if (virscan.available && (file_exist(virscan.scanner, X_OK) ==0)) {
+        if (virscan.available) {
 	    Syslog('+', "Scanning %s with %s", filename, virscan.comment);
 	    Altime(3600);
-	    vrc = execute_str(virscan.scanner, virscan.options, filename, (char *)"/dev/null", stdlog, errlog);
-	    if (file_size(stdlog)) {
-		if ((lp = fopen(stdlog, "r"))) {
-		    while (fgets(buf, sizeof(buf) -1, lp)) {
-			Striplf(buf);
-			Syslog('+', "stdout: \"%s\"", printable(buf, 0));
-		    }
-		    fclose(lp);
-		}
+	    switch (virscan.scantype) {
+		case SCAN_EXTERN:	if (file_exist(virscan.scanner, X_OK) ==0) {
+					    vrc = execute_str(virscan.scanner, virscan.options, filename, (char *)"/dev/null", stdlog, errlog);
+					    if (file_size(stdlog)) {
+						if ((lp = fopen(stdlog, "r"))) {
+						    while (fgets(buf, sizeof(buf) -1, lp)) {
+							Striplf(buf);
+							Syslog('+', "stdout: \"%s\"", printable(buf, 0));
+						    }
+						    fclose(lp);
+						}
+					    }
+					    if (file_size(errlog)) {
+						if ((lp = fopen(errlog, "r"))) {
+						    while (fgets(buf, sizeof(buf) -1, lp)) {
+							Striplf(buf);
+							Syslog('+', "stderr: \"%s\"", printable(buf, 0));
+						    }
+						    fclose(lp);
+						}
+					    }
+					    unlink(stdlog);
+					    unlink(errlog);
+					    if (vrc != virscan.error) {
+						Syslog('!', "Virus found by %s", virscan.comment);
+						rc = TRUE;
+					    }
+					}
+					break;
+		case CLAM_STREAM:	port = calloc(21, sizeof(char));
+					snprintf(port, 20, "%d", virscan.port);
+					if ((clam_stream_check(virscan.host, port, filename) == 1)) {
+					    rc = TRUE;
+					}
+					break;
+		case FP_STREAM:
+					break;
 	    }
-	    if (file_size(errlog)) {
-		if ((lp = fopen(errlog, "r"))) {
-		    while (fgets(buf, sizeof(buf) -1, lp)) {
-			Striplf(buf);
-			Syslog('+', "stderr: \"%s\"", printable(buf, 0));
-		    }
-		    fclose(lp);
-		}
-	    }
-	    unlink(stdlog);
-	    unlink(errlog);
-            if (vrc != virscan.error) {
-                Syslog('!', "Virus found by %s", virscan.comment);
-		rc = TRUE;
-            }
+
 	    Altime(0);
 	    Nopper();
         }