--- a/bin/zone-mk	Fri May 27 13:16:34 2011 +0200
+++ b/bin/zone-mk	Fri May 27 13:43:05 2011 +0200
@@ -78,6 +78,8 @@
             secondary  => $cf{secondary},
         );
 
+        $vars{hostmaster} =~ s/@/./g;
+
         my $tt = Template->new(INCLUDE_PATH => $cf{template_dir})
           or die "$Template::ERROR\n";