diff --git a/file_entity.field.inc b/file_entity.field.inc
index 43016ff..50eeb46 100644
--- a/file_entity.field.inc
+++ b/file_entity.field.inc
@@ -15,6 +15,18 @@ function file_entity_field_formatter_info() {
     'field types' => array('file', 'image'),
     'settings' => array('file_view_mode' => 'default'),
   );
+  $info['file_audio'] = array(
+    'label' => t('Audio'),
+    'description' => t('Render the file using an HTML5 audio tag'),
+    'field types' => array('file'),
+    'settings' => array('controls' => TRUE, 'multiple_file_behaviour' => 'sources'),
+  );
+  $info['file_video'] = array(
+    'label' => t('Video'),
+    'description' => t('Render the file using an HTML5 video tag'),
+    'field types' => array('file'),
+    'settings' => array('controls' => TRUE, 'multiple_file_behaviour' => 'sources'),
+  );
   return $info;
 }
 
@@ -35,7 +47,40 @@ function file_entity_field_formatter_settings_form($field, $instance, $view_mode
       // Never empty, so no #empty_option
     );
   }
+  else if ($display['type'] == 'file_audio') {
+    $element['controls'] = array(
+      '#title' => t('Show audio controls'),
+      '#type' => 'checkbox',
+      '#default_value' => isset($settings['controls']) ? $settings['controls'] : TRUE,
+    );
+    $element['multiple_file_behaviour'] = array(
+      '#title' => t('Display of multiple files'),
+      '#type' => 'radios',
+      '#options' => array(
+        'sources' => t('Use multiple sources within a single <audio> tag'),
+        'tags' => t('Use multiple <audio> tags, each with a single source'),
+      ),
+      '#default_value' => $settings['multiple_file_behaviour'],
+    );
 
+  }
+  else if ($display['type'] == 'file_video') {
+    $element['controls'] = array(
+      '#title' => t('Show video controls'),
+      '#type' => 'checkbox',
+      '#default_value' => isset($settings['controls']) ? $settings['controls'] : TRUE,
+    );
+    $element['multiple_file_behaviour'] = array(
+      '#title' => t('Display of multiple files'),
+      '#type' => 'radios',
+      '#options' => array(
+        'sources' => t('Use multiple sources within a single <video> tag'),
+        'tags' => t('Use multiple <video> tags, each with a single source'),
+      ),
+      '#default_value' => $settings['multiple_file_behaviour'],
+    );
+
+  }
   return $element;
 }
 
@@ -51,6 +96,12 @@ function file_entity_field_formatter_settings_summary($field, $instance, $view_m
     $view_mode_label = file_entity_view_mode_label($settings['file_view_mode'], t('Unknown'));
     $summary = t('View mode: %mode', array('%mode' => $view_mode_label));
   }
+  else if ($display['type'] === 'file_audio') {
+    $summary =  t('Multiple files: %multiple', array('%multiple' => $settings['multiple_file_behaviour']));
+  }
+  else if ($display['type'] === 'file_video') {
+    $summary =  t('Multiple files: %multiple', array('%multiple' => $settings['multiple_file_behaviour']));
+  }
 
   return $summary;
 }
@@ -113,5 +164,73 @@ function file_entity_field_formatter_view($entity_type, $entity, $field, $instan
     }
   }
 
+  else if ($display['type'] == 'file_audio') {
+    $multiple_file_behaviour = $settings['multiple_file_behaviour'];
+    $controls = isset($settings['controls']) ? $settings['controls'] : TRUE;
+
+    // Prevent 'empty' fields from causing a WSOD.
+    $items = array_filter($items);
+
+    // Build an array of sources for each <audio> element.
+    $source_lists = array();
+    if ($multiple_file_behaviour == 'tags') {
+      foreach ($items as $delta => $item) {
+        if ($item['type'] == 'audio') {
+          $source_lists[] = array($item);
+        }
+      }
+    }
+    else {
+      foreach ($items as $delta => $item) {
+        if ($item['type'] == 'audio') {
+          $source_lists[][] = $item;
+        }
+      }
+    }
+
+    // render each source list as an <audio> element
+    foreach ($source_lists as $delta => $sources) {
+      $element[$delta] = array(
+        '#theme' => 'file_entity_file_audio',
+        '#files' => $sources,
+        '#controls' => $controls,
+      );
+    }
+  }
+
+  else if ($display['type'] == 'file_video') {
+    $multiple_file_behaviour = $settings['multiple_file_behaviour'];
+
+    // Prevent 'empty' fields from causing a WSOD.
+    $items = array_filter($items);
+
+    // Build an array of sources for each <video> element.
+    $source_lists = array();
+    if ($multiple_file_behaviour == 'tags') {
+      foreach ($items as $delta => $item) {
+        if ($item['type'] == 'video') {
+          $source_lists[] = array($item);
+        }
+      }
+    }
+    else {
+      foreach ($items as $delta => $item) {
+        if ($item['type'] == 'video') {
+          $source_lists[][] = $item;
+        }
+      }
+    }
+
+    // render each source list as an <video> element
+    foreach ($source_lists as $delta => $sources) {
+      $element[$delta] = array(
+        '#theme' => 'file_entity_file_video',
+        '#files' => $sources,
+        '#controls' => isset($settings['controls']) ? $settings['controls'] : TRUE,
+      );
+    }
+
+  }
+
   return $element;
 }
