diff --git a/clamav-devel/ChangeLog b/clamav-devel/ChangeLog
index e1fb777e8..fe04fed23 100644
--- a/clamav-devel/ChangeLog
+++ b/clamav-devel/ChangeLog
@@ -1,3 +1,8 @@
+Sat Feb 21 13:38:23 CET 2004 (tk)
+---------------------------------
+  * libclamav: fixed various segmentation faults introduced by a small bug
+	       in the yesterday's patch from Phil Oleson. Thanks to Nigel.
+
 Sat Feb 21 11:09:12 GMT 2004 (njh)
 ----------------------------------
   * clamav-milter:	Don't run if the quarantine-dir is publically accessable
diff --git a/clamav-devel/libclamav/others.c b/clamav-devel/libclamav/others.c
index 8bcf72df6..7fad469da 100644
--- a/clamav-devel/libclamav/others.c
+++ b/clamav-devel/libclamav/others.c
@@ -306,9 +306,7 @@ char *cl_gentemp(const char *dir)
 	cli_dbgmsg("cl_gentemp('%s'): out of memory\n", dir);
 	return NULL;
     }
-    cnt += sprintf(name, "%s", mdir);
-    if(!strrchr(name, '/'))
-        strcat(name, '/');
+    cnt += sprintf(name, "%s/", mdir);
 
     do {
 	for(i = 0; i < 32; i++)