diff --git a/wireguard/make.sh b/wireguard/make.sh
index 98bef73..eb37718 100755
--- a/wireguard/make.sh
+++ b/wireguard/make.sh
@@ -41,9 +41,13 @@ xread "Wireguard endpoint: " ENDPOINT
 DFL_ENDPOINT_PORT=${DFL_ENDPOINT_PORT:=51820}
 xread "Wireguard endpoint port: " ENDPOINT_PORT
 
+
 readVars
 
 
+DNS=${NS_LAN_IP/\/*}
+
+
 
 #----------------------------------------------------------------------
 
diff --git a/wireguard/templates/root/Makefile b/wireguard/templates/root/Makefile
index df43376..7e43f00 100644
--- a/wireguard/templates/root/Makefile
+++ b/wireguard/templates/root/Makefile
@@ -12,10 +12,10 @@ CLIENT_TPL := templates/client.conf
 CLIENT_DIR := $(SERVER_DIR)/clients/
 
 CLIENT_IPS ?= 10.42.0.0/16
-ENDPOINT_PORT ?= 51820
+ENDPOINT_PORT ?= ${ENDPOINT_PORT}
 ENDPOINT ?= ${ENDPOINT}
 
-DNS ?= ${NS_LAN_IPn}
+DNS ?= ${DNS}
 ALLOWED_IPS ?= 0.0.0.0/0
 # XXX need to generate this...
 CLIENT_IP ?= 10.42.0.1/32