diff --git a/mozilla/webtools/registry/file.html.tmpl b/mozilla/webtools/registry/file.html.tmpl
index 916bd4c6c29..f9514e0495e 100644
--- a/mozilla/webtools/registry/file.html.tmpl
+++ b/mozilla/webtools/registry/file.html.tmpl
@@ -28,6 +28,9 @@
     filename = CGI.param('file');
     dirname = CGI.param('dir');
     cvsroot = CGI.param('cvsroot');
+    UNLESS cvsroot == '/cvsroot';
+      bonsai_root = bonsai_root _ '-' _ cvsroot.match('^/(.*)$').0;
+    END;
     rev = CGI.param('rev');
     prev_rev = CGI.param('prev_rev');
     linked_text = CGI.param('linked_text');
diff --git a/mozilla/webtools/registry/who.html.tmpl b/mozilla/webtools/registry/who.html.tmpl
index b798cf8bf8a..fda7451cc12 100644
--- a/mozilla/webtools/registry/who.html.tmpl
+++ b/mozilla/webtools/registry/who.html.tmpl
@@ -62,6 +62,9 @@
       [% fixed_email FILTER html %]<br>
       [% IF CGI.param('d') -%]
         [% last_checkin_data = CGI.param('d').split('\|') -%]
+        [% UNLESS last_checkin_data.2 == '/cvsroot' %]
+          [% bonsai_root = bonsai_root _ '-' _ last_checkin_data.2.match('^/(.*)$').0 %]
+        [% END %]
         [% FILTER null;
              cgi = CGI.new('');
              cgi.param('module',  last_checkin_data.0);