diff --git a/install/install.php b/install/install.php
index 8c5ebf96431194cabd7ed929615ba2eafa800b2c..c64b25d13a76736788b25ad1d661472fa852cd20 100644
--- a/install/install.php
+++ b/install/install.php
@@ -175,19 +175,6 @@ if($install_mode == 'Standard') {
 	//* Configure ISPConfig
 	swriteln('Installing ISPConfig');
 	
-	//** We want to check if the server is a module or cgi based php enabled server
-	//** TODO: Don't always ask for this somehow ? 
-	$fast_cgi = $inst->simple_query('CGI PHP Enabled Server?', array('yes','no'),'no');
-
-	if($fast_cgi == 'yes') {
-	 	$alias = $inst->free_query('Script Alias', '/php/');
-	 	$path = $inst->free_query('Script Alias Path', '/path/to/cgi/bin');
-	 	$inst->conf['apache']['vhost_cgi_alias'] = sprintf('ScriptAlias %s %s', $alias, $path);
-	} else {
-	 	$inst->conf['apache']['vhost_cgi_alias'] = "";
-	}
-
-
 	//** Customise the port ISPConfig runs on
 	$inst->conf['apache']['vhost_port'] = $inst->free_query('ISPConfig Port', '8080');
 
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index 764c8ef8dc35f94adbb4447ed44b0c58b785b8d9..42325db5eec6c30c7ac53313ac835894918ee33b 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -697,8 +697,6 @@ class installer_base {
          
         $content = rf("tpl/apache_ispconfig.vhost.master");
 		$content = str_replace('{vhost_port}', $this->conf['apache']['vhost_port'], $content);
-		$content = str_replace('{vhost_cgi_alias}', $this->conf['apache']['vhost_cgi_alias'], $content);
-		
 		wf("$vhost_conf_dir/ispconfig.vhost", $content);
 		
 		//copy('tpl/apache_ispconfig.vhost.master', "$vhost_conf_dir/ispconfig.vhost");
@@ -716,6 +714,8 @@ class installer_base {
 		exec('chown root /usr/local/bin/ispconfig_update_from_svn.sh');
 		exec('chmod 700 /usr/local/bin/ispconfig_update_from_svn.sh');
 		
+		//set the fast cgi starter script to executable
+		exec('chmod 755 '.$install_dir.'/interface/bin/php-fcgi');
 	}
 	
 	public function install_crontab()
diff --git a/install/tpl/apache_ispconfig.vhost.master b/install/tpl/apache_ispconfig.vhost.master
index f72676a36fca4b54dea752c008f92b749fe11151..a6d2f4572844d1b2cf28e3085c7105fdab6e7b44 100644
--- a/install/tpl/apache_ispconfig.vhost.master
+++ b/install/tpl/apache_ispconfig.vhost.master
@@ -11,7 +11,24 @@ NameVirtualHost *:{vhost_port}
 	ServerAdmin webmaster@localhost
     DocumentRoot /usr/local/ispconfig/interface/web/
 	
-	{vhost_cgi_alias}
+	<IfModule mod_fastcgi.c>
+		<Location /php/php-fcgi>
+                	Options ExecCGI        
+                	SetHandler fastcgi-script
+       		</Location>
+
+        	Action php-fastcgi /php/php-fcgi
+
+		ScriptAlias /php/ /usr/local/ispconfig/interface/bin/
+
+		<Directory "/usr/local/ispconfig/interface/bin/">
+                        AllowOverride None
+                        Options +ExecCGI -MultiViews -Indexes
+                        Order allow,deny
+                        Allow from all                              
+        	</Directory>
+	</IfModule>
+
 	<IfModule mod_php5.c>
   		AddType application/x-httpd-php .php
 	</IfModule>
diff --git a/install/update.php b/install/update.php
index ebc7e9b79ec0240da09649f060bc47215c4aa6ac..06961a07a59f076d930f9157ee7e774739841ea9 100644
--- a/install/update.php
+++ b/install/update.php
@@ -176,22 +176,6 @@ if($reconfigure_services_answer == 'yes') {
 swriteln('Updating ISPConfig');
 
 
-//** We want to check if the server is a module or cgi based php enabled server
-//** TODO: Don't always ask for this somehow ? 
-$fast_cgi = $inst->simple_query('CGI PHP Enabled Server?', array('yes','no'),'no');
-
-
-if($fast_cgi == 'yes') {
-	 $alias = $inst->free_query('Script Alias', '/php/');
-	 $path = $inst->free_query('Script Alias Path', '/path/to/cgi/bin');
-	 $inst->conf['apache']['vhost_cgi_alias'] = sprintf('ScriptAlias %s %s', $alias, $path);
-	 $inst->conf['apache']['vhost_cgi_alias_path'] = $path;
-} else {
-	 $inst->conf['apache']['vhost_cgi_alias'] = "";
-	 $inst->conf['apache']['vhost_cgi_alias_path'] = "";
-}
-
-
 //** Customise the port ISPConfig runs on
 $inst->conf['apache']['vhost_port'] = $inst->free_query('ISPConfig Port', '8080');