diff --git a/Python/etc/postfix/aliases b/Python/etc/postfix/aliases
index e1b889a..4891393 100644
--- a/Python/etc/postfix/aliases
+++ b/Python/etc/postfix/aliases
@@ -20,11 +20,11 @@ info["perms"] = 0644
 for dest in ["abuse", "amavis", "backup", "bind", "bin", "clamav", "daemon",
             "ftpadm", "ftpmaster", "ftp-mirror", "ftp", "games", "gnats",
             "irc", "list", "logcheck", "lp", "mail", "majordom", "man", "msql",
-            "munin", "news", "operator", "postgres", "proxy", "sync","sys",
-            "usenet", "uucp", "webmaster", "www-clubs", "www-data", "www-perso"]:
+            "munin", "nagios", "news", "operator", "postgres", "proxy", "sync",
+            "sys", "usenet", "uucp", "webmaster", "www-clubs", "www-data", "www-perso"]:
     print "%s: root" % dest
 
-if not has("users"):
+if not has("users") and not has('mail-mx'):
     @root: root@crans.org
 @
 @# Following alias is required by the new mail protocol, RFC 822
diff --git a/Python/etc/postfix/transport b/Python/etc/postfix/transport
index 1392044..71b06f8 100644
--- a/Python/etc/postfix/transport
+++ b/Python/etc/postfix/transport
@@ -28,9 +28,10 @@ if not has("users"):
     @install-party.ens-cachan.fr  smtp:[users.adm.crans.org]
     @clubs.ens-cachan.fr          smtp:[users.adm.crans.org]
 
-@# SMTP relous
-@wanadoo.com slow:
-@wanadoo.fr slow:
-@orange.com slow:
-@orange.fr slow:
-@ens-cachan.fr slow:
+if has("mail-mx"):
+    @# SMTP relous
+    @wanadoo.com slow:
+    @wanadoo.fr slow:
+    @orange.com slow:
+    @orange.fr slow:
+    @ens-cachan.fr slow: