diff --git a/master/buildbot/status/web/base.py b/master/buildbot/status/web/base.py
index 3605b923938..ff198e4f3d6 100644
--- a/master/buildbot/status/web/base.py
+++ b/master/buildbot/status/web/base.py
@@ -599,7 +599,7 @@ def replace_from_tuple(t):
         link_replace_re = jinja2.Markup(r'<a href="%s"%s>\g<0></a>' % (url_replace, title_replace))        
 
         def filter(text, project):
-            text = jinja2.escape(text)
+            text = cgi.escape(text)
             html = search_re.sub(link_replace_re, text)
             return html
 
@@ -617,7 +617,7 @@ def dict_filter(text, project):
             if t:
                 return replace_from_tuple(t)(text, project)
             else:
-                return jinja2.escape(text)
+                return cgi.escape(text)
             
         return dict_filter
         
@@ -626,7 +626,7 @@ def dict_filter(text, project):
             
     elif callable(changelink):
         def callable_filter(text, project):
-            text = jinja2.escape(text)
+            text = cgi.escape(text)
             return changelink(text, project)
         
         return callable_filter