Index: wp-includes/functions.php
===================================================================
--- wp-includes/functions.php	(revision 23296)
+++ wp-includes/functions.php	(working copy)
@@ -1437,7 +1437,7 @@
 /**
  * Determine if a directory is writable.
  *
- * This function is used to work around certain ACL issues 
+ * This function is used to work around certain ACL issues
  * in PHP primarily affecting Windows Servers.
  *
  * @see win_is_writable()
@@ -1457,7 +1457,7 @@
 /**
  * Workaround for Windows bug in is_writable() function
  *
- * PHP has issues with Windows ACL's for determine if a 
+ * PHP has issues with Windows ACL's for determine if a
  * directory is writable or not, this works around them by
  * checking the ability to open files rather than relying
  * upon PHP to interprate the OS ACL.
@@ -1912,7 +1912,10 @@
 	'tif|tiff' => 'image/tiff',
 	'ico' => 'image/x-icon',
 	// Video formats
-	'asf|asx|wax|wmv|wmx' => 'video/asf',
+	'asf|asx' => 'video/x-ms-asf',
+	'wmv' => 'video/x-ms-wmv',
+	'wmx' => 'video/x-ms-wmx',
+	'wm' => 'video/x-ms-wm',
 	'avi' => 'video/avi',
 	'divx' => 'video/divx',
 	'flv' => 'video/x-flv',
@@ -1936,7 +1939,8 @@
 	'wav' => 'audio/wav',
 	'ogg|oga' => 'audio/ogg',
 	'mid|midi' => 'audio/midi',
-	'wma' => 'audio/wma',
+	'wma' => 'audio/x-ms-wma',
+	'wax' => 'audio/x-ms-wax',
 	'mka' => 'audio/x-matroska',
 	// Misc application formats
 	'rtf' => 'application/rtf',