diff --git a/ChangeLog b/ChangeLog
index 4affbd0d..4b3d53b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -52,6 +52,8 @@ v0.51.2		06-Mar-2004
 		one will be announced.
 		Fixed a bug in mbfile kill that destroyed the filebase when a
 		file was deleted or moved.
+		Doesn't write Magic Request into files description anymore,
+		this is now handled outsite the description lines.
 
 	mbfile:
 		Updated kill, index, check, pack, list, adopt, import, move,
@@ -78,6 +80,9 @@ v0.51.2		06-Mar-2004
 	mbsebbs:
 		Updated to the new files database structure.
 
+	mball:
+		Added support for files database Magic request field.
+
 	mbsetup:
 		Added auto upgrade for the files database.
 		Changed menus 14, 7.n.6, 10.1 and 8.4.
diff --git a/mbfido/addbbs.c b/mbfido/addbbs.c
index f051b6b5..431cdc8b 100644
--- a/mbfido/addbbs.c
+++ b/mbfido/addbbs.c
@@ -87,8 +87,6 @@ int Add_BBS()
 		    if (i == 24)
 			break;
 		}
-		if (strlen(TIC.TicIn.Magic))
-		    sprintf(frec.Desc[i], "Magic Request: %s", TIC.TicIn.Magic);
 		fseek(fp, 0 - sizeof(frec), SEEK_CUR);
 		fwrite(&frec, sizeof(frec), 1, fp);
 		fclose(fp);
diff --git a/mbsebbs/mball.c b/mbsebbs/mball.c
index 817b387a..3decdd9c 100644
--- a/mbsebbs/mball.c
+++ b/mbsebbs/mball.c
@@ -404,7 +404,7 @@ void Masterlist()
 			    if (New)
 				fprintf(np, "%s\r\n", temp);
 	
-			    for (z = 0; z <= 25; z++) {
+			    for (z = 0; z < 25; z++) {
 				if (strlen(fdb.Desc[z])) {
 				    if ((fdb.Desc[z][0] == '@') && (fdb.Desc[z][1] == 'X')) {
 					fprintf(fp, "                         %s\r\n",fdb.Desc[z]+4);
@@ -417,6 +417,11 @@ void Masterlist()
 				    }
 				}
 			    }
+			    if (strlen(fdb.Magic)) {
+				fprintf(fp, "                         Magic filerequest: %s\r\n", fdb.Magic);
+				if (New)
+				    fprintf(np, "                         Magic filerequest: %s\r\n", fdb.Magic);
+			    }
 			}
 		    }
 		}