diff --git a/includes/media.browser.inc b/includes/media.browser.inc
index f4b96dd..063fad7 100644
--- a/includes/media.browser.inc
+++ b/includes/media.browser.inc
@@ -59,7 +59,14 @@ function media_browser($selected = NULL) {
 
   $tabs = array(); // List of tabs to render.
 
-  $settings = array('media' => array('browser' => array()));
+  $max_file_size = parse_size(media_variable_get('max_filesize'));
+  if (!$max_file_size) {
+    $max_file_size = file_upload_max_size();
+  }
+  $settings = array('media' => array(
+    'browser' => array(),
+    'max_file_size' => $max_file_size,
+  ));
   $browser_settings =& $settings['media']['browser'];
 
   //@todo: replace with Tabs module if it gets upgraded.
diff --git a/js/plugins/media.upload_multiple.js b/js/plugins/media.upload_multiple.js
index 3c5d189..1ff0d20 100644
--- a/js/plugins/media.upload_multiple.js
+++ b/js/plugins/media.upload_multiple.js
@@ -3,7 +3,10 @@ Drupal.behaviors.mediaUploadMultiple = {};
 Drupal.behaviors.mediaUploadMultiple.attach = function (context, settings) {
   // When the plupload element initializes, it expands the size of the elements
   // it has created, so we need to resize the browser iframe after it's done.
-  var uploader = jQuery('#edit-upload').pluploadQueue();
+  var uploader = jQuery('#edit-upload').pluploadQueue(
+   // Set appropriate file size limit.
+    max_file_size: settings.media.max_file_size,
+  );
   if (uploader) {
     // Handle the case in which the uploader has already finished initializing.
     Drupal.media.browser.resizeIframe();