diff --git a/shibauth/etc-httpd/conf.d/shib.conf b/shibauth/etc-httpd/conf.d/shib.conf
index 635aa4622281c6dc6cff8f4ff2250f4f78c669e2..cb82c34eb1c73ded2fe3c2365795b1fcad112b02 100755
--- a/shibauth/etc-httpd/conf.d/shib.conf
+++ b/shibauth/etc-httpd/conf.d/shib.conf
@@ -1,7 +1,7 @@
-ServerName emg.pdas.prism.eox.at
 LoadModule mod_shib /usr/lib64/shibboleth/mod_shib_24.so
 ShibCompatValidUser Off
 UseCanonicalName On
+DocumentRoot "/var/www/html"
 <Location />
   SetHandler shib
 </Location>
diff --git a/shibauth/etc-httpd/conf.d/sp.conf b/shibauth/etc-httpd/conf.d/sp.conf
index ad617192aa2f9f06e8ce510acfadaff39c960ab4..5186e84f879ce83090b804a2c101de78bbb0addc 100755
--- a/shibauth/etc-httpd/conf.d/sp.conf
+++ b/shibauth/etc-httpd/conf.d/sp.conf
@@ -1,12 +1,10 @@
 <VirtualHost *:80>
-    ServerName PassEnv APACHE_SERVERNAME
-    UseCanonicalName On
-
-    DocumentRoot "/var/www/html"
+    PassEnv APACHE_SERVERNAME
+    ServerName "${APACHE_SERVERNAME}"
     <Location /secure>
       AuthType shibboleth
       ShibRequestSetting requireSession 1
-      ShibAccessControl /etc/shibboleth/pass-ac.xml
+      Require shib-plugin /etc/shibboleth/pass-ac.xml
       RequestHeader set Referer "%{X-Forwarded-Uri}e"
       Header set Referer "%{X-Forwarded-Uri}e"
     </Location>