diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 1978e39852d4..4e1a8eb13a18 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,6 +1,8 @@
 
 Drupal 7.23, xxxx-xx-xx (development version)
 -----------------------
+- Changed the default web.config file for IIS servers to allow favicon.ico
+  files which are present in the filesystem to be accessed.
 - Fixed inconsistent support for the 'tel' protocol in Drupal's URL filtering
   functions.
 - Performance improvement: Allowed all hooks to be included in the
diff --git a/web.config b/web.config
index 34afd0a469be..09983d92542e 100644
--- a/web.config
+++ b/web.config
@@ -12,6 +12,9 @@
         <rule name="Force simple error message for requests for non-existent favicon.ico" stopProcessing="true">
           <match url="favicon\.ico" />
           <action type="CustomResponse" statusCode="404" subStatusCode="1" statusReason="File Not Found" statusDescription="The requested file favicon.ico was not found" />
+          <conditions>
+            <add input="{REQUEST_FILENAME}" matchType="IsFile" negate="true" />
+          </conditions>
         </rule>
         <!-- Rewrite URLs of the form 'x' to the form 'index.php?q=x'. -->
         <rule name="Short URLs" stopProcessing="true">