diff --git a/lib/Froxlor/Install/Install/Core.php b/lib/Froxlor/Install/Install/Core.php
index e9ed07b3..bbc9b5dc 100644
--- a/lib/Froxlor/Install/Install/Core.php
+++ b/lib/Froxlor/Install/Install/Core.php
@@ -672,7 +672,7 @@ class Core
 			'dns' => 'x',
 			'http' => $this->validatedData['webserver'],
 			'smtp' => 'postfix_dovecot',
-			'mail' => 'dovecot_postfix',
+			'mail' => 'dovecot_postfix2',
 			'ftp' => 'proftpd',
 			'system' => $system_params
 		];
diff --git a/lib/configfiles/gentoo.xml b/lib/configfiles/gentoo.xml
index 9f25e4ab..af005ad6 100644
--- a/lib/configfiles/gentoo.xml
+++ b/lib/configfiles/gentoo.xml
@@ -1551,7 +1551,7 @@ root:               root@<SERVERNAME>
 					</commands>
 				</general>
 				<!-- postfix with dovecot -->
-				<daemon name="postfix_dovecot" version="2.x"
+				<daemon name="postfix_dovecot" version="2"
 					title="Postfix 2 with dovecot">
 					<include>//service[@type='smtp']/general/commands[@index=1]
 					</include>
@@ -1699,7 +1699,7 @@ dovecot	  unix	-	n	n	-	-	pipe
 					</include>
 				</daemon>
 				<!-- postfix with dovecot -->
-				<daemon name="postfix_dovecot" version="3.x"
+				<daemon name="postfix_dovecot"
 					title="Postfix 3 with dovecot" default="true">
 					<include>//service[@type='smtp']/general/commands[@index=1]
 					</include>
@@ -1852,7 +1852,7 @@ dovecot	  unix	-	n	n	-	-	pipe
 					</include>
 				</daemon>
 				<!-- postfix with courier -->
-				<daemon name="postfix_courier" version="2.x"
+				<daemon name="postfix_courier" version="2"
 					title="Postfix 2 with courier">
 					<include>//service[@type='smtp']/general/commands[@index=1]
 					</include>