diff --git a/includes/media.browser.inc b/includes/media.browser.inc
index c337876..65ee35b 100644
--- a/includes/media.browser.inc
+++ b/includes/media.browser.inc
@@ -183,7 +183,7 @@ function media_browser_list() {
   // @todo Implement granular editorial access: http://drupal.org/node/696970.
   //   In the meantime, protect information about private files from being
   //   discovered by unprivileged users. See also media_view_page().
-  if (!user_access('administer media')) {
+  if (!user_access('administer file')) {
     $query->condition('f.uri', db_like('private://') . '%', 'NOT LIKE');
   }
 
@@ -214,7 +214,7 @@ function media_media_browser_plugin_info() {
     '#weight' => 10,
   );
 
-  if (user_access('administer media') || user_access('edit media')) {
+  if (user_access('administer file') || user_access('edit file')) {
     $plugins['upload'] = array(
       '#weight' => -10,
     );
diff --git a/includes/media.fields.inc b/includes/media.fields.inc
index a1887e3..64bc4c8 100644
--- a/includes/media.fields.inc
+++ b/includes/media.fields.inc
@@ -237,7 +237,7 @@ function media_field_widget_form(&$form, &$form_state, $field, $instance, $langc
   $field_settings = $instance['settings'];
   $widget_settings = $instance['widget']['settings'];
 
-  $permission = user_access('edit media');
+  $permission = user_access('edit file');
   if (!$permission) {
     // @todo: show the default file upload field.
     return;
diff --git a/media.module b/media.module
index 48e788f..cb1b268 100644
--- a/media.module
+++ b/media.module
@@ -84,7 +84,7 @@ function media_menu() {
     'description' => 'Configure the behavior and display of the media browser.',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('media_admin_config_browser'),
-    'access arguments' => array('administer media'),
+    'access arguments' => array('administer file'),
     'file' => 'includes/media.admin.inc',
   );
 
@@ -97,7 +97,7 @@ function media_menu() {
 //    'description' => 'Manage files used on your site.',
 //    'page callback' => 'drupal_get_form',
 //    'page arguments' => array('media_admin_type_manage_form', 5),
-//    'access arguments' => array('administer media'),
+//    'access arguments' => array('administer file'),
 //    'file' => 'includes/media.admin.inc',
 //  );
 //  $items['admin/config/media/types/manage/%media_type/settings'] = array(
@@ -111,7 +111,7 @@ function media_menu() {
     'description' => 'Manage files used on your site.',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('media_admin'),
-    'access arguments' => array('administer media'),
+    'access arguments' => array('administer file'),
     'type' => MENU_LOCAL_TASK | MENU_NORMAL_ITEM,
     'file' => 'includes/media.admin.inc',
   );
@@ -144,7 +144,7 @@ function media_menu() {
     'description' => 'Make it easier to test media browser',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('media_browser_testbed'),
-    'access arguments' => array('administer media'),
+    'access arguments' => array('administer file'),
     'type' => MENU_CALLBACK,
     'file' => 'includes/media.browser.inc',
   );
diff --git a/modules/media_internet/media_internet.module b/modules/media_internet/media_internet.module
index fa6b94b..599d8c3 100644
--- a/modules/media_internet/media_internet.module
+++ b/modules/media_internet/media_internet.module
@@ -10,7 +10,7 @@ function media_internet_media_browser_plugin_info() {
    'search' => array(
    ),
   */
-  if (user_access('administer media') || user_access('add media from remote sources')) {
+  if (user_access('administer file') || user_access('add media from remote sources')) {
     $plugins['media_internet'] = array(
       '#weight' => -10,
     );