diff --git a/.gitattributes b/.gitattributes
index 23509dac..2f940010 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -359,9 +359,9 @@ etc/alternc/phpmyadmin.inc.php -text
 etc/alternc/postfix-slave.cf -text
 etc/alternc/postfix.cf -text
 etc/alternc/templates/alternc/bureau.conf -text
-etc/alternc/templates/apache2/local.conf -text
 etc/alternc/templates/apache2/panel.conf -text
 etc/alternc/templates/apache2/redirect.conf -text
+etc/alternc/templates/apache2/vhost.conf -text
 etc/alternc/templates/apache2/webmail.conf -text
 etc/alternc/templates/bind/automatic.conf -text
 etc/alternc/templates/bind/named.conf.options -text
diff --git a/etc/alternc/apache2.conf b/etc/alternc/apache2.conf
index 71c7603b..2aa45170 100644
--- a/etc/alternc/apache2.conf
+++ b/etc/alternc/apache2.conf
@@ -12,31 +12,9 @@ ScriptAlias /cgi-bin/ /var/alternc/cgi-bin/
 </Directory>
 
 
-<VirtualHost *:80>
-# ***ALTERNC_ALIASES***
-  Alias /icons/ /usr/share/apache/icons/
-
-  UseCanonicalName    Off
-  VirtualDocumentRoot /var/alternc/dns/%-2.1/%0
-
-	LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %T %{Host}i" alternc
-  CustomLog /var/log/apache2/access.log alternc
-</VirtualHost>
-
 <Directory /var/alternc>
-	AllowOverride AuthConfig FileInfo Limit Options Indexes
-	Options Indexes Includes FollowSymLinks MultiViews
 	Order allow,deny
-	Allow from all
-	php_admin_flag safe_mode_gid on
-	php_admin_flag safe_mode on
-	php_admin_value disable_functions chmod,chown,chgrp,link,symlink
-  php_admin_value safe_mode_exec_dir /var/alternc/exec.usr
-  php_admin_value disable_functions chgrp,link,symlink
-
-  php_admin_flag enable_dl off
-  php_admin_value upload_tmp_dir /var/alternc/tmp
-  php_admin_value sendmail_path /usr/lib/alternc/sendmail
+	Allow from none
 </Directory>
 
 <Directory /usr/share/phpmyadmin>
@@ -46,5 +24,5 @@ ScriptAlias /cgi-bin/ /var/alternc/cgi-bin/
 	Allow from all
 </Directory>
 
-Include /var/alternc/apache-vhost/vhosts_all.conf
 Include /etc/alternc/bureau.conf
+Include /var/alternc/apache-vhost/vhosts_all.conf
diff --git a/etc/alternc/templates/alternc/bureau.conf b/etc/alternc/templates/alternc/bureau.conf
index f30bbc42..c8171cd3 100644
--- a/etc/alternc/templates/alternc/bureau.conf
+++ b/etc/alternc/templates/alternc/bureau.conf
@@ -1,24 +1,19 @@
+<VirtualHost *:80>
+	DocumentRoot /var/alternc/bureau
+	ServerName %%fqdn%%
+	
 	alias /admin/sql        /usr/share/phpmyadmin
 	alias /webmail          /usr/share/squirrelmail
-#	***ALTERNC_ALIASES***
-
-<Directory /var/alternc/bureau>
-	php_admin_flag safe_mode_gid off
-	php_admin_flag safe_mode off
-        php_admin_flag register_globals on
-	AddDefaultCharset ISO-8859-1
-</Directory>
-
-<Directory /var/alternc/dns/%%fqdn_lettre%%/%%fqdn%%>
-        php_admin_flag safe_mode_gid off
-        php_admin_flag safe_mode off
-	php_admin_flag register_globals on
-	AddDefaultCharset ISO-8859-1
-</Directory>
-
-<Directory /var/alternc/dns/%%public_ip_begin%%/%%public_ip%%>
-        php_admin_flag safe_mode_gid off
-        php_admin_flag safe_mode off
-	php_admin_flag register_globals on
-	AddDefaultCharset ISO-8859-1
-</Directory>
+	
+	<Directory />
+		Options FollowSymLinks
+		AllowOverride None
+	</Directory>
+	<Directory /var/alternc/bureau>
+		php_admin_flag safe_mode_gid off
+		php_admin_flag safe_mode off
+		    php_admin_flag register_globals on
+		AddDefaultCharset ISO-8859-1
+		php_admin_value open_basedir /etc/alternc/:/var/run/alternc/:/var/alternc/bureau/:/var/alternc/html/:/var/alternc/tmp:/tmp:/usr/share/php/:/var/cache/alternc-webalizer/
+	</Directory>
+</VirtualHost>
diff --git a/etc/alternc/templates/apache2/local.conf b/etc/alternc/templates/apache2/local.conf
deleted file mode 100644
index bf5445e8..00000000
--- a/etc/alternc/templates/apache2/local.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-<VirtualHost *:80>
-    ServerName %%fqdn%%
-    DocumentRoot "%%document_root%%"
-    <Directory "%%document_root%%">
-        php_admin_value open_basedir "%%document_root%%:/var/alternc/dns/redir:/usr/share/php/:/var/alternc/tmp:/tmp"
-    </Directory>
-</VirtualHost>
diff --git a/etc/alternc/templates/apache2/vhost.conf b/etc/alternc/templates/apache2/vhost.conf
new file mode 100644
index 00000000..8b495119
--- /dev/null
+++ b/etc/alternc/templates/apache2/vhost.conf
@@ -0,0 +1,25 @@
+<VirtualHost *:80>
+  ServerName %%fqdn%%
+  DocumentRoot "%%document_root%%"
+
+  <Directory "%%document_root%%">
+    php_admin_value open_basedir "%%document_root%%:/usr/share/php/:/var/alternc/tmp:/tmp"
+  </Directory>
+
+	AllowOverride AuthConfig FileInfo Limit Options Indexes
+	Options Indexes Includes FollowSymLinks MultiViews
+	Order allow,deny
+	Allow from all
+	php_admin_flag safe_mode_gid on
+	php_admin_flag safe_mode on
+	php_admin_value disable_functions chmod,chown,chgrp,link,symlink
+  php_admin_value safe_mode_exec_dir /var/alternc/exec.usr
+  php_admin_value disable_functions chgrp,link,symlink
+
+  php_admin_flag enable_dl off
+  php_admin_value upload_tmp_dir /var/alternc/tmp
+  php_admin_value sendmail_path /usr/lib/alternc/sendmail
+
+	LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %T %{Host}i" alternc
+  CustomLog /var/log/apache2/access.log alternc
+</VirtualHost>