diff --git a/ChangeLog b/ChangeLog
index ac46180de5f606acec2810c0e6f653cd80ea2d6b..0e750ae0d8273dc03bf5d9991b944cd018cc869b 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 2007-02-07  Michael Stucki  <michael@typo3.org>
 
 	* Release of TYPO3 4.1RC1
+	* Fixed bug #4883: mod_rewrite rules rewrite missing favicon.ico to index.php (thanks to Stefan Geith for this hint - notice that manual modification of existing .htaccess files might be neccessary)
 	* Added feature #4476: Allow limitation of config.linkVars
 	* Fixed bug #4917: Wrong links inside mounted page with overlay (thanks to Melanie Meyer / Franz Ripfel)
 
diff --git a/misc/advanced.htaccess b/misc/advanced.htaccess
index d31119f2250e70195f4fdc630e41cc7f49e1e8fe..a2e2831b7743f082ee9bdae5a45f58df831354c1 100644
--- a/misc/advanced.htaccess
+++ b/misc/advanced.htaccess
@@ -56,8 +56,8 @@ RewriteEngine On
 
 # Stop rewrite processing if we are in the typo3/ directory
 # For httpd.conf, use this line instead of the next one:
-# RewriteRule ^/TYPO3root/(typo3|typo3temp|typo3conf|t3lib|tslib|fileadmin|uploads|showpic\.php)/ - [L]
-RewriteRule ^(typo3|typo3temp|typo3conf|t3lib|tslib|fileadmin|uploads|showpic\.php)/ - [L]
+# RewriteRule ^/TYPO3root/(typo3|t3lib|tslib|fileadmin|typo3conf|typo3temp|uploads|showpic\.php|favicon\.ico)/ - [L]
+RewriteRule ^(typo3|t3lib|tslib|fileadmin|typo3conf|typo3temp|uploads|showpic\.php|favicon\.ico)/ - [L]
 
 # Redirect http://mysite/typo3 to http://mysite/typo3/index_re.php
 # and stop the rewrite processing
diff --git a/misc/simple.htaccess b/misc/simple.htaccess
index e6ab99baf4935921b4d33d61a286c65e15b7e0c5..6564f5213df8fad2fa9b0430d9760ee924cf46f1 100755
--- a/misc/simple.htaccess
+++ b/misc/simple.htaccess
@@ -1,4 +1,4 @@
 RewriteEngine On
 RewriteCond %{REQUEST_FILENAME} !-f
 RewriteRule   ^typo3$  typo3/index_re.php
-RewriteRule   ^[^/]*\.html$  index.php
\ No newline at end of file
+RewriteRule   ^[^/]*\.html$  index.php