diff --git a/.htaccess b/.htaccess
index 151239c..1af2228 100644
--- a/.htaccess
+++ b/.htaccess
@@ -10,9 +10,6 @@
 # Don't show directory listings for URLs which map to a directory.
 Options -Indexes
 
-# Follow symbolic links in this directory.
-Options +FollowSymLinks
-
 # Make Drupal handle any 404 errors.
 ErrorDocument 404 /index.php
 
diff --git a/includes/file.inc b/includes/file.inc
index ba3da06..26eb544 100644
--- a/includes/file.inc
+++ b/includes/file.inc
@@ -516,8 +516,7 @@ function file_create_htaccess($directory, $private = TRUE, $force_overwrite = FA
 function file_htaccess_lines($private = TRUE) {
   $lines = <<<EOF
 # Turn off all options we don't need.
-Options None
-Options +FollowSymLinks
+Options -Indexes -ExecCGI -Includes -MultiViews
 
 # Set the catch-all handler to prevent scripts from being executed.
 SetHandler Drupal_Security_Do_Not_Remove_See_SA_2006_006