diff --git a/webtools/bonsai/cvsquery.cgi b/webtools/bonsai/cvsquery.cgi
index 7c3a3c5e770b..1c502c350d2e 100755
--- a/webtools/bonsai/cvsquery.cgi
+++ b/webtools/bonsai/cvsquery.cgi
@@ -408,8 +408,8 @@ sub print_ci {
           . "$ci->[$::CI_WHO]</a>\n";
     print "<TD width=45%><a href='cvsview2.cgi?subdir=$url_dir" .
         "&files=$url_file\&command=DIRECTORY&branch=$::query_branch" .
-        "&root=$::CVS_ROOT'\n" .
-        " onclick=\"return js_file_menu('$::CVS_ROOT', '$url_dir'," .
+        "&root=" . $ci->[$::CI_REPOSITORY] . "'\n" .
+        " onclick=\"return js_file_menu($ci->[$::CI_REPOSITORY], '$url_dir'," .
         "'$url_file','$ci->[$::CI_REV]','$::query_branch',event)\">\n";
 #     if( (length $ci->[$::CI_FILE]) + (length $ci->[$::CI_DIR])  > 30 ){
 #         $d = $ci->[$::CI_DIR];
@@ -436,7 +436,7 @@ sub print_ci {
         print "<TD width=2%>${sm_font_tag}<a href='cvsview2.cgi?diff_mode=".
               "context\&whitespace_mode=show\&subdir=$url_dir" .
               "\&command=DIFF_FRAMESET\&file=$url_file" .
-              "\&rev1=$prevrev&rev2=$rev&root=$::CVS_ROOT'>$rev</a></font>\n";
+              "\&rev1=$prevrev&rev2=$rev&root=" .  $ci->[$::CI_REPOSITORY] . "'>$rev</a></font>\n";
     }
     else {
         print "<TD width=2%>\&nbsp;\n";