diff --git a/mozilla/webtools/bugzilla/Bugzilla/Search.pm b/mozilla/webtools/bugzilla/Bugzilla/Search.pm
index 5a651a3b519..ebccdb51e08 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Search.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Search.pm
@@ -102,6 +102,8 @@ sub init {
     my @orderby;
 
     my $debug = 0;
+    my @debugdata;
+    if ($params->param('debug')) { $debug = 1; }
 
     my @fields;
     my @supptables;
@@ -1160,7 +1162,9 @@ sub init {
             $params->param("type$chart-$row-$col", shift(@$ref));
             $params->param("value$chart-$row-$col", shift(@$ref));
             if ($debug) {
-                print qq{<p>$params->param("field$chart-$row-$col") | $params->param("type$chart-$row-$col") | $params->param("value$chart-$row-$col")*</p>\n};
+                push(@debugdata, "$row-$col = " .
+                               $params->param("field$chart-$row-$col") . ' | ' .                               $params->param("type$chart-$row-$col") . ' | ' .
+                               $params->param("value$chart-$row-$col") . ' *');
             }
             $col++;
 
@@ -1298,7 +1302,7 @@ sub init {
                     if ("$f,$t,$rhs" =~ m/$key/) {
                         my $ref = $funcsbykey{$key};
                         if ($debug) {
-                            print "<p>$key ($f , $t , $rhs ) => ";
+                            push(@debugdata, "$key ($f / $t / $rhs) =>");
                         }
                         $ff = $f;
                         if ($f !~ /\./) {
@@ -1306,7 +1310,8 @@ sub init {
                         }
                         &$ref;
                         if ($debug) {
-                            print "$f , $t , $v , $term</p>";
+                            push(@debugdata, "$f / $t / $v / " .
+                                             ($term || "undef") . " *");
                         }
                         if ($term) {
                             last;
@@ -1436,12 +1441,8 @@ sub init {
         $query .= " ORDER BY " . join(',', @orderby);
     }
 
-    if ($debug) {
-        print "<p><code>" . value_quote($query) . "</code></p>\n";
-        exit;
-    }
-    
     $self->{'sql'} = $query;
+    $self->{'debugdata'} = \@debugdata;
 }
 
 ###############################################################################
@@ -1601,6 +1602,11 @@ sub getSQL {
     return $self->{'sql'};
 }
 
+sub getDebugData {
+    my $self = shift;
+    return $self->{'debugdata'};
+}
+
 sub pronoun {
     my ($noun, $user) = (@_);
     if ($noun eq "%user%") {
diff --git a/mozilla/webtools/bugzilla/buglist.cgi b/mozilla/webtools/bugzilla/buglist.cgi
index cb49d2a312e..38625355617 100755
--- a/mozilla/webtools/bugzilla/buglist.cgi
+++ b/mozilla/webtools/bugzilla/buglist.cgi
@@ -847,6 +847,7 @@ elsif ($fulltext) {
 if ($cgi->param('debug')) {
     $vars->{'debug'} = 1;
     $vars->{'query'} = $query;
+    $vars->{'debugdata'} = $search->getDebugData();
 }
 
 # Time to use server push to display an interim message to the user until
diff --git a/mozilla/webtools/bugzilla/template/en/default/list/list.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/list/list.html.tmpl
index 48b60ac8ae3..5c2e0312a09 100644
--- a/mozilla/webtools/bugzilla/template/en/default/list/list.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/list/list.html.tmpl
@@ -59,6 +59,11 @@
   [% END %]
 
   [% IF debug %]
+    <p>
+      [% FOREACH debugline = debugdata %]
+        [% debugline FILTER html %]<br>
+      [% END %]
+    </p>
     <p>[% query FILTER html %]</p>
   [% END %]
 
diff --git a/mozilla/webtools/bugzilla/template/en/default/list/server-push.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/list/server-push.html.tmpl
index 4fb88e9b441..be7a63c56e6 100644
--- a/mozilla/webtools/bugzilla/template/en/default/list/server-push.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/list/server-push.html.tmpl
@@ -34,6 +34,11 @@
     <h1 style="margin-top: 20%; text-align: center;">Please stand by ...</h1>
 
     [% IF debug %]
+      <p>
+        [% FOREACH debugline = debugdata %]
+          <code>[% debugline FILTER html %]</code><br>
+        [% END %]
+      </p>
       <p>
         <code>[% query FILTER html %]</code>
       </p>