diff --git a/core/modules/media_entity/config/schema/media_entity.schema.yml b/core/modules/media_entity/config/schema/media_entity.schema.yml
index bca1a93eb8b5b748ebfed3bed8556f8fd2488a44..b31a3b5ea753f41ca6c02256fcb6a820eb205ff7 100644
--- a/core/modules/media_entity/config/schema/media_entity.schema.yml
+++ b/core/modules/media_entity/config/schema/media_entity.schema.yml
@@ -36,6 +36,14 @@ media_entity.bundle.*:
       sequence:
         type: string
 
+media_entity.bundle.type.document:
+  type: mapping
+  label: 'Document type configuration'
+  mapping:
+    source_field:
+      type: string
+      label: 'Field with source information'
+
 action.configuration.media_delete_action:
   type: action_configuration_default
   label: 'Delete media configuration'
diff --git a/core/modules/media_entity/src/Plugin/MediaEntity/Type/Document.php b/core/modules/media_entity/src/Plugin/MediaEntity/Type/Document.php
new file mode 100644
index 0000000000000000000000000000000000000000..18d06d01dccab0363762deb6f507f47a6cbe12e5
--- /dev/null
+++ b/core/modules/media_entity/src/Plugin/MediaEntity/Type/Document.php
@@ -0,0 +1,122 @@
+<?php
+
+namespace Drupal\media_entity\Plugin\MediaEntity\Type;
+
+use Drupal\media_entity\MediaBundleInterface;
+use Drupal\media_entity\MediaInterface;
+use Drupal\media_entity\MediaTypeBase;
+use Drupal\Core\Form\FormStateInterface;
+
+/**
+ * Provides media type plugin for Document.
+ *
+ * @MediaType(
+ *   id = "document",
+ *   label = @Translation("Document"),
+ *   description = @Translation("Provides business logic and metadata for local documents."),
+ *   allowed_field_types = {"file"},
+ * )
+ */
+class Document extends MediaTypeBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function providedFields() {
+    return [
+      'mime' => $this->t('MIME type'),
+      'size' => $this->t('Size'),
+    ];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getField(MediaInterface $media, $name) {
+    $source_field = $this->configuration['source_field'];
+
+    // Get the file document.
+    /** @var \Drupal\file\FileInterface $file */
+    $file = $media->{$source_field}->entity;
+
+    // Return the field.
+    switch ($name) {
+      case 'mime':
+        return $file->getMimeType() ?: FALSE;
+
+      case 'size':
+        $size = $file->getSize();
+        return is_numeric($size) ? $size : FALSE;
+    }
+
+    return FALSE;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function thumbnail(MediaInterface $media) {
+    $source_field = $this->configuration['source_field'];
+    /** @var \Drupal\file\FileInterface $file */
+    $file = $media->{$source_field}->entity;
+    $icon_base = $this->configFactory->get('media_entity.settings')->get('icon_base');
+    $thumbnail = FALSE;
+    if ($file) {
+      $mimetype = $file->getMimeType();
+      $mimetype = explode('/', $mimetype);
+      $thumbnail = $icon_base . "/{$mimetype[0]}--{$mimetype[1]}.png";
+
+      if (!is_file($thumbnail)) {
+        $thumbnail = $icon_base . "/{$mimetype[1]}.png";
+      }
+    }
+
+    if (!is_file($thumbnail)) {
+      $thumbnail = $icon_base . '/generic.png';
+    }
+
+    return $thumbnail;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getDefaultName(MediaInterface $media) {
+    // The default name will be the filename of the source_field, if present.
+    $source_field = $this->configuration['source_field'];
+
+    /** @var \Drupal\file\FileInterface $file */
+    if (!empty($source_field) && ($file = $media->{$source_field}->entity)) {
+      return $file->getFilename();
+    }
+
+    return parent::getDefaultName($media);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function createSourceFieldStorage() {
+    return $this->entityTypeManager
+      ->getStorage('field_storage_config')
+      ->create([
+        'entity_type' => 'media',
+        'field_name' => $this->getSourceFieldName(),
+        'type' => 'file',
+      ]);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function createSourceField(MediaBundleInterface $bundle) {
+    /** @var \Drupal\field\FieldConfigInterface $field */
+    return $this->entityTypeManager
+      ->getStorage('field_config')
+      ->create([
+        'field_storage' => $this->getSourceFieldStorage(),
+        'bundle' => $bundle->id(),
+      ]);
+  }
+
+}
diff --git a/core/modules/media_entity/tests/src/FunctionalJavascript/DocumentTest.php b/core/modules/media_entity/tests/src/FunctionalJavascript/DocumentTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..c82a61944445724a03ffd65e13d1ab1e2d283af5
--- /dev/null
+++ b/core/modules/media_entity/tests/src/FunctionalJavascript/DocumentTest.php
@@ -0,0 +1,52 @@
+<?php
+
+namespace Drupal\Tests\media_entity\FunctionalJavascript;
+
+use Drupal\field\Entity\FieldConfig;
+use Drupal\media_entity\Entity\Media;
+
+/**
+ * Tests the document type plugin.
+ *
+ * @group media_entity
+ */
+class DocumentTest extends MediaTypeTestBase {
+
+  /**
+   * Tests the document type.
+   */
+  public function testDocumentType() {
+    $session = $this->getSession();
+    $page = $session->getPage();
+    $assert_session = $this->assertSession();
+
+    // We rely on an automatic source field being created at this point.
+    // @see MediaTypeBase::getSourceFieldName().
+    $source_field_name = 'field_media_document';
+    $bundle_name = strtolower($this->randomMachineName(12));
+    $provided_fields = ['mime', 'size'];
+    $bundle = $this->createMediaBundleTest($bundle_name, 'document', $provided_fields);
+    // Adjust the allowed extensions on the source field.
+    \Drupal::service('entity_field.manager')->clearCachedFieldDefinitions();
+    $bundle->getType()
+      ->getSourceField($bundle)
+      ->setSetting('file_extensions', 'txt')
+      ->save();
+    // Hide the media name to test default name generation.
+    $this->hideMediaField('name', $bundle_name);
+    // Create a media item.
+    $this->drupalGet("media/add/$bundle_name");
+    $page->attachFileToField('files[' . $source_field_name . '_0]', \Drupal::root() . '/sites/README.txt');
+    $assert_session->assertWaitOnAjaxRequest();
+    $page->pressButton('Save and publish');
+
+    $assert_session->addressEquals('media/1');
+    // Make sure the thumbnail shows up.
+    $assert_session->elementAttributeContains('css', '.image-style-thumbnail', 'src', 'generic.png');
+    // Load the media and check its default name.
+    $media = Media::load(1);
+    $this->assertEquals($media->label(), 'README.txt');
+
+  }
+
+}
diff --git a/core/modules/media_entity/tests/src/FunctionalJavascript/MediaTypeTestBase.php b/core/modules/media_entity/tests/src/FunctionalJavascript/MediaTypeTestBase.php
new file mode 100644
index 0000000000000000000000000000000000000000..821c0f2708cd12d855fee46070fe68427e24ad40
--- /dev/null
+++ b/core/modules/media_entity/tests/src/FunctionalJavascript/MediaTypeTestBase.php
@@ -0,0 +1,139 @@
+<?php
+
+namespace Drupal\Tests\media_entity\FunctionalJavascript;
+
+use Drupal\field\Entity\FieldConfig;
+use Drupal\field\Entity\FieldStorageConfig;
+use Drupal\media_entity\Entity\MediaBundle;
+
+/**
+ * A base test class for plugin types.
+ */
+abstract class MediaTypeTestBase extends MediaEntityJavascriptTestBase {
+
+  /**
+   * Create storage and field instance, attached to a given media bundle.
+   *
+   * @param string $field_name
+   *   The field name.
+   * @param string $field_type
+   *   The field storage type.
+   * @param string $bundle_name
+   *   The media bundle machine name.
+   */
+  protected function createMediaField($field_name, $field_type, $bundle_name) {
+    $storage = FieldStorageConfig::create([
+      'field_name' => $field_name,
+      'entity_type' => 'media',
+      'type' => $field_type,
+    ]);
+    $storage->save();
+    $instance = FieldConfig::create([
+      'field_storage' => $storage,
+      'bundle' => $bundle_name,
+    ]);
+    $instance->save();
+    // Make the field visible in the form display.
+    /** @var \Drupal\Core\Entity\Display\EntityFormDisplayInterface $form_display */
+    $component = \Drupal::service('plugin.manager.field.widget')
+      ->prepareConfiguration($field_type, []);
+    entity_get_form_display('media', $bundle_name, 'default')
+      ->setComponent($field_name, $component)
+      ->save();
+  }
+
+  /**
+   * Helper to create a set of fields in a bundle.
+   *
+   * @param array $fields
+   *   An associative array where keys are field names and values field types.
+   * @param string $bundle_name
+   *   The bundle machine name.
+   */
+  protected function createMediaFields(array $fields, $bundle_name) {
+    foreach ($fields as $field_name => $field_type) {
+      $this->createMediaField($field_name, $field_type, $bundle_name);
+    }
+  }
+
+  /**
+   * Hide a component from the default form display config.
+   *
+   * @param string $field_name
+   *   The field name.
+   * @param string $bundle_name
+   *   The media bundle machine name.
+   */
+  protected function hideMediaField($field_name, $bundle_name) {
+    $form_display = entity_get_form_display('media', $bundle_name, 'default');
+    $form_display->removeComponent($field_name)->save();
+  }
+
+  /**
+   * Helper to test a generic bundle creation.
+   *
+   * @param string $bundle_name
+   *   The bundle machine name.
+   * @param string $bundle_type
+   *   The bundle type ID.
+   * @param array $provided_fields
+   *   (optional) An array of field machine names this type provides.
+   *
+   * @return \Drupal\media_entity\MediaBundleInterface
+   *   The bundle created.
+   */
+  public function createMediaBundleTest($bundle_name, $bundle_type, array $provided_fields = []) {
+    $session = $this->getSession();
+    $page = $session->getPage();
+    $assert_session = $this->assertSession();
+
+    $this->drupalGet('admin/structure/media/add');
+    $page->fillField('label', $bundle_name);
+    // assertWaitOnAjaxRequest() doesn't work on the machine name element.
+    $session->wait(5000, "jQuery('.machine-name-value').text() === '$bundle_name'");
+
+    // Make sure the bundle type is available as plugin type.
+    $assert_session->optionExists('type', $bundle_type);
+    $page->selectFieldOption('type', $bundle_type);
+    $assert_session->assertWaitOnAjaxRequest();
+
+    // Make sure the provided fields are visible on the form.
+    if (!empty($provided_fields)) {
+      foreach ($provided_fields as $provided_field) {
+        $assert_session->selectExists("field_mapping[$provided_field]");
+      }
+    }
+
+    // Save the page to create the bundle.
+    $page->pressButton('Save');
+    $assert_session->pageTextContains('The media type ' . $bundle_name . ' has been added.');
+    $this->drupalGet('admin/structure/media');
+    $assert_session->pageTextContains($bundle_name);
+
+    return MediaBundle::load($bundle_name);
+  }
+
+  /**
+   * Helper to assert presence/absence of select options.
+   *
+   * @param string $select
+   *   One of id|name|label|value for the select field.
+   * @param array $expected_options
+   *   An indexed array of expected option names.
+   * @param array $non_expected_options
+   *   An indexed array of non-expected option names.
+   *
+   * @see \Drupal\Tests\WebAssert::optionExists()
+   * @see \Drupal\Tests\WebAssert::optionNotExists()
+   */
+  protected function assertSelectOptions($select, $expected_options = [], $non_expected_options = []) {
+    $assert_session = $this->assertSession();
+    foreach ($expected_options as $expected_option) {
+      $assert_session->optionExists($select, $expected_option);
+    }
+    foreach ($non_expected_options as $non_expected_option) {
+      $assert_session->optionNotExists($select, $non_expected_option);
+    }
+  }
+
+}
diff --git a/core/profiles/standard/config/optional/media_entity.bundle.document.yml b/core/profiles/standard/config/optional/media_entity.bundle.document.yml
new file mode 100644
index 0000000000000000000000000000000000000000..0812e8ab82e1ddd8ffc7b1917256fee8c93962ef
--- /dev/null
+++ b/core/profiles/standard/config/optional/media_entity.bundle.document.yml
@@ -0,0 +1,14 @@
+langcode: en
+status: true
+dependencies:
+  module:
+    - media_entity
+id: document
+label: Document
+description: 'Use Document for uploading document files.'
+type: document
+queue_thumbnail_downloads: false
+new_revision: false
+type_configuration:
+  source_field: field_media_source_document
+field_map: { }