diff --git a/clamav-devel/ChangeLog b/clamav-devel/ChangeLog
index dbfd148d5..06c2f52cf 100644
--- a/clamav-devel/ChangeLog
+++ b/clamav-devel/ChangeLog
@@ -1,3 +1,10 @@
+Sat Jun 12 19:21:44 CEST 2004 (tk)
+----------------------------------
+  * shared/cfgparser: freecfg: fix loop when some directives are doubled in
+		      config file (bug found by Ole Craig <olc*cs.umass.edu>)
+  * libclamav: scanners: add 'X-Real-To: ' mail type (thanks to Andrey
+			 J. Melnikoff (TEMHOTA) <temnota*kmv.ru>)
+
 Sat Jun 12 17:32:31 CEST 2004 (tk)
 ----------------------------------
   * libclamav: fix problem with {set,init}groups on Windows SFU 3.5 (reported
diff --git a/clamav-devel/clamav-config b/clamav-devel/clamav-config
index 721edc0e2..730d1e622 100755
--- a/clamav-devel/clamav-config
+++ b/clamav-devel/clamav-config
@@ -46,7 +46,7 @@ while test $# -gt 0; do
 	;;
 
     --version)
-	echo devel-20040611
+	echo devel-20040612
 	exit 0
 	;;
 
diff --git a/clamav-devel/libclamav/pe.c b/clamav-devel/libclamav/pe.c
index 41625499f..e1779e981 100644
--- a/clamav-devel/libclamav/pe.c
+++ b/clamav-devel/libclamav/pe.c
@@ -446,7 +446,7 @@ int cli_scanpe(int desc, const char **virname, long int *scanned, const struct c
 	    }
 
 	    if(upxfn(src, ssize, dest, dsize)) {
-		cli_dbg("UPX decompression failed\n");
+		cli_dbgmsg("UPX decompression failed\n");
 	    } else {
 		    int ndesc;
 
diff --git a/clamav-devel/libclamav/scanners.c b/clamav-devel/libclamav/scanners.c
index 6fddaa437..4c8576f16 100644
--- a/clamav-devel/libclamav/scanners.c
+++ b/clamav-devel/libclamav/scanners.c
@@ -101,6 +101,7 @@ static const struct cli_magic_s cli_magic[] = {
     {0,  "X-Original-To: ",		15, "Mail",		  CL_MAILFILE},
     {0,  "X-Symantec-",			11, "Symantec",		  CL_MAILFILE},
     {0,  "X-EVS",			 5, "EVS mail",		  CL_MAILFILE},
+    {0,  "X-Real-To: ",                 11, "Mail",               CL_MAILFILE},
     {0,  ">From ",			 6, "Mail",		  CL_MAILFILE},
     {0,  "Date: ",			 6, "Mail",		  CL_MAILFILE},
     {0,  "Message-Id: ",		12, "Mail",		  CL_MAILFILE},
diff --git a/clamav-devel/shared/cfgparser.c b/clamav-devel/shared/cfgparser.c
index 3e84fb3cc..f253788be 100644
--- a/clamav-devel/shared/cfgparser.c
+++ b/clamav-devel/shared/cfgparser.c
@@ -238,14 +238,15 @@ void freecfg(struct cfgstruct *copt)
 
     while (copt) {
 	arg = copt->nextarg;
-	while (arg) {
+	while(arg) {
 	    if(arg->strarg) {
 		free(arg->optname);
 		free(arg->strarg);
 		handler = arg;
-		arg=arg->nextarg;
+		arg = arg->nextarg;
 		free(handler);
-	    }
+	    } else
+		arg = arg->nextarg;
 	}
 	if(copt->optname) {
 	    free(copt->optname);