diff --git a/config/vufind/httpd-vufind.conf b/config/vufind/httpd-vufind.conf
index f075423607093a0a6bd036b5edae572223e59ef9..36c41cb36ddbf7c8861ac29f72efd4cffca1e877 100644
--- a/config/vufind/httpd-vufind.conf
+++ b/config/vufind/httpd-vufind.conf
@@ -25,15 +25,18 @@ Alias /vufind /usr/local/vufind/public
   </IfModule>
   AllowOverride All
 
+  php_value short_open_tag On
+
   # If you wish to use the Shibboleth authentication, uncomment the following lines
   # AND comment out the "Require all granted" line above. There must not be any other
   # "Require" lines in this configuration section for the "Require shibboleth"
   # directive to be effective.
   #AuthType shibboleth
   #Require shibboleth
+</Directory>
 
+<Location /vufind>
   RewriteEngine On
-  RewriteBase /vufind
 
   # If using VuDL, uncomment the following line, fill in your appropriate Fedora
   # server and port, and make sure that Apache mod_proxy and mod_proxy_http are
@@ -46,8 +49,6 @@ Alias /vufind /usr/local/vufind/public
   RewriteRule ^.*$ - [NC,L]
   RewriteRule ^.*$ index.php [NC,L]
 
-  php_value short_open_tag On
-
   # Uncomment this line to put VuFind into development mode in order to see more detailed messages:
   #SetEnv VUFIND_ENV development
 
@@ -77,4 +78,4 @@ Alias /vufind /usr/local/vufind/public
   # the location of the index.php file, but in case it is e.g. symlinked or there is another reason
   # to define the path manually, you can uncomment and modify this line.
   #SetEnv VUFIND_APPLICATION_PATH /usr/local/vufind
-</Directory>
+</Location>