diff --git a/nixbld-etc-nixos/configuration.nix b/nixbld-etc-nixos/configuration.nix
index 816789a..68a9aac 100644
--- a/nixbld-etc-nixos/configuration.nix
+++ b/nixbld-etc-nixos/configuration.nix
@@ -100,6 +100,15 @@ in
   boot.kernel.sysctl."net.ipv6.conf.all.forwarding" = "1";
   boot.kernel.sysctl."net.ipv6.conf.default.forwarding" = "1";
 
+  services.unbound = {
+    enable = true;
+    extraConfig =
+    ''
+    server:
+      port: 5353
+    '';
+  };
+
   services.hostapd = {
     enable        = true;
     interface     = netifWifi;
@@ -118,6 +127,7 @@ in
   };
   services.dnsmasq = {
     enable = true;
+    servers = ["::1#5353"];
     extraConfig = ''
       interface=${netifLan}
       interface=${netifWifi}
@@ -128,6 +138,8 @@ in
       dhcp-range=interface:${netifLan},::,constructor:${netifLan},ra-names
       dhcp-range=interface:${netifWifi},::,constructor:${netifWifi},ra-only
 
+      no-resolv
+
       # Static IPv4s to make Red Pitayas less annoying
       dhcp-host=rp-f05cc9,192.168.1.190
       dhcp-host=rp-f0612e,192.168.1.191