diff --git a/master.cfg b/master.cfg
index 4ba6988..1c58b47 100644
--- a/master.cfg
+++ b/master.cfg
@@ -136,9 +136,10 @@ def MessageGDBTesters (mode, name, build, results, master_status):
     """This function is responsible for composing the message that will be
 send to the gdb-testers mailing list."""
     git_url = "http://gdb-build.sergiodj.net/cgit"
+    branch = build.getSourceStamps ()[0].branch
 
     # Subject
-    subj = "Failures on %s, branch %s" % (name, build.getSourceStamps ()[0].branch)
+    subj = "Failures on %s, branch %s" % (name, branch)
 
     # Body
     text = ""
@@ -215,7 +216,7 @@ send to the gdb-testers mailing list."""
     # Including the 'xfail' log.  It is important to say which tests
     # we are ignoring.
     if print_xfail:
-        xfail = os.path.join (gdb_web_base, name, 'xfail')
+        xfail = os.path.join (gdb_web_base, name, 'xfails', branch, 'xfail')
         if os.path.exists (xfail):
             text += "\n"
             text += "Failures that are being ignored:\n\n"