diff --git a/ChangeLog b/ChangeLog
index 009ff5d5..4255179f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,8 @@ v0.35.05	19-Oct-2002
 	upgrade:
 		Start mbsetup, go into global configuration, leave it and 
 		save.
+		Start mbsetup, check all nodes if the Pack mail flag is ok,
+		this setting now also affects echomail!
 
 	general:
 		This may become release 0.36.00
@@ -46,7 +48,7 @@ v0.35.05	19-Oct-2002
 		Pause.
 		Removed the default Virnet record from the fidonet setup.
 		In node setup the pack netmail switch is renamed and is now 
-		for all mail.
+		for all mail. Default for new records is Yes.
 		Added length check when importing taglines.
 
 	mbfido:
@@ -60,6 +62,8 @@ v0.35.05	19-Oct-2002
 		Statistics count for exported echomail now works.
 		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.
 
 	mbtask:
 		Removed debug logging of "does" info.
diff --git a/FILE_ID.DIZ.in b/FILE_ID.DIZ.in
index 23a13cde..4717149e 100644
--- a/FILE_ID.DIZ.in
+++ b/FILE_ID.DIZ.in
@@ -16,7 +16,7 @@ and host systems.
 Internal mail format is JAM (c) messagebase.
 Full tic file support, including extended
 tic files.
-OS: Linux and FreeBSD (untested).
+OS: Linux, NetBSD and FreeBSD.
 Originating sites 2:280/2802@fidonet and
 http://mbse.sourceforge.net/
 Copyright by Michiel Broek.
diff --git a/mbfido/queue.c b/mbfido/queue.c
index 03d2987a..45a7a992 100644
--- a/mbfido/queue.c
+++ b/mbfido/queue.c
@@ -315,10 +315,14 @@ void flush_dir(char *ndir)
 		/*
 		 * Increase filename extension if there is a truncated file of today.
 		 */
-		nr++;
-		if (nr == ('9' +1))
-		    nr = 'a';
-		arcfile[strlen(arcfile) -1] = nr;
+		if (nr < maxnr) {
+		    nr++;
+		    if (nr == ('9' +1))
+			nr = 'a';
+		    arcfile[strlen(arcfile) -1] = nr;
+		} else {
+		    break;
+		}
 	    } else if (CFG.maxarcsize && (fsize > (CFG.maxarcsize * 1024)) && (nr < maxnr)) {
 		/*
 		 * Use a new ARCmail file if the last one is too big.
diff --git a/mbsetup/m_node.c b/mbsetup/m_node.c
index 901cfb39..08179961 100644
--- a/mbsetup/m_node.c
+++ b/mbsetup/m_node.c
@@ -299,6 +299,7 @@ int AppendNoderec(void)
 	nodes.Notify = FALSE;
 	nodes.AdvTic = FALSE;
 	nodes.Hold = TRUE;
+	nodes.PackNetmail = TRUE;
 	nodes.ARCmailCompat = TRUE;
 	nodes.ARCmailAlpha = TRUE;
 	nodes.StartDate = time(NULL);