--- .htaccess.1.91	Thu Jun 26 13:35:33 2008
+++ .htaccess	Thu Jun 26 13:51:09 2008
@@ -13,8 +13,10 @@ Options -Indexes
 # Follow symbolic links in this directory.
 Options +FollowSymLinks
 
-# Customized error messages.
-ErrorDocument 404 /index.php
+# Make Drupal handle any 404 errors (except for missing favicon.ico).
+<FilesMatch "^(?!favicon\.ico$)>"
+  ErrorDocument 404 /index.php
+</FilesMatch>
 
 # Set the default handler.
 DirectoryIndex index.php
@@ -77,6 +79,7 @@ DirectoryIndex index.php
   # Rewrite URLs of the form 'index.php?q=x'.
   RewriteCond %{REQUEST_FILENAME} !-f
   RewriteCond %{REQUEST_FILENAME} !-d
+  RewriteCond %{REQUEST_URI} !=/favicon.ico
   RewriteRule ^(.*)$ index.php?q=$1 [L,QSA]
 </IfModule>