diff --git a/ChangeLog b/ChangeLog
index e5f28274..d54a8caf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,8 +9,9 @@ v0.51.1		21-Feb-2004
 		global editor (to Latin-1 for example). Local and netmail
 		areas must be done by hand because they are most likely not
 		in a group.
-		The macro templates are updated, you may want to install the
-		new ones.
+		The macro templates are updated, you MUST install the newfiles
+		macro template at least because the format changed!
+		Type "make help" in the examples subdirectory to see how.
 
 	SETUP.sh:
 		Changed to support Darwin (OS X). Note that in earlier days
diff --git a/examples/templates-de.tar b/examples/templates-de.tar
index c3945653..13cef686 100644
Binary files a/examples/templates-de.tar and b/examples/templates-de.tar differ
diff --git a/examples/templates-en.tar b/examples/templates-en.tar
index 6de92c41..65e514ed 100644
Binary files a/examples/templates-en.tar and b/examples/templates-en.tar differ
diff --git a/examples/templates-es.tar b/examples/templates-es.tar
index 53ed6e5f..406df5fc 100644
Binary files a/examples/templates-es.tar and b/examples/templates-es.tar differ
diff --git a/examples/templates-nl.tar b/examples/templates-nl.tar
index df8ea3ee..958ccf3b 100644
Binary files a/examples/templates-nl.tar and b/examples/templates-nl.tar differ
diff --git a/mbfido/announce.c b/mbfido/announce.c
index ad796854..17e1c74a 100644
--- a/mbfido/announce.c
+++ b/mbfido/announce.c
@@ -346,7 +346,19 @@ long Report(gr_list *ta, long filepos)
 		}
 		filepos3 = ftell(fi);
 	    }
-	    MacroVars("u", "s", T_File.Magic);
+
+	    /*
+	     * Magic request
+	     */
+	    if (strlen(T_File.Magic)) {
+		MacroVars("u", "s", T_File.Magic);
+		Msg_Macro(fi);
+	    } else {
+		line = calloc(MAXSTR, sizeof(char));
+		while ((fgets(line, MAXSTR-2, fi) != NULL) && ((line[0]!='@') || (line[1]!='|'))) {}
+		free(line);
+	    }
+	    filepos3 = ftell(fi);
 	    Total++;
 	    Size += T_File.SizeKb;
 	}