diff --git a/ChangeLog b/ChangeLog
index 7999e4d3..b3ca691f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4589,6 +4589,7 @@ v0.33.20        10-Feb-2002
 		Enter mbsetup, this will upgrade the databases.
 		Go into global configuration, exit and save, this will update
 		the main configuration (add default macro path).
+		Edit the message groups and file groups for new settings.
 
 	general:
 		Added structures for area maintenance with area lists.
diff --git a/mbsetup/m_fgroup.c b/mbsetup/m_fgroup.c
index c164c36a..4b6189ef 100644
--- a/mbsetup/m_fgroup.c
+++ b/mbsetup/m_fgroup.c
@@ -416,10 +416,10 @@ int EditFGrpRec(int Area)
 		case 9: strcpy(fgroup.Convert, PickArchive((char *)"10.1.9"));
 			FgScreen();
 			break;
-		case 10:strcpy(fgroup.BbsGroup, PickFGroup((char *)"8.4.17"));
+		case 10:strncpy(fgroup.BbsGroup, PickFGroup((char *)"8.4.17"), 12);
 			FgScreen();
 			break;
-		case 11:strcpy(fgroup.AnnGroup, PickNGroup((char *)"8.4.18"));
+		case 11:strncpy(fgroup.AnnGroup, PickNGroup((char *)"8.4.18"), 12);
 			FgScreen();
 			break;
 		case 12:if (CheckFgroup())