? sites/default/files
? sites/default/settings.php
? sites/default/themes
Index: includes/file.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/file.inc,v
retrieving revision 1.167
diff -u -p -r1.167 file.inc
--- includes/file.inc	22 Apr 2009 09:45:02 -0000	1.167
+++ includes/file.inc	17 May 2009 09:32:03 -0000
@@ -1798,7 +1798,7 @@ function file_get_mimetype($filename, $m
       'cdr' => 'image/x-coreldraw',
       'pat' => 'image/x-coreldrawpattern',
       'cdt' => 'image/x-coreldrawtemplate',
-      'ico' => 'image/x-icon',
+      'ico' => 'image/vnd.microsoft.icon',
       'art' => 'image/x-jg',
       'jng' => 'image/x-jng',
       'bmp' => 'image/x-ms-bmp',
Index: includes/theme.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/theme.inc,v
retrieving revision 1.485
diff -u -p -r1.485 theme.inc
--- includes/theme.inc	14 May 2009 08:23:14 -0000	1.485
+++ includes/theme.inc	17 May 2009 09:32:04 -0000
@@ -1769,7 +1769,13 @@ function template_preprocess_page(&$vari
 
   // Add favicon.
   if (theme_get_setting('toggle_favicon')) {
-    drupal_add_html_head('<link rel="shortcut icon" href="' . check_url(theme_get_setting('favicon')) . '" type="image/x-icon" />');
+    $favicon = theme_get_setting('favicon');
+    $type = file_get_mimetype($favicon);
+    // Use the genereic MIME type for favicon's if no other was found.
+    if ($type == 'application/octet-stream') {
+      $type = 'image/x-icon';
+    }
+    drupal_add_html_head('<link rel="shortcut icon" href="' . check_url($favicon) . '" type="' . check_plain($type) . '" />');
   }
 
   // Set up layout variable.
Index: includes/theme.maintenance.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/theme.maintenance.inc,v
retrieving revision 1.26
diff -u -p -r1.26 theme.maintenance.inc
--- includes/theme.maintenance.inc	12 May 2009 13:43:44 -0000	1.26
+++ includes/theme.maintenance.inc	17 May 2009 09:32:04 -0000
@@ -206,7 +206,13 @@ function theme_update_page($content, $sh
 function template_preprocess_maintenance_page(&$variables) {
   // Add favicon
   if (theme_get_setting('toggle_favicon')) {
-    drupal_add_html_head('<link rel="shortcut icon" href="' . check_url(theme_get_setting('favicon')) . '" type="image/x-icon" />');
+    $favicon = theme_get_setting('favicon');
+    $type = file_get_mimetype($favicon);
+    // Use the genereic MIME type for favicon's if no other was found.
+    if ($type == 'application/octet-stream') {
+      $type = 'image/x-icon';
+    }
+    drupal_add_html_head('<link rel="shortcut icon" href="' . check_url($favicon) . '" type="' . check_plain($type) . '" />');
   }
 
   global $theme;