diff --git a/dnsmasq.conf b/dnsmasq.conf
index 0dd92f8..0597e48 100644
--- a/dnsmasq.conf
+++ b/dnsmasq.conf
@@ -685,15 +685,14 @@
 #dhcp-name-match=set:wpad-ignore,wpad
 #dhcp-ignore-names=tag:wpad-ignore
 
+# Disable /etc/resolv.conf
+no-resolv
 # Upstream DNS server
 server=192.168.30.1
-# Override addresses
-address=/pim.kunis.nl/192.168.30.3
-address=/pim.kunis.nl/2a02:58:19a:f730:b62e:99ff:fe77:1bda
-address=/geokunis2.nl/192.168.30.3
-address=/geokunis2.nl/2a02:58:19a:f730:b62e:99ff:fe77:1bda
-address=/pizzapim.nl/192.168.30.3
-address=/pizzapim.nl/2a02:58:19a:f730:b62e:99ff:fe77:1bda
+# Always serve .dmz locally
+local=/dmz/
+# Put all clients in the dmz domain
+dhcp-fqdn
 # Don't read /etc/hosts
 no-hosts
 # Domain is automatically added to if missing
@@ -702,17 +701,25 @@ expand-hosts
 domain=dmz
 # IPv4 DHCP range
 dhcp-range=192.168.30.100,192.168.30.200,infinite
-# Advertise SLAAC for the given prefix
-# IPv6 SLAAC addresses are matched with IPv4 hosts
-# TODO: Still can't get this to work...
-dhcp-range=2a02:58:19a:f710::,12h
-# Enable router advertisements
-enable-ra
 # Predefined DHCP hosts
-dhcp-host=b8:27:eb:b9:ab:e2,esrom,192.168.30.2,[2a02:58:19a:f700:ba27:ebff:feb9:abe2]
-dhcp-host=b4:2e:99:77:1b:da,max,192.168.30.3,[2a02:58:19a:f700:b62e:99ff:fe77:1bda]
-dhcp-host=d8:5e:d3:47:33:6e,lewis,192.168.30.6,[2a02:58:19a:f700:da5e:d3ff:fe47:336e]
+dhcp-host=b8:27:eb:b9:ab:e2,esrom,192.168.30.2
+dhcp-host=b4:2e:99:77:1b:da,max,192.168.30.3
+dhcp-host=d8:5e:d3:47:33:6e,lewis,192.168.30.6
 # Advertise router
 dhcp-option=3,192.168.30.1
+# Always send the IPv6 DNS server address (this machine)
+dhcp-option=option6:dns-server,[2a02:58:19a:f730::1]
+# Advertise SLAAC for the given prefix
+dhcp-range=2a02:58:19a:f730::, ra-stateless, ra-names
+# Do not advertise default gateway via DHCPv6
+ra-param=*,0,0
 # Alias public IP address to local
 alias=84.245.14.149,192.168.30.3
+# Override DNS servers for our domains
+server=/pizzapim.nl/192.168.30.3
+server=/geokunis2.nl/192.168.30.3
+server=/pim.kunis.nl/192.168.30.3
+
+# Enable extended logging
+log-dhcp
+log-queries