diff --git a/pvv-domain.nix b/pvv-domain.nix
index 1c06f4f..00d400e 100644
--- a/pvv-domain.nix
+++ b/pvv-domain.nix
@@ -58,7 +58,7 @@ in
   A = pvvHostRecords.bekkalokk.A;
   AAAA = pvvHostRecords.bekkalokk.AAAA;
   TXT = [
-    "v=spf1 mx ~all"
+    (with spf; soft [ "mx" ])
   ];
 
   subdomains = pvvHostRecords // {
@@ -75,7 +75,7 @@ in
     _kerberos.TXT = [ "PVV.NTNU.NO" ];
 
     # E-mail:
-    _dmarc.TXT = [ "v=DMARC1; p=quarantine; fo=1;" ];
+    _dmarc.TXT = [ "v=DMARC1; p=quarantine; fo=1;" ]; # TODO - Use dns.nix DMARC generator
     drift.CNAME = [ "mail" ];
     imap.CNAME = [ "mail" ];
     mailhost.CNAME = [ "mail" ];