diff --git a/install/tpl/apache_ispconfig.vhost.master b/install/tpl/apache_ispconfig.vhost.master
index ffbb7c03deaf616f99a769e04b635b459ac954be..bcdc8b76f9db187d47866f9d4a2e87e6a9ee0dc9 100644
--- a/install/tpl/apache_ispconfig.vhost.master
+++ b/install/tpl/apache_ispconfig.vhost.master
@@ -8,6 +8,9 @@
 
 <VirtualHost _default_:<tmpl_var name="vhost_port">>
   ServerAdmin webmaster@localhost
+  <tmpl_if name='apache_version' op='>=' value='2.4' format='version'>
+		Protocols h2 h2c http/1.1
+  </tmpl_if>
 
   <Directory /var/www/ispconfig/>
     <FilesMatch "\.ph(p3?|tml)$">
diff --git a/install/tpl/named.conf.options.master b/install/tpl/named.conf.options.master
index 37182dfba98e2a137508c174eeff1aa47270d62b..7f89fa4ee5b902574edeaa0d3a8cb7acdddccdbe 100644
--- a/install/tpl/named.conf.options.master
+++ b/install/tpl/named.conf.options.master
@@ -22,8 +22,7 @@ options {
 	dnssec-validation yes;
 	dnssec-lookaside auto;
 
-	version "DNS managed by ISPConfig";
-	
+	version "DNS-Server";
 	auth-nxdomain no;    # conform to RFC1035
 	listen-on-v6 { any; };
 };
diff --git a/server/conf/vhost.conf.master b/server/conf/vhost.conf.master
index 55fe40f9874d7485bf258736d19bbe3f4a50400c..812e8e0fcc9aec596e90c73a52903c442ad8591c 100644
--- a/server/conf/vhost.conf.master
+++ b/server/conf/vhost.conf.master
@@ -13,6 +13,12 @@
 <tmpl_loop name='vhosts'>
 <VirtualHost {tmpl_var name='ip_address'}:{tmpl_var name='port'}>
 <tmpl_hook name='apache2_vhost:vhost_header'>
+<tmpl_if name='enable_spdy' op='==' value='y'>
+<tmpl_if name='apache_version' op='>=' value='2.4' format='version'>
+		Protocols h2 h2c http/1.1
+</tmpl_if>
+</tmpl_if>
+
 <tmpl_if name='php' op='==' value='suphp'>
 		DocumentRoot <tmpl_var name='web_document_root'>
 </tmpl_else>