diff --git a/.htaccess b/.htaccess
index 2bc9f95ea..55dad98ed 100644
--- a/.htaccess
+++ b/.htaccess
@@ -17,7 +17,7 @@ php_flag	zend.ze1_compatibility_mode	Off
 php_flag 	suhosin.session.encrypt 	Off
 
 #php_value	session.cookie_path		/
-php_value	session.auto_start	0
+php_flag	session.auto_start	Off
 php_value	session.gc_maxlifetime	21600
 php_value	session.gc_divisor	500
 php_value	session.gc_probability	1
@@ -49,4 +49,7 @@ ExpiresDefault "access plus 1 month"
 </IfModule>
 
 FileETag MTime Size
+
+<IfModule mod_autoindex.c>
 Options -Indexes
+</ifModule>
diff --git a/CHANGELOG b/CHANGELOG
index 3c2a7f4f9..36eae2f58 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 CHANGELOG Roundcube Webmail
 ===========================
 
+- Add ifModule statement for setting Options -Indexes in .htaccess file (#1488274)
 - Fix crashes with eAccelerator (#1488256)
 - Fix searching on IMAP servers without CHARSET specifier support (#1488271)
 - Fix expanding folders during drag&drop (#1488260)