diff --git a/mozilla/webtools/bugzilla/.bzrrev b/mozilla/webtools/bugzilla/.bzrrev
index e7e6d102392..df99320666e 100644
--- a/mozilla/webtools/bugzilla/.bzrrev
+++ b/mozilla/webtools/bugzilla/.bzrrev
@@ -1 +1 @@
-8429
\ No newline at end of file
+8430
\ No newline at end of file
diff --git a/mozilla/webtools/bugzilla/template/en/default/attachment/createformcontents.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/attachment/createformcontents.html.tmpl
index c8016841cb6..48e4f4af0a2 100644
--- a/mozilla/webtools/bugzilla/template/en/default/attachment/createformcontents.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/attachment/createformcontents.html.tmpl
@@ -6,6 +6,8 @@
   # defined by the Mozilla Public License, v. 2.0.
   #%]
 
+[% max_local = Param('maxlocalattachment') * 1024 %]
+[% max_limit = Param('maxattachmentsize')> max_local ? Param('maxattachmentsize') : max_local %]
 <tr class="attachment_data">
   <th><label for="data">File</label>:</th>
   <td>
@@ -14,6 +16,7 @@
                                              javascript:TUI_toggle_class('attachment_data')"
     >paste text as attachment</a>).<br>
     <input type="file" id="data" name="data" size="50" onchange="DataFieldHandler()">
+    <br><em>(File size limit: [% max_limit FILTER html %] KB)</em>
   </td>
 </tr>
 <tr class="attachment_text_field">