diff --git a/server/conf/vhost.conf.master b/server/conf/vhost.conf.master
index 03ef2fa2d9f8c5b35c34a5755f535d11c50521b8..38d1b61da4a1c7586d3ee726e30e23f76f0c5cf1 100644
--- a/server/conf/vhost.conf.master
+++ b/server/conf/vhost.conf.master
@@ -47,30 +47,11 @@
         Options +Includes
 </tmpl_if>
 <tmpl_if name='php' op='==' value='no'>
-        <Files ~ '.php$'>
+        <Files ~ '.php[s3-6]{0,1}$'>
             Order allow,deny
             Deny from all
             Allow from none
         </Files>
-        <Files ~ '.php3$'>
-            Order allow,deny
-            Deny from all
-            Allow from none
-        </Files>
-        <Files ~ '.php4$'>
-            Order allow,deny
-            Deny from all
-            Allow from none
-        </Files>
-        <Files ~ '.php5$'>
-            Order allow,deny
-            Deny from all
-            Allow from none
-        </Files>
-        <Files ~ '.phps'>
-            Order deny,allow
-            Allow from all
-        </Files>
 </tmpl_if>
     </Directory>
 	<Directory {tmpl_var name='web_document_root'}>
@@ -86,30 +67,11 @@
         Options +Includes
 </tmpl_if>
 <tmpl_if name='php' op='==' value='no'>
-        <Files ~ '.php$'>
+        <Files ~ '.php[s3-6]{0,1}$'>
             Order allow,deny
             Deny from all
             Allow from none
         </Files>
-        <Files ~ '.php3$'>
-            Order allow,deny
-            Deny from all
-            Allow from none
-        </Files>
-        <Files ~ '.php4$'>
-            Order allow,deny
-            Deny from all
-            Allow from none
-        </Files>
-        <Files ~ '.php5$'>
-            Order allow,deny
-            Deny from all
-            Allow from none
-        </Files>
-        <Files ~ '.phps'>
-            Order deny,allow
-            Allow from all
-        </Files>
 </tmpl_if>
     </Directory>
 
@@ -226,30 +188,11 @@
         Options +Includes
 </tmpl_if>
 <tmpl_if name='php' op='==' value='no'>
-        <Files ~ '.php$'>
+        <Files ~ '.php[s3-6]{0,1}$'>
             Order allow,deny
             Deny from all
             Allow from none
         </Files>
-        <Files ~ '.php3$'>
-            Order allow,deny
-            Deny from all
-            Allow from none
-        </Files>
-        <Files ~ '.php4$'>
-            Order allow,deny
-            Deny from all
-            Allow from none
-        </Files>
-        <Files ~ '.php5$'>
-            Order allow,deny
-            Deny from all
-            Allow from none
-        </Files>
-        <Files ~ '.phps'>
-            Order deny,allow
-            Allow from all
-        </Files>
 </tmpl_if>
     </Directory>
 	<Directory {tmpl_var name='web_document_root'}>
@@ -265,30 +208,11 @@
         Options +Includes
 </tmpl_if>
 <tmpl_if name='php' op='==' value='no'>
-        <Files ~ '.php$'>
+        <Files ~ '.php[s3-6]{0,1}$'>
             Order allow,deny
             Deny from all
             Allow from none
         </Files>
-        <Files ~ '.php3$'>
-            Order allow,deny
-            Deny from all
-            Allow from none
-        </Files>
-        <Files ~ '.php4$'>
-            Order allow,deny
-            Deny from all
-            Allow from none
-        </Files>
-        <Files ~ '.php5$'>
-            Order allow,deny
-            Deny from all
-            Allow from none
-        </Files>
-        <Files ~ '.phps'>
-            Order deny,allow
-            Allow from all
-        </Files>
 </tmpl_if>
     </Directory>