diff --git a/.gitattributes b/.gitattributes
index 3773e552..f2d99422 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -535,9 +535,6 @@ lang/nl_NL.po -text
 mailautoconfig/apache_mail-autoconfig.conf -text
 mailautoconfig/cron_bash -text
 mailautoconfig/var/www/mail_autoconfig/.htaccess -text
-mailautoconfig/var/www/mail_autoconfig/index.html -text
-mailautoconfig/var/www/mail_autoconfig/outlook.php__DYN -text
-mailautoconfig/var/www/mail_autoconfig/thunderbird.php__DYN -text
 man/alternc-admintools.8 -text
 man/alternc-admintools.fr.8 -text
 man/alternc.install.pod -text
diff --git a/etc/alternc/templates/alternc/bureau.conf b/etc/alternc/templates/alternc/bureau.conf
index fb00b8cd..9cec4c18 100644
--- a/etc/alternc/templates/alternc/bureau.conf
+++ b/etc/alternc/templates/alternc/bureau.conf
@@ -4,6 +4,11 @@
 
   DocumentRoot /usr/share/alternc/panel/admin
   ServerName %%fqdn%%
+
+  # Mail autoconfig
+  ServerAlias autoconfig.*
+  ServerAlias autodiscover.*
+
   RewriteEngine on
   RewriteRule   ^/admin/(.*)  /$1 [R=301,L]
   
@@ -12,6 +17,15 @@
   RewriteEngine On
   RewriteRule ^webmail /webmail-redirect.php [L]
 
