diff --git a/mozilla/webtools/bugzilla/README b/mozilla/webtools/bugzilla/README
index 1d4e9c88b58..a335dfd8960 100644
--- a/mozilla/webtools/bugzilla/README
+++ b/mozilla/webtools/bugzilla/README
@@ -132,11 +132,11 @@ provide backwards compatibility with the older MySQL packages; you must
 answer YES to this question.  The default will be no, and if you select it
 things won't work later.
 
-   A host of 'localhost' should be fine and a testing user of 'test'
-should find itself with sufficient access to run tests on the 'test'
-database which MySQL created upon installation.  If 'make test' and 'make
-install' go through without errors you should be ready to go as far as
-database connectivity is concerned.
+   A host of 'localhost' should be fine and a testing user of 'test' and
+a null password should find itself with sufficient access to run tests on 
+the 'test' database which MySQL created upon installation.  If 'make test' 
+and 'make install' go through without errors you should be ready to go as 
+far as database connectivity is concerned.
 
 1.6. TimeDate Perl module collection
 
diff --git a/mozilla/webtools/bugzilla/defparams.pl b/mozilla/webtools/bugzilla/defparams.pl
index 2f4bef52e84..5cba8229552 100644
--- a/mozilla/webtools/bugzilla/defparams.pl
+++ b/mozilla/webtools/bugzilla/defparams.pl
@@ -302,6 +302,11 @@ DefParam("webdotbase",
          "t",
          "http://www.research.att.com/~north/cgi-bin/webdot.cgi/%urlbase%");
 
+DefParam("entryheaderhtml",
+         "This is a special header for the bug entry page. The text will be printed after the page header, before the bug entry form. It is meant to be a place to put pointers to intructions on how to enter bugs.",
+         "l",
+         '');
+
 DefParam("expectbigqueries",
          "If this is on, then we will tell mysql to <tt>set option SQL_BIG_TABLES=1</tt> before doing queries on bugs.  This will be a little slower, but one will not get the error <tt>The table ### is full</tt> for big queries that require a big temporary table.",
          "b",
diff --git a/mozilla/webtools/bugzilla/enter_bug.cgi b/mozilla/webtools/bugzilla/enter_bug.cgi
index e8c77aa1878..b04c4e36810 100755
--- a/mozilla/webtools/bugzilla/enter_bug.cgi
+++ b/mozilla/webtools/bugzilla/enter_bug.cgi
@@ -190,7 +190,20 @@ print "
 <INPUT TYPE=HIDDEN NAME=bug_status VALUE=NEW>
 <INPUT TYPE=HIDDEN NAME=reporter VALUE=\"$::COOKIE{'Bugzilla_login'}\">
 <INPUT TYPE=HIDDEN NAME=product VALUE=\""  . value_quote($product) . "\">
-  <TABLE CELLSPACING=2 CELLPADDING=0 BORDER=0>
+  <TABLE CELLSPACING=2 CELLPADDING=0 BORDER=0>";
+
+if (Param("entryheaderhtml")){
+  print "
+  <TR>
+    <td></td>
+    <td colspan=3>" .
+  Param("entryheaderhtml") . "\n" .
+  " </td> 
+  </TR>
+  <TR><td><br></td></TR>";
+}
+
+print "
   <TR>
     <td ALIGN=right valign=top><B>Reporter:</B></td>
     <td valign=top>$::COOKIE{'Bugzilla_login'}</td>
@@ -254,8 +267,8 @@ print "
     value_quote(formvalue('short_desc')) .
     "\"></TD>
   </TR>
-  <tr><td align=right valign=top><B>Description:</b></tr>
-  <tr>
+  <tr><td align=right valign=top><B>Description:</b></td>
+<!--  </tr> <tr> -->
     <td colspan=5><TEXTAREA WRAP=HARD NAME=comment ROWS=10 COLS=80>" .
     value_quote(formvalue('comment')) .
     "</TEXTAREA><BR></td>
@@ -269,14 +282,24 @@ print "
        &nbsp;&nbsp;&nbsp;&nbsp;
        <INPUT TYPE=\"submit\" NAME=maketemplate VALUE=\"Remember values as bookmarkable template\">
     </td>
-  </tr>
+  </tr>";
+
+if ( Param('usebrowserinfo') ) {
+    print "
+  <tr>
+    <td></td>
+    <td colspan=3>
+     <br>
+     Some fields initialized from your user-agent, 
+     <b>$ENV{'HTTP_USER_AGENT'}</b>.  If you think it got it wrong, 
+     please tell " . Param('maintainer') . " what it should have been.
+    </td>
+  </tr>";
+}
+print "
   </TABLE>
   <INPUT TYPE=hidden name=form_name VALUE=enter_bug>
 </FORM>\n";
 
-if ( Param('usebrowserinfo') ) {
-    print "Some fields initialized from your user-agent, <b>$ENV{'HTTP_USER_AGENT'}</b>.
-           If you think it got it wrong, please tell " . Param('maintainer') . " what it should have been.";
-}
 print "</BODY></HTML>\n";