Index: /var/www/html/wordpress-trunk/trunk/wp-includes/functions.php
===================================================================
--- /var/www/html/wordpress-trunk/trunk/wp-includes/functions.php	(revision 16800)
+++ /var/www/html/wordpress-trunk/trunk/wp-includes/functions.php	(working copy)
@@ -2356,7 +2356,7 @@
 	$ext2type = apply_filters( 'ext2type', array(
 		'audio'       => array( 'aac', 'ac3',  'aif',  'aiff', 'm3a',  'm4a',   'm4b', 'mka', 'mp1', 'mp2',  'mp3', 'ogg', 'oga', 'ram', 'wav', 'wma' ),
 		'video'       => array( 'asf', 'avi',  'divx', 'dv',   'flv',  'm4v',   'mkv', 'mov', 'mp4', 'mpeg', 'mpg', 'mpv', 'ogm', 'ogv', 'qt',  'rm', 'vob', 'wmv' ),
-		'document'    => array( 'doc', 'docx', 'docm', 'dotm', 'odt',  'pages', 'pdf', 'rtf', 'wp',  'wpd' ),
+		'document'    => array( 'doc', 'docx', 'docm', 'dotm', 'odt',  'pages', 'pdf', 'xps', 'oxps', 'rtf', 'wp',  'wpd' ),
 		'spreadsheet' => array( 'numbers',     'ods',  'xls',  'xlsx', 'xlsb',  'xlsm' ),
 		'interactive' => array( 'key', 'ppt',  'pptx', 'pptm', 'odp',  'swf' ),
 		'text'        => array( 'asc', 'csv',  'tsv',  'txt' ),
@@ -2509,6 +2509,8 @@
 		'rtf' => 'application/rtf',
 		'js' => 'application/javascript',
 		'pdf' => 'application/pdf',
+                'oxps' => 'application/oxps',
+                'xps' => 'application/vnd.ms-xpsdocument',
 		'doc|docx' => 'application/msword',
 		'pot|pps|ppt|pptx|ppam|pptm|sldm|ppsm|potm' => 'application/vnd.ms-powerpoint',
 		'wri' => 'application/vnd.ms-write',