diff --git a/includes/media.admin.inc b/includes/media.admin.inc
index eacce90..2d0ac5d 100644
--- a/includes/media.admin.inc
+++ b/includes/media.admin.inc
@@ -295,6 +295,16 @@ function media_admin_config_browser($form, &$form_state) {
'#default_value' => media_variable_get('file_extensions'),
'#description' => t('File extensions which are accepted in the media browser. Use spaces to separate (e.g. "jpg gif pdf doc").
Note that this can be overriden on a per-field basis when creating multimedia asset fields and files of certain extensions cannot be embedded at this time.'),
);
+
+ foreach (file_info_file_types() as $name => $type) {
+ $options[$name] = $type['label'];
+ }
+ $form[media_variable_name('wysiwyg_allowed_types')] = array(
+ '#type' => 'checkboxes',
+ '#title' => t('Allowed types in WYSIWYG'),
+ '#options' => $options,
+ '#default_value' => media_variable_get('wysiwyg_allowed_types'),
+ );
$form['#submit'][] = 'media_admin_config_browser_pre_submit';
return system_settings_form($form);