diff --git a/main/mail/ChangeLog b/main/mail/ChangeLog
index 3470a8cc0cd..ea9532b4895 100644
--- a/main/mail/ChangeLog
+++ b/main/mail/ChangeLog
@@ -1,3 +1,5 @@
+HEAD
+	+ Removed no longer existent smtp_generic_maps
 4.0
 	+ Load openchange plugin if openchange enabled
 	+ Added Zentyal.MailUserAddon.editFormWillRemoveAccount JS method
diff --git a/main/mail/stubs/main.cf.mas b/main/mail/stubs/main.cf.mas
index d9bea9f0be1..db849cc310b 100644
--- a/main/mail/stubs/main.cf.mas
+++ b/main/mail/stubs/main.cf.mas
@@ -162,6 +162,3 @@ sender_bcc_maps = <% $bccMaps %>
 recipient_bcc_maps = <% $bccMaps %>
 % }
 
-% if ($openchangeProvisioned) {
-smtp_generic_maps = hash:/etc/postfix/generic
-% }