diff --git a/.htaccess b/.htaccess
index 37fce10d32..bb230c8deb 100644
--- a/.htaccess
+++ b/.htaccess
@@ -16,7 +16,7 @@
 Options -Indexes
 
 # Follow symbolic links in this directory.
-Options +FollowSymLinks
+Options +SymLinksIfOwnerMatch
 
 # Make Drupal handle any 404 errors.
 ErrorDocument 404 /index.php
diff --git a/includes/file.inc b/includes/file.inc
index fa7f5eb547..e32c384065 100644
--- a/includes/file.inc
+++ b/includes/file.inc
@@ -519,7 +519,7 @@ function file_htaccess_lines($private = TRUE) {
   $lines = <<<EOF
 # Turn off all options we don't need.
 Options None
-Options +FollowSymLinks
+Options +SymLinksIfOwnerMatch
 
 # Set the catch-all handler to prevent scripts from being executed.
 SetHandler Drupal_Security_Do_Not_Remove_See_SA_2006_006