diff --git a/includes/media.admin.inc b/includes/media.admin.inc
index a5aee59..34902c4 100644
--- a/includes/media.admin.inc
+++ b/includes/media.admin.inc
@@ -321,8 +321,16 @@ function media_admin_config_browser($form, &$form_state) {
     '#type' => 'textfield',
     '#title' => t("File directory for uploaded media"),
     '#default_value' => media_variable_get('wysiwyg_upload_directory'),
-    '#description' => t('Optional subdirectory within the upload destination where files will be stored. Do not include preceding or trailing slashes.'),
+    '#description' => t('Optional subdirectory within the upload destination where files will be stored. Do not include preceding or trailing slashes. This field supports tokens.'),
   );
+
+  if (module_exists('token')) {
+    $form['wysiwyg']['tokens'] = array(
+      '#theme' => 'token_tree',
+      '#dialog' => TRUE,
+    );
+  }
+
   $form['wysiwyg'][media_variable_name('wysiwyg_allowed_types')] = array(
     '#type' => 'checkboxes',
     '#title' => t('Allowed types in WYSIWYG'),