diff --git a/install/dist/tpl/gentoo/apache_ispconfig.vhost.master b/install/dist/tpl/gentoo/apache_ispconfig.vhost.master
index f4f08d2bb6e878d742ae023de172f9d664b189b1..20e7b3b684f68f3c19388f8d25b39e138e62295f 100644
--- a/install/dist/tpl/gentoo/apache_ispconfig.vhost.master
+++ b/install/dist/tpl/gentoo/apache_ispconfig.vhost.master
@@ -5,11 +5,13 @@
######################################################
{vhost_port_listen} Listen {vhost_port}
-NameVirtualHost *:{vhost_port}
+
+ NameVirtualHost *:{vhost_port}
+
ServerAdmin webmaster@localhost
-
+
DocumentRoot /var/www/ispconfig/
SuexecUserGroup ispconfig ispconfig
@@ -25,7 +27,7 @@ NameVirtualHost *:{vhost_port}
DirectoryIndex index.php
-
+
DocumentRoot /usr/local/ispconfig/interface/web/
AddType application/x-httpd-php .php
@@ -37,11 +39,11 @@ NameVirtualHost *:{vhost_port}
php_value magic_quotes_gpc 0
-
+
# ErrorLog /var/log/apache2/error.log
# CustomLog /var/log/apache2/access.log combined
ServerSignature Off
-
+
SecRuleEngine Off
@@ -64,4 +66,3 @@ NameVirtualHost *:{vhost_port}
Order Deny,Allow
Deny from all
-
diff --git a/install/tpl/apache_ispconfig.conf.master b/install/tpl/apache_ispconfig.conf.master
index 7d57e00517066e7935895c7cdb127df5b78ec77e..b1de2a167621b5ff3fa242e33f64be14ef3065a3 100644
--- a/install/tpl/apache_ispconfig.conf.master
+++ b/install/tpl/apache_ispconfig.conf.master
@@ -132,11 +132,13 @@ CustomLog "| /usr/local/ispconfig/server/scripts/vlogger -s access.log -t \"%Y%m
Alias /awstats-icon "/usr/share/awstats/icon"
-NameVirtualHost *:80
-NameVirtualHost *:443
-
-NameVirtualHost {tmpl_var name="ip_address"}:{tmpl_var name="port"}
-
+
+ NameVirtualHost *:80
+ NameVirtualHost *:443
+
+ NameVirtualHost {tmpl_var name="ip_address"}:{tmpl_var name="port"}
+
+
diff --git a/server/conf/apache_ispconfig.conf.master b/server/conf/apache_ispconfig.conf.master
index 831a18a0e1f4ed61ff316ceb7f0fcab89de8bcbc..b1de2a167621b5ff3fa242e33f64be14ef3065a3 100644
--- a/server/conf/apache_ispconfig.conf.master
+++ b/server/conf/apache_ispconfig.conf.master
@@ -1,3 +1,8 @@
+################################################
+# ISPConfig General Apache Options
+################################################
+ServerTokens ProductOnly
+ServerSignature Off
################################################
# ISPConfig Logfile configuration for vlogger
@@ -127,11 +132,13 @@ CustomLog "| /usr/local/ispconfig/server/scripts/vlogger -s access.log -t \"%Y%m
Alias /awstats-icon "/usr/share/awstats/icon"
-NameVirtualHost *:80
-NameVirtualHost *:443
-
-NameVirtualHost {tmpl_var name="ip_address"}:{tmpl_var name="port"}
-
+
+ NameVirtualHost *:80
+ NameVirtualHost *:443
+
+ NameVirtualHost {tmpl_var name="ip_address"}:{tmpl_var name="port"}
+
+