diff --git a/ChangeLog b/ChangeLog
index 4255179f..17b828b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -63,7 +63,10 @@ v0.35.05	19-Oct-2002
 		Email posted in the email box in full domain mode was refused
 		by SMTP servers because of bad address formatting.
 		Addex extra check to prevent overflow of arcmail packets
-		extension.
+		extension. This is logged with a warning when this happens.
+		If filenames were exhausted and the last one (ending on z) is
+		truncated in the outbound (has been sent already) it is erased
+		before the archiver is called to reuse that filename again.
 
 	mbtask:
 		Removed debug logging of "does" info.
diff --git a/TODO b/TODO
index a8a965b7..094f3090 100644
--- a/TODO
+++ b/TODO
@@ -93,6 +93,12 @@ mbcico:
 
 	N: Implement MD5 crypt in binkp protocol driver.
 
+	N: Doesn't poll internet nodes with non-standard ports when the
+	   FQDN:port is in the override field.
+
+	N: See if it is possible with binkp protocol to resume aborted
+	   transfers.
+
 mbfile:
 	N: Add a check to see if the magic filenames are (still) valid.
 
diff --git a/mbfido/queue.c b/mbfido/queue.c
index 45a7a992..9cef94b2 100644
--- a/mbfido/queue.c
+++ b/mbfido/queue.c
@@ -321,6 +321,7 @@ void flush_dir(char *ndir)
 			nr = 'a';
 		    arcfile[strlen(arcfile) -1] = nr;
 		} else {
+		    Syslog('!', "Warning: archive filename extensions exhausted for today");
 		    break;
 		}
 	    } else if (CFG.maxarcsize && (fsize > (CFG.maxarcsize * 1024)) && (nr < maxnr)) {
@@ -355,6 +356,18 @@ void flush_dir(char *ndir)
 
 	fsize = file_size(arcfile);
 
+	/*
+	 * If arcfile names were exhausted then the file ending on a z could still
+	 * be in the outbound but truncated if it has been sent. Since we are
+	 * reusing that filename (not a good solution) we must erase it or the
+	 * archiver program will complain.
+	 */
+	if (fsize == 0L) {
+	    Syslog('m', "Erasing zero bytes file %s", arcfile);
+	    unlink(arcfile);
+	    Attach = TRUE;
+	}
+
 	if (first) {
 	    Syslog('+', "Pack ARCmail for %s, via %s", aka2str(nodenr), ascfnode(&noden, 0x1f));
 	    if (!do_quiet) {