Index: wp-includes/functions.php
===================================================================
--- wp-includes/functions.php	(revision 12531)
+++ wp-includes/functions.php	(working copy)
@@ -2224,9 +2224,9 @@
 	$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', 'm4v'),
-		'document' => array('doc','docx','pages','odt','rtf','pdf'),
-		'spreadsheet' => array('xls','xlsx','numbers','ods'),
-		'interactive' => array('ppt','pptx','key','odp','swf'),
+		'document' => array('doc','docx','docm','dotm','pages','odt','rtf','pdf'),
+		'spreadsheet' => array('xls','xlsx','xlsb','xlsm','numbers','ods'),
+		'interactive' => array('ppt','pptx','pptm','key','odp','swf'),
 		'text' => array('txt'),
 		'archive' => array('tar','bz2','gz','cab','dmg','rar','sea','sit','sqx','zip'),
 		'code' => array('css','html','php','js'),
@@ -2305,11 +2305,16 @@
 		'js' => 'application/javascript',
 		'pdf' => 'application/pdf',
 		'doc|docx' => 'application/msword',
-		'pot|pps|ppt|pptx' => 'application/vnd.ms-powerpoint',
+		'pot|pps|ppt|pptx|ppam|pptm|sldm|ppsm|potm' => 'application/vnd.ms-powerpoint',
 		'wri' => 'application/vnd.ms-write',
-		'xla|xls|xlsx|xlt|xlw' => 'application/vnd.ms-excel',
+		'xla|xls|xlsx|xlt|xlw|xlam|xlsb|xlsm|xltm' => 'application/vnd.ms-excel',
 		'mdb' => 'application/vnd.ms-access',
 		'mpp' => 'application/vnd.ms-project',
+		'docm|dotm' => 'application/vnd.ms-word',
+		'pptx|sldx|ppsx|potx' => 'application/vnd.openxmlformats-officedocument.presentationml',
+		'xlsx|xltx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml',
+		'docx|dotx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml',
+		'onetoc|onetoc2|onetmp|onepkg' => 'application/onenote',
 		'swf' => 'application/x-shockwave-flash',
 		'class' => 'application/java',
 		'tar' => 'application/x-tar',