--- httpd-2.2.22.orig/include/http_core.h
+++ httpd-2.2.22/include/http_core.h
@@ -80,7 +80,7 @@
 /** MultiViews directive */
 #define OPT_MULTI 128
 /**  All directives */
-#define OPT_ALL (OPT_INDEXES|OPT_INCLUDES|OPT_INCNOEXEC|OPT_SYM_LINKS|OPT_EXECCGI)
+#define OPT_ALL (OPT_INDEXES|OPT_INCLUDES|OPT_INCNOEXEC|OPT_SYM_OWNER|OPT_EXECCGI)
 /** @} */
 
 #ifdef CORE_PRIVATE
--- httpd-2.2.22.orig/server/core.c
+++ httpd-2.2.22/server/core.c
@@ -114,7 +114,7 @@
     conf->opts = dir ? OPT_UNSET : OPT_UNSET|OPT_ALL;
     conf->opts_add = conf->opts_remove = OPT_NONE;
     conf->override = dir ? OR_UNSET : OR_UNSET|OR_ALL;
-    conf->override_opts = OPT_UNSET | OPT_ALL | OPT_SYM_OWNER | OPT_MULTI;
+    conf->override_opts = OPT_UNSET | OPT_ALL | OPT_SYM_LINKS | OPT_MULTI;
 
     conf->content_md5 = 2;
     conf->accept_path_info = AP_ACCEPT_PATHINFO_UNSET;
@@ -1345,11 +1345,15 @@
             opt = OPT_INCLUDES;
         }
         else if (!strcasecmp(w, "FollowSymLinks")) {
-            opt = OPT_SYM_LINKS;
+            opt = OPT_SYM_OWNER;
         }
+        /* XXX COMPAT */
         else if (!strcasecmp(w, "SymLinksIfOwnerMatch")) {
             opt = OPT_SYM_OWNER;
         }
+        else if (!strcasecmp(w, "UnhardenedSymLinks")) {
+            opt = OPT_SYM_LINKS;
+        }
         else if (!strcasecmp(w, "ExecCGI")) {
             opt = OPT_EXECCGI;
         }
@@ -1469,10 +1473,14 @@
             opt = OPT_INCLUDES;
         }
         else if (!strcasecmp(w, "FollowSymLinks")) {
-            opt = OPT_SYM_LINKS;
+            opt = OPT_SYM_OWNER;
         }
+        /* XXX COMPAT */
         else if (!strcasecmp(w, "SymLinksIfOwnerMatch")) {
             opt = OPT_SYM_OWNER;
+        }
+        else if (!strcasecmp(w, "UnhardenedSymLinks")) {
+            opt = OPT_SYM_LINKS;
         }
         else if (!strcasecmp(w, "ExecCGI")) {
             opt = OPT_EXECCGI;