diff --git a/ffs-set-segment/files/usr/sbin/ffs-set-segment b/ffs-set-segment/files/usr/sbin/ffs-set-segment
index 1c5dfa85a4e7afcbcfd0338f9fe03ca124645653..cbd59d14109e160efb54e5e7f8a9f9cb9f66dbfe 100755
--- a/ffs-set-segment/files/usr/sbin/ffs-set-segment
+++ b/ffs-set-segment/files/usr/sbin/ffs-set-segment
@@ -25,38 +25,19 @@ PUBKEY=$(/etc/init.d/fastd show_key mesh_vpn | cut -c1-12)
 
 DNSDOM="freifunk-stuttgart.de"
 DNSREQ="ffs-${NODEID}-${PUBKEY}.segassign.${DNSDOM}"
-DNSLIST="::1 $(cat /var/gluon/wan-dnsmasq/resolv.conf | cut -d ' ' -f2)"
 
-for ip in $DNSLIST;
-do
-  if [ "$(echo ${ip} | cut -d':' -f1)" = "fe80" ]; then
-    DNSSRV=${ip}%br-wan
-  else
-    DNSSRV=${ip}
-  fi
-
-  logger -t $ME "DNSv6 on ${DNSSRV} for ${DNSREQ} ..."
-  GITSEG=$(nslookup ${DNSREQ} ${DNSSRV} | grep "2001:2:0:711::" | cut -d':' -f7)
-  if [ -z "$GITSEG" ]; then
-    logger -t $ME "DNSv4 on ${DNSSRV} for ${DNSREQ} ..."
-    GITSEG=$(nslookup ${DNSREQ} ::1 | grep "198.18.190." | cut -d'.' -f4)
-  fi
-  if [ -n "$GITSEG" ]; then
-    break
-  fi
-done
+logger -t $ME "DNSv6 for ${DNSREQ} ..."
+GITSEG=$(gluon-wan nslookup ${DNSREQ} | grep "2001:2:0:711::" | cut -d':' -f7)
+if [ -z "$GITSEG" ]; then
+  logger -t $ME "DNSv4 for ${DNSREQ} ..."
+  GITSEG=$(gluon-wan nslookup ${DNSREQ} | grep "198.18.190." | cut -d'.' -f4)
+fi
 
 if [ -z "$GITSEG" ]; then
   DNSERR=$(nslookup ${DNSREQ} ::1 2>&1)
   logger -t $ME "DNS not working: $DNSERR"
   logger -t $ME "DNS settings: $(cat /var/gluon/wan-dnsmasq/resolv.conf)"
   exit 1
-else
-  if [ "$DNSSRV" != "::1" ]; then
-    logger -t $ME "DNSMASQ not working - will be restarted"
-    /etc/init.d/gluon-wan-dnsmasq stop
-    /etc/init.d/gluon-wan-dnsmasq start
-  fi
 fi
 
 if [ -n "$BATSEG" ] && [ "$BATSEG" != "$GITSEG" ]; then