diff --git a/master.cfg b/master.cfg
index 715bbeb..4f65fb8 100644
--- a/master.cfg
+++ b/master.cfg
@@ -136,7 +136,7 @@ send to the gdb-testers mailing list."""
     # URL to find more info about what went wrong.
     text += "Log URL(s):\n"
     for ss in ss_list:
-        text += "\t<http://sdj-gdbbuild.usersys.redhat.com/%s/%s>\n" % (name, ss.revision)
+        text += "\t<%s/results/%s/%s>\n" % (master_status.getBuildbotURL (), name, ss.revision)
 
     # Who's to blame?
     text += "Author(s):\n"
@@ -180,7 +180,8 @@ mn = mail.MailNotifier(fromaddr = "sergiodj@redhat.com",
                        relayhost = "smtp.corp.redhat.com",
                        mode = ('failing'),
                        smtpPort = 25,
-                       messageFormatter = MessageGDBTesters)
+                       messageFormatter = MessageGDBTesters,
+                       extraHeaders = { 'X-GDB-Buildbot' : '1' })
 
 c['status'].append (mn)