diff --git a/.gitattributes b/.gitattributes
index f0591e74..8d34d6aa 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -453,7 +453,6 @@ debian/rules -text
 etc/alternc/alternc-sudoers -text
 etc/alternc/alternc.ini -text
 etc/alternc/apache2-ssl.conf -text
-etc/alternc/apache2.conf -text
 etc/alternc/apache_logformat.conf -text
 etc/alternc/dbusers.cnf.sample -text
 etc/alternc/functions_hosting/hosting_massvhost.sh -text
@@ -461,6 +460,7 @@ 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/apache2.conf -text
 etc/alternc/templates/apache2/panel.conf -text
 etc/alternc/templates/apache2/url.conf -text
 etc/alternc/templates/apache2/vhost.conf -text
diff --git a/etc/alternc/apache2.conf b/etc/alternc/templates/apache2/apache2.conf
similarity index 87%
rename from etc/alternc/apache2.conf
rename to etc/alternc/templates/apache2/apache2.conf
index a9e56e1d..66240a61 100644
--- a/etc/alternc/apache2.conf
+++ b/etc/alternc/templates/apache2/apache2.conf
@@ -31,12 +31,12 @@ ScriptAlias /cgi-bin/ /var/alternc/cgi-bin/
   php_admin_flag safe_mode off
   AddDefaultCharset UTF-8
 # open_basedir allows access to specifics directories. We need to grant access to these directories for alternc, awstats, mailman...
-  php_admin_value open_basedir /usr/share/alternc-mailman/patches/:/etc/alternc/:/var/run/alternc/:/usr/share/alternc/panel/:/var/alternc/html/:/var/alternc/tmp:/tmp:/usr/share/php/:/var/cache/alternc-webalizer/:/etc/locale.gen:/var/log/alternc/bureau.log:/var/log/alternc/update_domains.log:/var/alternc/logs/:/etc/awstats/
+  php_admin_value open_basedir /usr/share/alternc-mailman/patches/:/etc/alternc/:/var/run/alternc/:/usr/share/alternc/panel/:%%ALTERNC_HTML%%/:/var/alternc/tmp:/tmp:/usr/share/php/:/var/cache/alternc-webalizer/:/etc/locale.gen:%%ALTERNC_LOGS%%/:/etc/awstats/
 
 </Directory>
 
 
-<Directory /var/alternc/html>
+<Directory %%ALTERNC_HTML%% >
   AllowOverride AuthConfig FileInfo Limit Options Indexes
   Options Indexes Includes -FollowSymLinks MultiViews SymLinksIfOwnerMatch
   Order allow,deny