diff --git a/mozilla/webtools/bugzilla/post_bug.cgi b/mozilla/webtools/bugzilla/post_bug.cgi
index 5ee8971c432..96451592674 100755
--- a/mozilla/webtools/bugzilla/post_bug.cgi
+++ b/mozilla/webtools/bugzilla/post_bug.cgi
@@ -93,6 +93,7 @@ if (defined $cgi->param('product')) {
 
 if (defined $cgi->param('maketemplate')) {
     $vars->{'url'} = $cgi->query_string();
+    $vars->{'short_desc'} = $cgi->param('short_desc');
     
     print $cgi->header();
     $template->process("bug/create/make-template.html.tmpl", $vars)
diff --git a/mozilla/webtools/bugzilla/template/en/default/bug/create/make-template.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/bug/create/make-template.html.tmpl
index f118f7f130f..bf1e743c0e8 100644
--- a/mozilla/webtools/bugzilla/template/en/default/bug/create/make-template.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/bug/create/make-template.html.tmpl
@@ -17,6 +17,12 @@
   # Rights Reserved.
   #
   # Contributor(s): Gervase Markham <gerv@gerv.net>
+  #                 Marc Schumann <wurblzap@gmail.com>
+  #%]
+
+[%# INTERFACE:
+  # url: URL to a pre-filled bug entry form.
+  # short_desc: Bug summary as entered in the form.
   #%]
 
 [% PROCESS global/variables.none.tmpl %]
@@ -28,8 +34,12 @@
 
 <p>
   You can bookmark this link:
-  &ldquo;<a href="enter_bug.cgi?[% url FILTER html %]">[% terms.Bug %]
-  entry template</a>&rdquo;.
+  &ldquo;<a href="enter_bug.cgi?[% url FILTER html %]">
+  [% IF short_desc %]
+    [% short_desc FILTER html %]
+  [% ELSE %]
+    [% terms.Bug %] entry template
+  [% END %]</a>&rdquo;.
   This bookmark will bring up the <em>Enter [% terms.Bug %]</em> page with the
   fields initialized as you've requested.
 </p>