diff --git a/.htaccess b/.htaccess
index 16ffb0902..906546b28 100644
--- a/.htaccess
+++ b/.htaccess
@@ -20,7 +20,7 @@ php_value   session.gc_probability   1
 </IfModule>
 
 <IfModule mod_rewrite.c>
-Options +FollowSymLinks
+Options +SymLinksIfOwnerMatch
 RewriteEngine On
 RewriteRule ^favicon\.ico$ skins/larry/images/favicon.ico
 
diff --git a/CHANGELOG b/CHANGELOG
index 08fd7b9d4..a25b9b65f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -30,6 +30,7 @@ CHANGELOG Roundcube Webmail
 - Enigma: Fix signature verification with some IMAP servers, e.g. Gmail, DBMail (#5371)
 - Fix regression in resizing JPEG images with Imagick (#5376)
 - Managesieve: Fix parsing of vacation date-time with non-default date_format (#5372)
+- Use SymLinksIfOwnerMatch in .htaccess instead of FollowSymLinks disabled on some hosts for security reasons (#5370)
 
 RELEASE 1.2.1
 -------------