diff --git a/domains/fudo.org.nix b/domains/fudo.org.nix
index 51935b0..ce159fe 100644
--- a/domains/fudo.org.nix
+++ b/domains/fudo.org.nix
@@ -15,7 +15,7 @@
   kerberos-master = "germany";
   kerberos-slaves = [ "legatus" ];
   # primary-nameserver = "germany";
-  primary-mailserver = "france";
+  # primary-mailserver = "france";
   ldap-servers = [ "germany" "legatus" ];
   zone = "fudo.org";
   xmpp-servers = [ "germany" ];
diff --git a/zones/fudo.org.nix b/zones/fudo.org.nix
index 5733063..c5e8ada 100644
--- a/zones/fudo.org.nix
+++ b/zones/fudo.org.nix
@@ -1,4 +1,4 @@
-{
+rec {
   aliases = {
     webmail = "france.fudo.org.";
 
@@ -86,7 +86,7 @@
     lsbb-gba.ipv4-address = "199.101.56.34";
     lsbb-hcl.ipv4-address = "199.101.56.110";
     lsbb-hwd.ipv4-address = "199.101.56.106";
-    mail.ipv4-address = france.ipv4-address;
+    mail.ipv4-address = hosts.germany.ipv4-address;
     mbix.ipv4-address = "208.81.7.146";
     nero.ipv4-address = "24.76.21.215";
     ns2-fudo = {