diff --git a/server/conf/vhost.conf.master b/server/conf/vhost.conf.master
index f687bee839ba003cdbcaa195bd1cadbb0590a356..ea1c847344a0e730f1bb1283ddc488d8b14daa8e 100644
--- a/server/conf/vhost.conf.master
+++ b/server/conf/vhost.conf.master
@@ -13,7 +13,7 @@
 <tmpl_loop name='vhosts'>
 <VirtualHost {tmpl_var name='ip_address'}:{tmpl_var name='port'}>
 <tmpl_if name='use_proxy_protocol' op='==' value='y'>
-<tmpl_if name='apache_version' op='>=' value='2.4.30' format='version'>
+<tmpl_if name='apache_full_version' op='>=' value='2.4.30' format='version'>
 	<IfModule mod_remoteip.c>
 		RemoteIPProxyProtocol On
 	</IfModule>
diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
index d411cc74dc3f60c8fad66006c4609fe1d3a92778..d829b5979eaff1045556f51f1156e9add078e32f 100644
--- a/server/plugins-available/apache2_plugin.inc.php
+++ b/server/plugins-available/apache2_plugin.inc.php
@@ -1342,6 +1342,7 @@ class apache2_plugin {
 
 		$tpl->setVar($vhost_data);
 		$tpl->setVar('apache_version', $app->system->getapacheversion());
+		$tpl->setVar('apache_full_version', $app->system->getapacheversion(true));
 
 		// Rewrite rules
 		$rewrite_rules = array();