diff --git a/mozilla/webtools/bugzilla/CHANGES b/mozilla/webtools/bugzilla/CHANGES
index a33713f4400..06514c038d4 100644
--- a/mozilla/webtools/bugzilla/CHANGES
+++ b/mozilla/webtools/bugzilla/CHANGES
@@ -10,6 +10,12 @@ query the CVS tree.  For example,
 will tell you what has been changed in the last week.
 
 
+3/8/99 Added params to control how priorities are set in a new bug.  You can
+now choose whether to let submitters of new bugs choose a priority, or whether
+they should just accept the default priority (which is now no longer hardcoded
+to "P2", but is instead a param.)  The default value of the params will cause
+the same behavior as before.
+
 3/3/99 Added a "disallownew" field to the products table.  If non-zero, then
 don't let people file new bugs against this product.  (This is for when a 
 product is retired, but you want to keep the bug reports around for posterity.)
diff --git a/mozilla/webtools/bugzilla/bug_status.html b/mozilla/webtools/bugzilla/bug_status.html
index e351b414ad5..a3706dffcdb 100755
--- a/mozilla/webtools/bugzilla/bug_status.html
+++ b/mozilla/webtools/bugzilla/bug_status.html
@@ -129,7 +129,8 @@ This field describes the impact of a bug.
 <a name="priority"><h2>Priority</h2></a>
 
 This field describes the importance and order in which a bug should be
-fixed.  The available priorities are:
+fixed.  This field is utilized by the programmers/engineers to
+prioritized their work to be done.  The available priorities are:
 
 <p>
 <p>
@@ -204,6 +205,6 @@ status field appropriately.
 <hr>
 <address><a href="http://home.netscape.com/people/terry/">Terry Weissman &lt;terry@netscape.com&gt;</a></address>
 <!-- hhmts start -->
-Last modified: Fri Jan 15 13:36:36 1999
+Last modified: Mon Mar  8 18:31:07 1999
 <!-- hhmts end -->
 </body> </html>
diff --git a/mozilla/webtools/bugzilla/defparams.pl b/mozilla/webtools/bugzilla/defparams.pl
index cfb41fbae01..d7b2e5a46cc 100644
--- a/mozilla/webtools/bugzilla/defparams.pl
+++ b/mozilla/webtools/bugzilla/defparams.pl
@@ -243,6 +243,30 @@ DefParam("defaultquery",
 	 "t",
 	 "bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&product=Mozilla&order=%22Importance%22");
 
+
+DefParam("letsubmitterchoosepriority",
+         "If this is on, then people submitting bugs can choose an initial priority for that bug.  If off, then all bugs initially have the default priority selected above.",
+         "b",
+         1);
+
+
+sub check_priority {
+    my ($value) = (@_);
+    GetVersionTable();
+    if (lsearch(\@::legal_priority, $value) < 0) {
+        return "Must be a legal priority value: one of " .
+            join(", ", @::legal_priority);
+    }
+    return "";
+}
+
+DefParam("defaultpriority",
+         "This is the priority that newly entered bugs are set to.",
+         "t",
+         "P2",
+         \&check_priority);
+
+
 DefParam("usetargetmilestone",
 	 "Do you wish to use the Target Milestone field?",
 	 "b",
diff --git a/mozilla/webtools/bugzilla/enter_bug.cgi b/mozilla/webtools/bugzilla/enter_bug.cgi
index 550647726bc..83792e851aa 100755
--- a/mozilla/webtools/bugzilla/enter_bug.cgi
+++ b/mozilla/webtools/bugzilla/enter_bug.cgi
@@ -163,8 +163,10 @@ my $assign_element = GeneratePersonInput('assigned_to', 1,
 my $cc_element = GeneratePeopleInput('cc', formvalue('cc'));
 
 
+my $priority = Param('defaultpriority');
+
 my $priority_popup = make_popup('priority', \@::legal_priority,
-                                formvalue('priority', 'P2'), 0);
+                                formvalue('priority', $priority), 0);
 my $sev_popup = make_popup('bug_severity', \@::legal_severity,
                            formvalue('bug_severity', 'normal'), 0);
 my $platform_popup = make_popup('rep_platform', \@::legal_platform,
@@ -203,9 +205,16 @@ print "
     <td rowspan=3></td>
     <td></td>
   </TR>
-  <TR>
+  <TR>";
+if (Param('letsubmitterchoosepriority')) {
+    print "
     <TD ALIGN=RIGHT><B><A HREF=\"bug_status.html#priority\">Priority</A>:</B></TD>
-    <TD>$priority_popup</TD>
+    <TD>$priority_popup</TD>";
+} else {
+    print '<INPUT TYPE=HIDDEN NAME=priority VALUE="' .
+        value_quote($priority) . '">';
+}
+print "
     <TD ALIGN=RIGHT><B><A HREF=\"bug_status.html#severity\">Severity</A>:</B></TD>
     <TD>$sev_popup</TD>
     <td></td>