diff --git a/deps/rabbitmq_management/priv/www/js/global.js b/deps/rabbitmq_management/priv/www/js/global.js
index 8151d956ab..73305178fa 100644
--- a/deps/rabbitmq_management/priv/www/js/global.js
+++ b/deps/rabbitmq_management/priv/www/js/global.js
@@ -17,6 +17,7 @@ function map(list) {
 var KNOWN_ARGS = {'alternate-exchange':        {'short': 'AE',  'type': 'string'},
                   'x-message-ttl':             {'short': 'TTL', 'type': 'int'},
                   'x-expires':                 {'short': 'Exp', 'type': 'int'},
+                  'x-max-length':              {'short': 'Lim', 'type': 'int'},
                   'x-dead-letter-exchange':    {'short': 'DLX', 'type': 'string'},
                   'x-dead-letter-routing-key': {'short': 'DLK', 'type': 'string'}};
 
diff --git a/deps/rabbitmq_management/priv/www/js/help.js b/deps/rabbitmq_management/priv/www/js/help.js
index 8c422452c8..452a5b8af7 100644
--- a/deps/rabbitmq_management/priv/www/js/help.js
+++ b/deps/rabbitmq_management/priv/www/js/help.js
@@ -14,6 +14,9 @@ HELP = {
     'queue-expires':
       'How long a queue can be unused for before it is automatically deleted (milliseconds).<br/>(Sets the "<a target="_blank" href="http://rabbitmq.com/ttl.html#queue-ttl">x-expires</a>" argument.)',
 
+    'queue-max-length':
+      'How many (ready) messages a queue can contain before it starts to drop them from its head.<br/>(Sets the "<a target="_blank" href="http://rabbitmq.com/maxlength.html">x-max-length</a>" argument.)',
+
     'queue-auto-delete':
       'If yes, the queue will delete itself after at least one consumer has connected, and then all consumers have disconnected.',
 
diff --git a/deps/rabbitmq_management/priv/www/js/tmpl/queues.ejs b/deps/rabbitmq_management/priv/www/js/tmpl/queues.ejs
index c1cb0f9b6c..7f0daa8512 100644
--- a/deps/rabbitmq_management/priv/www/js/tmpl/queues.ejs
+++ b/deps/rabbitmq_management/priv/www/js/tmpl/queues.ejs
@@ -153,6 +153,10 @@
           <th><label>Auto expire: <span class="help" id="queue-expires"></span></label></th>
           <td><input type="text" name="x-expires"/> ms</td>
         </tr>
+        <tr>
+          <th><label>Max length: <span class="help" id="queue-max-length"></span></label></th>
+          <td><input type="text" name="x-max-length"/></td>
+        </tr>
         <tr>
           <th><label>Dead letter exchange: <span class="help" id="queue-dead-letter-exchange"></span></label></th>
           <td><input type="text" name="x-dead-letter-exchange"/></td>