diff --git a/ChangeLog b/ChangeLog
index f07f6f8d..2543944c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -68,6 +68,8 @@ v0.51.4		11-Apr-2004
 		wrong line terminaters (Sempoint).
 		Added new experimental files database code which will only be
                 used if configured with --enable-experiment.
+		The users tag directory wasn't properly cleaned before a new
+		download session.
 
 	mball:
 		Added new experimental files database code which will only be
diff --git a/mbsebbs/file.c b/mbsebbs/file.c
index 1d6939ee..06b21ac9 100644
--- a/mbsebbs/file.c
+++ b/mbsebbs/file.c
@@ -224,7 +224,12 @@ void Download(void)
     Enter(2);
     OldArea = iAreaNumber;
     WhosDoingWhat(DOWNLOAD, NULL);
-    execute_pth((char *)"rm", (char *)"-f ./tag/*", (char *)"/dev/null", (char *)"/dev/null", (char *)"/dev/null");
+    temp = calloc(PATH_MAX, sizeof(char));
+    sprintf(temp, "-rf %s/%s/tag", CFG.bbs_usersdir, exitinfo.Name);
+    execute_pth((char *)"rm", temp, (char *)"/dev/null", (char *)"/dev/null", (char *)"/dev/null");
+    sprintf(temp, "%s/%s/tag", CFG.bbs_usersdir, exitinfo.Name);
+    CheckDir(temp);
+    free(temp);
 
     if ((tf = fopen("taglist", "r+")) == NULL) {
 	Syslog('+', "Download command but no files marked");