diff --git a/js/server_privileges.js b/js/server_privileges.js
index 7214d74dbe..2c9e83a375 100644
--- a/js/server_privileges.js
+++ b/js/server_privileges.js
@@ -473,6 +473,57 @@ $(document).ready(function() {
      * @memberOf    jQuery
      * @name        export_user_click
      */
+    $("button.mult_submit[value=export]").live('click', function(event) {
+        event.preventDefault();
+        // can't export if no users checked
+        if ($(this.form).find("input:checked").length == 0) {
+            return;
+        }
+        var $msgbox = PMA_ajaxShowMessage();
+        var button_options = {};
+        button_options[PMA_messages['strClose']] = function() {
+            $(this).dialog("close");
+        };
+        $.post($(this.form).prop('action'), 
+            $(this.form).serialize() + '&submit_mult=export&ajax_request=true', 
+            function(data) {
+                var $ajaxDialog = $('<div />')
+                .append(data.message)
+                .dialog({
+                    title: data.title,
+                    width: 500,
+                    buttons: button_options,
+                    close: function () {
+                        $(this).remove();
+                    }
+                });
+                PMA_ajaxRemoveMessage($msgbox);
+                // Attach syntax highlited editor to export dialog
+                CodeMirror.fromTextArea(
+                    $ajaxDialog.find('textarea')[0],
+                    {
+                        lineNumbers: true,
+                        matchBrackets: true,
+                        indentUnit: 4,
+                        mode: "text/x-mysql"
+                    }
+                );
+        }); //end $.post
+    });
+    // if exporting non-ajax, highlight anyways
+    if ($("textarea.export").length > 0)
+    {
+        CodeMirror.fromTextArea(
+            $('textarea.export')[0],
+            {
+                lineNumbers: true,
+                matchBrackets: true,
+                indentUnit: 4,
+                mode: "text/x-mysql"
+            }
+        );
+    }
+
     $(".export_user_anchor.ajax").live('click', function(event) {
         event.preventDefault();
         var $msgbox = PMA_ajaxShowMessage();
diff --git a/server_privileges.php b/server_privileges.php
index f3bcc41824..9106249630 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -1528,14 +1528,15 @@ $link_export_all = '<a class="export_user_anchor ' . $conditional_class . '" hre
     . '&amp;hostname=%s'
     . '&amp;initial=%s'
     . '&amp;export=1">'
-    . PMA_getIcon('b_tblexport.png', __('Export all'))
+    . PMA_getIcon('b_tblexport.png', __('Export all')) . ' '
+    . __('Export all')
     . '</a>';
 
 /**
  * If we are in an Ajax request for Create User/Edit User/Revoke User/
  * Flush Privileges, show $message and exit.
  */
-if ($GLOBALS['is_ajax_request'] && ! isset($_REQUEST['export']) && (! isset($_REQUEST['adduser']) || $_add_user_error) && ! isset($_REQUEST['initial']) && ! isset($_REQUEST['showall']) && ! isset($_REQUEST['edit_user_dialog']) && ! isset($_REQUEST['db_specific'])) {
+if ($GLOBALS['is_ajax_request'] && ! isset($_REQUEST['export']) && (! isset($_REQUEST['submit_mult']) || $_REQUEST['submit_mult'] != 'export') && (! isset($_REQUEST['adduser']) || $_add_user_error) && ! isset($_REQUEST['initial']) && ! isset($_REQUEST['showall']) && ! isset($_REQUEST['edit_user_dialog']) && ! isset($_REQUEST['db_specific'])) {
 
     if (isset($sql_query)) {
         $extra_data['sql_query'] = PMA_showMessage(null, $sql_query);
@@ -1623,8 +1624,8 @@ if (isset($viewing_mode) && $viewing_mode == 'db') {
  */
 
 // export user definition
-if (isset($_REQUEST['export'])) {
-    $response = '<textarea cols="' . $GLOBALS['cfg']['TextareaCols'] . '" rows="' . $GLOBALS['cfg']['TextareaRows'] . '">';
+if (isset($_REQUEST['export']) || (isset($_REQUEST['submit_mult']) && $_REQUEST['submit_mult'] == 'export')) {
+    $response = '<textarea class="export" cols="' . $GLOBALS['cfg']['TextareaCols'] . '" rows="' . $GLOBALS['cfg']['TextareaRows'] . '">';
     if ($username == '%') {
         // export privileges for all users
         $title = __('Privileges for all users');
@@ -1632,11 +1633,26 @@ if (isset($_REQUEST['export'])) {
             $response .= PMA_getGrants($pair['user'], $pair['host']);
             $response .= "\n";
         }
-    } else {
+    } elseif (isset($_REQUEST['selected_usr'])) {
+        // export privileges for selected users
+        $title = __('Privileges');
+        foreach ($_REQUEST['selected_usr'] as $export_user) {
+            $export_username = substr($export_user, 0, strpos($export_user, '&'));
+            $export_hostname = substr($export_user, strrpos($export_user, ';') + 1);
+            $response .= '# ' . __('Privileges for ') . '`' . 
+                htmlspecialchars($export_username) . '`@`' . 
+                htmlspecialchars($export_hostname) . "`\n\n";
+            $response .= PMA_getGrants($export_username, $export_hostname) . "\n";
+        }
+    }
+    else {
         // export privileges for a single user
         $title = __('User') . ' `' . htmlspecialchars($username) . '`@`' . htmlspecialchars($hostname) . '`';
         $response .= PMA_getGrants($username, $hostname);
     }
+    // remove trailing whitespace
+    $response = trim($response);
+    
     $response .= '</textarea>';
     unset($username, $hostname, $grants, $one_grant);
     if ($GLOBALS['is_ajax_request']) {
@@ -1863,7 +1879,14 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs
                    .'<a href="server_privileges.php?' . $GLOBALS['url_query'] .  '"'
                    .' onclick="if (unMarkAllRows(\'usersForm\')) return false;">'
                    . __('Uncheck All') . '</a>' . "\n"
-                   . '</div>'
+                   .'<i>' . __('With selected:') . '</i>' . "\n";
+
+                PMA_buttonOrImage(
+                    'submit_mult', 'mult_submit', 'submit_mult_export',
+                    __('Export'), 'b_tblexport.png', 'export'
+                );
+                echo '<input type="hidden" name="initial" value="' . (isset($initial) ? $initial : '') . '" />';
+                echo '</div>'
                    . '<div class="clear_both" style="clear:both"></div>'
                    . '<div style="float:left; padding-left:10px;">';
                 printf($link_export_all, urlencode('%'), urlencode('%'), (isset($initial) ? $initial : ''));