diff --git a/server/conf/vhost.conf.master b/server/conf/vhost.conf.master
index 220570ed239d19e83a78f012b564c0007df57396..a681b1d287a529a05823e2438c319bc4a1d543f7 100644
--- a/server/conf/vhost.conf.master
+++ b/server/conf/vhost.conf.master
@@ -47,12 +47,16 @@
     AddType application/x-httpd-php .php .php3 .php4 .php5
 </tmpl_if>
 <tmpl_if name='php' op='==' value='fast-cgi'>
-    # php as fast-cgi enabled
-    AddType application/x-httpd-php .php .php3 .php4 .php5
-
-    ScriptAlias <tmpl_var name='fastcgi_alias'> <tmpl_var name='fastcgi_starter_path'>
+     # php as fast-cgi enabled
+    <Directory /var/www/<tmpl_var name='domain'>/web>
+        AddHandler fcgid-script .php .php3 .php4 .php5
+        FCGIWrapper <tmpl_var name='fastcgi_starter_path'>/<tmpl_var name='fastcgi_starter_script'> .php
+        Options FollowSymLinks +ExecCGI Indexes
+        AllowOverride None
+        Order allow,deny
+        Allow from all
+    </Directory>
 </tmpl_if>
-
 <tmpl_if name="rewrite_enabled">
     RewriteEngine on
 <tmpl_loop name="redirects">
diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
index 7b46615c272586173c9dc0229f65050415c65a8e..4160b1e24cf6ced79ec41cc56f41517145cb63cc 100644
--- a/server/plugins-available/apache2_plugin.inc.php
+++ b/server/plugins-available/apache2_plugin.inc.php
@@ -432,6 +432,7 @@ class apache2_plugin {
 
 			$tpl->setVar('fastcgi_alias',$fastcgi_config["fastcgi_alias"]);
 			$tpl->setVar('fastcgi_starter_path',$fastcgi_starter_path);
+			$tpl->setVar('fastcgi_starter_script',$fastcgi_config["fastcgi_starter_script"]);
 			
 		}