diff --git a/file_entity.module b/file_entity.module
index d3ea3fe..2ff2dfa 100644
--- a/file_entity.module
+++ b/file_entity.module
@@ -10,7 +10,7 @@
  *
  * Adds support for docx, xlsx, pptx and ppsx.
  */
-define('FILE_DEFAULT_ALLOWED_EXTENSIONS', 'jpg jpeg gif png txt doc docx xls xlsx pdf ppt pptx pps ppsx odt ods odp');
+define('FILE_DEFAULT_ALLOWED_EXTENSIONS', 'jpg jpeg gif png txt doc docx xls xlsx pdf ppt pptx pps ppsx odt ods odp m4a');
 
 /**
  * As part of extending Drupal core's file entity API, this module adds some
@@ -335,7 +335,15 @@ function file_entity_theme() {
     'file_entity_file_link' => array(
       'variables' => array('file' => NULL, 'icon_directory' => NULL),
       'file' => 'file_entity.theme.inc',
-    )
+    ),
+    'file_entity_file_audio' => array(
+      'variables' => array('files' => array(), 'controls' => TRUE),
+      'file' => 'file_entity.theme.inc',
+    ),
+    'file_entity_file_video' => array(
+      'variables' => array('files' => array(), 'controls' => TRUE),
+      'file' => 'file_entity.theme.inc',
+    ),
   );
 }
 
diff --git a/file_entity.theme.inc b/file_entity.theme.inc
index 72bec3d..7d1672c 100644
--- a/file_entity.theme.inc
+++ b/file_entity.theme.inc
@@ -36,4 +36,58 @@ function theme_file_entity_file_link($variables) {
   }
 
   return '<span class="file">' . $icon . ' ' . l($link_text, $url, $options) . '</span>';
-}
\ No newline at end of file
+}
+
+/**
+ * Returns HTML for displaying an HTML5 <audio> tag.
+ *
+ * @param $variables
+ *   An associative array containing:
+ *   - file: Associative array of file data, which must include "uri".
+ *   - controls: Boolean indicating whether or not controls should be displayed.
+ *
+ * @ingroup themeable
+ */
+function theme_file_entity_file_audio($variables) {
+  $files = $variables['files'];
+  $output = '';
+
+  $attributes = array();
+  if ($variables['controls']) {
+    $attributes['controls'] = 'controls';
+  }
+
+  $output .= '<audio' . drupal_attributes($attributes) . '>';
+  foreach ($files as $delta => $file) {
+    $output .= '<source src="' . file_create_url($file['uri']) . '" />';
+  }
+  $output .= '</audio>';
+  return $output;
+}
+
+/**
+ * Returns HTML for displaying an HTML5 <video> tag.
+ *
+ * @param $variables
+ *   An associative array containing:
+ *   - file: Associative array of file data, which must include "uri".
+ *   - controls: Boolean indicating whether or not controls should be displayed.
+ *
+ * @ingroup themeable
+ */
+function theme_file_entity_file_video($variables) {
+  $files = $variables['files'];
+  $output = '';
+
+  $attributes = array();
+  if ($variables['controls']) {
+    $attributes['controls'] = 'controls';
+  }
+
+  $output .= '<video' . drupal_attributes($attributes) . '>';
+  foreach ($files as $delta => $file) {
+    $output .= '<source src="' . file_create_url($file['uri']) . '" />';
+  }
+  $output .= '</video>';
+  return $output;
+}