diff --git a/.htaccess b/.htaccess
index 275161166..95e5bf475 100644
--- a/.htaccess
+++ b/.htaccess
@@ -24,6 +24,7 @@ php_value   session.gc_probability   1
 </IfModule>
 
 <IfModule mod_rewrite.c>
+Options +FollowSymLinks
 RewriteEngine On
 RewriteRule ^favicon\.ico$ skins/larry/images/favicon.ico
 
diff --git a/CHANGELOG b/CHANGELOG
index 74cd27db1..b77215c86 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -19,6 +19,7 @@ CHANGELOG Roundcube Webmail
 - Fix false warning when opening attached text/plain files (#1490241)
 - Fix bug where signature could have been inserted twice after plain-to-html switch (#1490239)
 - Fix security issue in DBMail driver of password plugin (#1490261)
+- Enable FollowSymLinks option in .htaccess file which is required by rewrite rules (#1490255)
 
 RELEASE 1.1-rc
 --------------