diff --git a/TODO b/TODO
index 4ada0b3b..a58e5214 100644
--- a/TODO
+++ b/TODO
@@ -83,6 +83,8 @@ mbfido:
 	N: Force processing of arealists so that all tags are forced to
 	   uppercase. Seems to give problems in some nets.
 
+	N: Let mbfido areas with a special switch update area descriptions.
+
 mbcico:
 	N: Implement MD5 crypt in binkp protocol driver.
 
diff --git a/mbsetup/m_marea.c b/mbsetup/m_marea.c
index 7dc503a0..7b1674bf 100644
--- a/mbsetup/m_marea.c
+++ b/mbsetup/m_marea.c
@@ -1663,7 +1663,6 @@ void msged_areas(FILE *fp)
 
     fclose(no);
     free(temp);
-    fprintf(fp, "\n");
 }
 
 
diff --git a/mbsetup/mbsetup.c b/mbsetup/mbsetup.c
index 26f4a670..37ca7a09 100644
--- a/mbsetup/mbsetup.c
+++ b/mbsetup/mbsetup.c
@@ -100,6 +100,8 @@ static void die(int onsig)
 	 */
 	sprintf(temp, "%s/etc/msg.txt", getenv("MBSE_ROOT"));
 	if ((fp = fopen(temp, "w")) != NULL) {
+	    fprintf(fp, "; msg.txt -- Automatic created by mbsetup %s -- Do not edit!\n;\n", VERSION);
+	    fprintf(fp, "; Mail areas for MsgEd.\n;\n");
 	    msged_areas(fp);
 	    fclose(fp);
 	    Syslog('+', "Created new %s", temp);
@@ -113,7 +115,7 @@ static void die(int onsig)
 	sprintf(temp, "%s/etc/golded.inc", getenv("MBSE_ROOT"));
 	if ((fp = fopen(temp, "w")) != NULL) {
 	    fprintf(fp, "; GoldED.inc -- Automatic created by mbsetup %s -- Do not edit!\n\n", VERSION);
-	    fprintf(fp, "; Basic information\n;\n");
+	    fprintf(fp, "; Basic information.\n;\n");
 	    if (strlen(CFG.sysop_name) && CFG.akavalid[0] && CFG.aka[0].zone) {
 		fprintf(fp, "USERNAME %s\n\n", CFG.sysop_name);
 		fprintf(fp, "ADDRESS %s\n", aka2str(CFG.aka[0]));
@@ -133,6 +135,7 @@ static void die(int onsig)
 
 		gold_areas(fp);
 	    }
+	    fclose(fp);
 	    Syslog('+', "Created new %s", temp);
 	} else {
 	    WriteError("$Could not create %s", temp);