diff --git a/data/templates/apache_default.stpl b/data/templates/apache_default.stpl
index 39b8e59af..f4903b7c1 100644
--- a/data/templates/apache_default.stpl
+++ b/data/templates/apache_default.stpl
@@ -34,7 +34,7 @@
     SSLCertificateFile %ssl_cert%
     SSLCertificateKeyFile %ssl_key%
 
-    Include %home%/%user%/conf/%domain%.shttpd.*
+    Include %home%/%user%/conf/shttpd.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/data/templates/apache_default.tpl b/data/templates/apache_default.tpl
index 6274f8853..919b53370 100644
--- a/data/templates/apache_default.tpl
+++ b/data/templates/apache_default.tpl
@@ -28,7 +28,7 @@
         AllowOverride All
     </Directory>
     php_admin_value open_basedir %home%/%user%/web:%home%/%user%/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp
-    Include %home%/%user%/conf/%domain%.httpd.*
+    Include %home%/%user%/conf/httpd.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/data/templates/apache_phpcgi.stpl b/data/templates/apache_phpcgi.stpl
index 39b8e59af..f4903b7c1 100644
--- a/data/templates/apache_phpcgi.stpl
+++ b/data/templates/apache_phpcgi.stpl
@@ -34,7 +34,7 @@
     SSLCertificateFile %ssl_cert%
     SSLCertificateKeyFile %ssl_key%
 
-    Include %home%/%user%/conf/%domain%.shttpd.*
+    Include %home%/%user%/conf/shttpd.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/data/templates/apache_phpcgi.tpl b/data/templates/apache_phpcgi.tpl
index 93f62c04b..912152204 100644
--- a/data/templates/apache_phpcgi.tpl
+++ b/data/templates/apache_phpcgi.tpl
@@ -24,7 +24,7 @@
     <Directory %home%/%user%/web/%domain%/stats>
         AllowOverride All
     </Directory>
-    Include %home%/%user%/conf/%domain%.httpd.*
+    Include %home%/%user%/conf/httpd.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/data/templates/apache_unlim.stpl b/data/templates/apache_unlim.stpl
index f1266447a..3515e21aa 100644
--- a/data/templates/apache_unlim.stpl
+++ b/data/templates/apache_unlim.stpl
@@ -34,7 +34,7 @@
     SSLCertificateFile %ssl_cert%
     SSLCertificateKeyFile %ssl_key%
 
-    Include %home%/%user%/conf/%domain%.shttpd.*
+    Include %home%/%user%/conf/shttpd.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/data/templates/apache_unlim.tpl b/data/templates/apache_unlim.tpl
index 8609f776a..a9d67ada9 100644
--- a/data/templates/apache_unlim.tpl
+++ b/data/templates/apache_unlim.tpl
@@ -28,7 +28,7 @@
         AllowOverride All
     </Directory>
     php_admin_value open_basedir none
-    Include %home%/%user%/conf/%domain%.httpd.*
+    Include %home%/%user%/conf/httpd.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/data/templates/ngingx_vhost_default.stpl b/data/templates/ngingx_vhost_default.stpl
index cbf2959f8..addc6dbd9 100644
--- a/data/templates/ngingx_vhost_default.stpl
+++ b/data/templates/ngingx_vhost_default.stpl
@@ -30,6 +30,6 @@ server {
     location ~ /\.ht   {deny all;}
     location ~ /.svn/  {deny all;}
 
-    include %home%/%user%/conf/%domain%.nginx.*;
+    include %home%/%user%/conf/snginx.%domain%.conf*;
 }
 
diff --git a/data/templates/ngingx_vhost_default.tpl b/data/templates/ngingx_vhost_default.tpl
index cda9f9f25..0d02d6389 100644
--- a/data/templates/ngingx_vhost_default.tpl
+++ b/data/templates/ngingx_vhost_default.tpl
@@ -27,6 +27,6 @@ server {
     location ~ /\.ht   {deny all;}
     location ~ /.svn/  {deny all;}
 
-    include %home%/%user%/conf/%domain%.nginx.*;
+    include %home%/%user%/conf/nginx.%domain%.conf*;
 }