diff --git a/wp-includes/functions.php b/wp-includes/functions.php
index da65d5cc1..940098d22 100644
--- a/wp-includes/functions.php
+++ b/wp-includes/functions.php
@@ -2118,7 +2118,7 @@ function wp_upload_bits( $name, $deprecated, $bits, $time = null ) {
 function wp_ext2type( $ext ) {
 	$ext2type = apply_filters('ext2type', array(
 		'audio' => array('aac','ac3','aif','aiff','mp1','mp2','mp3','m3a','m4a','m4b','ogg','ram','wav','wma'),
-		'video' => array('asf','avi','divx','dv','mov','mpg','mpeg','mp4','mpv','ogm','qt','rm','vob','wmv'),
+		'video' => array('asf','avi','divx','dv','mov','mpg','mpeg','mp4','mpv','ogm','qt','rm','vob','wmv', 'm4v'),
 		'document' => array('doc','docx','pages','odt','rtf','pdf'),
 		'spreadsheet' => array('xls','xlsx','numbers','ods'),
 		'interactive' => array('ppt','pptx','key','odp','swf'),
@@ -2155,12 +2155,13 @@ function wp_check_filetype( $filename, $mimes = null ) {
 		'avi' => 'video/avi',
 		'divx' => 'video/divx',
 		'mov|qt' => 'video/quicktime',
-		'mpeg|mpg|mpe|mp4' => 'video/mpeg',
+		'mpeg|mpg|mpe' => 'video/mpeg',
 		'txt|c|cc|h' => 'text/plain',
 		'rtx' => 'text/richtext',
 		'css' => 'text/css',
 		'htm|html' => 'text/html',
 		'mp3|m4a' => 'audio/mpeg',
+		'mp4|m4v' => 'video/mp4',
 		'ra|ram' => 'audio/x-realaudio',
 		'wav' => 'audio/wav',
 		'ogg' => 'audio/ogg',