diff --git a/master.cfg b/master.cfg
index fed783b..770bbe7 100644
--- a/master.cfg
+++ b/master.cfg
@@ -26,6 +26,7 @@ from buildbot.buildslave import BuildSlave
 from buildbot.status.results import SUCCESS, WARNINGS, FAILURE, EXCEPTION
 from gdbcommand import GdbCatSumfileCommand
 from gdbgitdb import SaveGDBResults, get_builder_commit_id
+from urllib import quote
 
 from sumfiles import DejaResults, set_web_base
 import os.path
@@ -186,7 +187,7 @@ send to the gdb-testers mailing list."""
                 # fails the test will continue.
                 text += "*** Failed to make TAGS ***\n"
                 text += "Log URL: %s/steps/%s/logs/%s\n\n" % (master_status.getURLForThing (build),
-                                                              n, log.getName ())
+                                                              quote (n), quote (log.getName ()))
                 continue
             elif n == 'regressions' and log.getName () == 'regressions':
                 text += "*** Regressions found ***\n"