+  # Mail autoconfig
+  RewriteRule ^mail/mailautoconfig.xml$ /mailautoconfig_thunderbird.php [L]
+  RewriteRule ^mail/config-v1.1.xml$ /mailautoconfig_thunderbird.php [L]
+  RewriteRule ^autodiscover/autodiscover.xml$ /mailautoconfig_outlook.php [L]
+  RewriteRule ^Autodiscover/Autodiscover.xml$ /mailautoconfig_outlook.php [L]
+  RewriteRule ^Autodiscover.xml$ mailautoconfig_outlook.php [L]
+  RewriteRule ^autodiscover.xml$ mailautoconfig_outlook.php [L]
+
+
   # will be used to define aliases such as /javascript /webmail /squirrelmail ...
   Include /etc/alternc/apache-panel.d/*.conf
 
diff --git a/etc/alternc/templates/apache2/panel.conf b/etc/alternc/templates/apache2/panel.conf
index d3540537..f3eda7d7 100644
--- a/etc/alternc/templates/apache2/panel.conf
+++ b/etc/alternc/templates/apache2/panel.conf
@@ -11,6 +11,14 @@
   RewriteEngine On
   RewriteRule ^webmail /webmail-redirect.php [L]
 
+  # Mail autoconfig
+  RewriteRule ^mail/mailautoconfig.xml$ /mailautoconfig_thunderbird.php [L]
+  RewriteRule ^mail/config-v1.1.xml$ /mailautoconfig_thunderbird.php [L]
+  RewriteRule ^autodiscover/autodiscover.xml$ /mailautoconfig_outlook.php [L]
+  RewriteRule ^Autodiscover/Autodiscover.xml$ /mailautoconfig_outlook.php [L]
+  RewriteRule ^Autodiscover.xml$ mailautoconfig_outlook.php [L]
+  RewriteRule ^autodiscover.xml$ mailautoconfig_outlook.php [L]
+
   # will be used to define aliases such as /javascript /squirrelmail ...
   Include /etc/alternc/apache-panel.d/*.conf
 
diff --git a/mailautoconfig/var/www/mail_autoconfig/index.html b/mailautoconfig/var/www/mail_autoconfig/index.html
deleted file mode 100644
index e69de29b..00000000
diff --git a/mailautoconfig/var/www/mail_autoconfig/outlook.php__DYN b/mailautoconfig/var/www/mail_autoconfig/outlook.php__DYN
deleted file mode 100644
index 11a74347..00000000
--- a/mailautoconfig/var/www/mail_autoconfig/outlook.php__DYN
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-// Created by Alesandro Slepcevic - alesandro@plus.hr
-header(':', true, 405);
-if ( $_SERVER['REQUEST_METHOD'] === 'POST' ){ 
-    $postText = file_get_contents('php://input'); 
-$string = $postText;
-$matches = array();
-$pattern = '/[A-Za-z0-9_-]+@[A-Za-z0-9_-]+.([A-Za-z0-9_-][A-Za-z0-9_]+)/'; 
-preg_match($pattern, $string, $matches); 
-$emailDomain = explode('@', $matches[0]);
-header("Content-type: text/xml");
-echo "<?xml version='1.0' encoding='UTF-8'?> \n";
-
-}
-?>
-<Autodiscover xmlns="http://schemas.microsoft.com/exchange/autodiscover/responseschema/2006">
-<Response xmlns="http://schemas.microsoft.com/exchange/autodiscover/outlook/responseschema/2006a">
-	<Account>
-	<AccountType>email</AccountType>
-	<Action>settings</Action>
-	<Protocol>
-		<Type>IMAP</Type>
-		<Server>mail.<?php echo $emailDomain[1];?></Server>
-		<Port>993</Port>
-		<LoginName><?php echo $matches[0];?></LoginName>
-		<DomainName><?php echo $emailDomain[1];?></DomainName>
-		<SPA>off</SPA>
-		<SSL>on</SSL>
-		<AuthRequired>on</AuthRequired>
-	</Protocol>
-	<Protocol>
-		<Type>SMTP</Type>
-		<Server>mail.<?php echo $emailDomain[1];?></Server>
-		<Port>465</Port>
-		<SPA>off</SPA>
-		<SSL>on</SSL>
-		<AuthRequired>on</AuthRequired>
-		<UsePOPAuth>on</UsePOPAuth>
-		<SMTPLast>off</SMTPLast>
-	</Protocol>
-	</Account>
-</Response>
-</Autodiscover>
diff --git a/mailautoconfig/var/www/mail_autoconfig/thunderbird.php__DYN b/mailautoconfig/var/www/mail_autoconfig/thunderbird.php__DYN
deleted file mode 100644
index e4f13973..00000000
--- a/mailautoconfig/var/www/mail_autoconfig/thunderbird.php__DYN
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-header ("Content-Type:text/xml");
-$emailDomain = explode('@', rawurldecode($_GET['emailaddress']));
-?>
-<clientConfig version="1.1">
-<emailProvider id="octopuce.fr">
-<domain>octopuce.fr</domain>
-<domain>octopuce.biz</domain>
-<displayName>Octopuce Mail</displayName>
-<displayShortName>Octopuce</displayShortName>
-	<incomingServer type="imap">
-		<hostname>mail.%EMAILDOMAIN%</hostname>
-		<port>993</port>
-		<socketType>SSL</socketType>
-		<authentication>password-cleartext</authentication>
-		<username>%EMAILADDRESS%</username>
-	</incomingServer>
-	<incomingServer type="pop3">
-		<hostname>mail.%EMAILDOMAIN%</hostname>
-		<port>995</port>
-		<socketType>SSL</socketType>
-		<authentication>password-cleartext</authentication>
-		<username>%EMAILADDRESS%</username>
-	</incomingServer>
-	<outgoingServer type="smtp">
-		<hostname>mail.%EMAILDOMAIN%</hostname>
-		<port>587</port>
-		<socketType>STARTTLS</socketType>
-		<username>%EMAILADDRESS%</username>
-		<authentication>password-cleartext</authentication>
-	</outgoingServer>
-	<outgoingServer type="smtp">
-		<hostname>mail.%EMAILDOMAIN%</hostname>
-		<port>465</port>
-		<socketType>SSL</socketType>
-		<authentication>password-cleartext</authentication>
-		<username>%EMAILADDRESS%</username>
-	</outgoingServer>
-</emailProvider>
-</clientConfig>