diff --git a/README.md b/README.md
index 6f3154570cc3351ac9fe8e75e88d2521622f9f33..909a4de1f266764676b31d0f95cedcc3514ed979 100644
--- a/README.md
+++ b/README.md
@@ -110,7 +110,7 @@ Jetzt gehst du n Kaffee trinken.
 
 ### Netzwerkeinstellungen korrekt setzen
 Am Ende sollte im bin/ Verzeichnis das Image für v1 und v2 liegen. Das v2 Image wird auf den Router geflasht. Achtung: Eventuell ist das Netzwerk jetzt so falsch eingestellt, dass man nicht mehr über Netzwerk auf den Router zugreifen kann. Am einfachsten ist es den Router dann über eine serielle Konsole zu verwenden. Theoretisch kann man an den unterschiedlichen LAN-Ports mit der IPv6 Link-Local aus der MAC Adresse des Geräts versuchen drauf zu kommen. Es kann auch sein, dass die IPv6 +/- 1 am Ende hat. Letztlich kann das funktionieren, ist aber aufwändig und da am LAN Einstellungen verändert werden sollen, ist die serielle Konsole das Mittel der Wahl!
-Wenn man dann auf dem Router drauf ist, muss als erstes festgestellt werden, welches Ethernet-Device für den WAN Port zuständig ist. Mir sind da folgende Möglichkeiten bekannt. a) WAN ist eth0, b) WAN ist eth1, c) WAN ist teil vom Switch eth0. Dementsprechend wird das WANDEV auf dem Router in der /etc/network.tl-wr1043nd-v2 konfiguriert. Wenn WAN ein eigenes ethX hat, dann muss WAN_PORTS="" sein. Dann muss eingestellt werden welches Ethernet-Device an dem internen Switch angeschlossen ist (swconfig list). Dieses wird als SWITCHDEV konfiguriert. Ich glaub CLIENTIF musst nicht angepasst werden. Aber es muss noch eingestellt werden, welches Ethernet oder Wifi Device die MAC Adresse hat, die auch unter dem Gerät steht. Dieses Device wird als ROUTERMAC eingetragen. Nun ist es an der Zeit die Einstellungen zu testen, dafür muss die falsche Netzwerk-Config zurück gesetzt werden:
+Wenn man dann auf dem Router drauf ist, muss als erstes festgestellt werden, welches Ethernet-Device für den WAN Port zuständig ist. Mir sind da folgende Möglichkeiten bekannt. a) WAN ist eth0, b) WAN ist eth1, c) WAN ist teil vom Switch eth0. Dementsprechend wird das WANDEV auf dem Router in der /etc/network.tl-wr1043nd-v2 konfiguriert. Wenn WAN ein eigenes ethX hat, dann muss WAN_PORTS="" sein. Dann muss eingestellt werden welches Ethernet-Device an dem internen Switch angeschlossen ist (swconfig list). Dieses wird als SWITCHDEV konfiguriert. Es muss noch eingestellt werden, welches Ethernet oder Wifi Device die MAC Adresse hat, die auch unter dem Gerät steht. Dieses Device wird als ROUTERMAC eingetragen. Nun ist es an der Zeit die Einstellungen zu testen, dafür muss die falsche Netzwerk-Config zurück gesetzt werden:
 ```
 cp /rom/etc/config/network /etc/config/network
 reboot
diff --git a/src/packages/fff/fff-network/Makefile b/src/packages/fff/fff-network/Makefile
index 37e5ea363a466b535fc1745244703fc05ebdedc5..5ccf301197627c7a65da103168c2959a851f55c6 100644
--- a/src/packages/fff/fff-network/Makefile
+++ b/src/packages/fff/fff-network/Makefile
@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=fff-network
-PKG_VERSION:=0.0.2
+PKG_VERSION:=0.0.3
 PKG_RELEASE:=1
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/fff-network
diff --git a/src/packages/fff/fff-network/ar71xx/network.cpe210 b/src/packages/fff/fff-network/ar71xx/network.cpe210
index e1313ba7d432fd7725bcc67fa7e6916fb4713d51..818078904063382be738f02f61fa2ed8d927ed03 100644
--- a/src/packages/fff/fff-network/ar71xx/network.cpe210
+++ b/src/packages/fff/fff-network/ar71xx/network.cpe210
@@ -3,7 +3,6 @@ SWITCHDEV=eth0
 CLIENT_PORTS="0t"
 WAN_PORTS="0t"
 BATMAN_PORTS="0t"
-CLIENTIF="w2ap eth0.1"
 
 ETHMESHMAC="w2ap"
 
diff --git a/src/packages/fff/fff-network/ar71xx/network.gl-ar150 b/src/packages/fff/fff-network/ar71xx/network.gl-ar150
index 78dbb09801981d4fb9480e0fa0c1388ac6101e4f..4e59b86fdf651c63ae4af315c80f25679c992061 100644
--- a/src/packages/fff/fff-network/ar71xx/network.gl-ar150
+++ b/src/packages/fff/fff-network/ar71xx/network.gl-ar150
@@ -2,7 +2,6 @@ WANDEV=eth0
 SWITCHDEV=eth1
 WAN_PORTS=
 
-CLIENTIF="eth0.1 w2ap"
 ETHMESHMAC=eth1
 ROUTERMAC=eth0
 
diff --git a/src/packages/fff/fff-network/ar71xx/network.tl-mr3020-v1 b/src/packages/fff/fff-network/ar71xx/network.tl-mr3020-v1
index e2150d00eef40690e29e235f8aa017f212e07513..1198c3d8d6d28a57903fd43c83238badd87dfa9e 100644
--- a/src/packages/fff/fff-network/ar71xx/network.tl-mr3020-v1
+++ b/src/packages/fff/fff-network/ar71xx/network.tl-mr3020-v1
@@ -6,7 +6,6 @@ BATMAN_PORTS=""
 
 . /etc/network.mode
 
-CLIENTIF="w2ap"
 ETHMESHMAC=eth0
 ROUTERMAC=eth0
 
@@ -23,7 +22,6 @@ if [ "$ETHMODE" = "WAN" ] ; then
   uci set network.wan.ifname=$WANDEV
 elif [ "$ETHMODE" = "CLIENT" ] ; then
   ## Activate Client:
-  CLIENTIF="w2ap eth0"
   uci set network.mesh.ifname="bat0 $SWITCHDEV"
 else
   ## Activate BATMAN:
diff --git a/src/packages/fff/fff-network/ar71xx/network.tl-wa850re-v1 b/src/packages/fff/fff-network/ar71xx/network.tl-wa850re-v1
index c69441502ce8fa7128f3cb6b457a0d10314f2455..e745b21eb14aae578b418d9f66df22fbf907caf1 100644
--- a/src/packages/fff/fff-network/ar71xx/network.tl-wa850re-v1
+++ b/src/packages/fff/fff-network/ar71xx/network.tl-wa850re-v1
@@ -6,7 +6,6 @@ BATMAN_PORTS=""
 
 . /etc/network.mode
 
-CLIENTIF="w2ap"
 ETHMESHMAC=
 ROUTERMAC=w2mesh
 
@@ -23,7 +22,6 @@ if [ "$ETHMODE" = "WAN" ] ; then
   uci set network.wan.ifname=$WANDEV
 elif [ "$ETHMODE" = "CLIENT" ] ; then
   ## Activate Client:
-  CLIENTIF="w2ap eth0"
   uci set network.mesh.ifname="bat0 $SWITCHDEV"
 else
   ## Activate BATMAN:
diff --git a/src/packages/fff/fff-network/ar71xx/network.tl-wa860re-v1 b/src/packages/fff/fff-network/ar71xx/network.tl-wa860re-v1
index c69441502ce8fa7128f3cb6b457a0d10314f2455..e745b21eb14aae578b418d9f66df22fbf907caf1 100644
--- a/src/packages/fff/fff-network/ar71xx/network.tl-wa860re-v1
+++ b/src/packages/fff/fff-network/ar71xx/network.tl-wa860re-v1
@@ -6,7 +6,6 @@ BATMAN_PORTS=""
 
 . /etc/network.mode
 
-CLIENTIF="w2ap"
 ETHMESHMAC=
 ROUTERMAC=w2mesh
 
@@ -23,7 +22,6 @@ if [ "$ETHMODE" = "WAN" ] ; then
   uci set network.wan.ifname=$WANDEV
 elif [ "$ETHMODE" = "CLIENT" ] ; then
   ## Activate Client:
-  CLIENTIF="w2ap eth0"
   uci set network.mesh.ifname="bat0 $SWITCHDEV"
 else
   ## Activate BATMAN:
diff --git a/src/packages/fff/fff-network/ar71xx/network.tl-wdr3500-v1 b/src/packages/fff/fff-network/ar71xx/network.tl-wdr3500-v1
index 480fddb3c34e1ec17196a24a0d7f035f4a0a9c17..3d0e901cde42766437fc89b8392b48fe51e19b3c 100644
--- a/src/packages/fff/fff-network/ar71xx/network.tl-wdr3500-v1
+++ b/src/packages/fff/fff-network/ar71xx/network.tl-wdr3500-v1
@@ -4,6 +4,5 @@ CLIENT_PORTS="0t 1 2"
 WAN_PORTS=
 BATMAN_PORTS="0t 3 4"
 
-CLIENTIF="eth0.1 w2ap w5ap"
 ETHMESHMAC=
-ROUTERMAC=w2mesh
\ No newline at end of file
+ROUTERMAC=w2mesh
diff --git a/src/packages/fff/fff-network/ar71xx/network.tl-wdr3600-v1 b/src/packages/fff/fff-network/ar71xx/network.tl-wdr3600-v1
index fcac1236f90a2ce295c8ad9fd12fb3ac926e13e2..897152ebcba6fee961bb304f9ea3be546b8c2c04 100644
--- a/src/packages/fff/fff-network/ar71xx/network.tl-wdr3600-v1
+++ b/src/packages/fff/fff-network/ar71xx/network.tl-wdr3600-v1
@@ -4,6 +4,5 @@ CLIENT_PORTS="0t 4 5"
 WAN_PORTS="0t 1"
 BATMAN_PORTS="0t 2 3"
 
-CLIENTIF="eth0.1 w2ap w5ap"
 ETHMESHMAC=
-ROUTERMAC=w5mesh
\ No newline at end of file
+ROUTERMAC=w5mesh
diff --git a/src/packages/fff/fff-network/ar71xx/network.tl-wdr4300-v1 b/src/packages/fff/fff-network/ar71xx/network.tl-wdr4300-v1
index fcac1236f90a2ce295c8ad9fd12fb3ac926e13e2..897152ebcba6fee961bb304f9ea3be546b8c2c04 100644
--- a/src/packages/fff/fff-network/ar71xx/network.tl-wdr4300-v1
+++ b/src/packages/fff/fff-network/ar71xx/network.tl-wdr4300-v1
@@ -4,6 +4,5 @@ CLIENT_PORTS="0t 4 5"
 WAN_PORTS="0t 1"
 BATMAN_PORTS="0t 2 3"
 
-CLIENTIF="eth0.1 w2ap w5ap"
 ETHMESHMAC=
-ROUTERMAC=w5mesh
\ No newline at end of file
+ROUTERMAC=w5mesh
diff --git a/src/packages/fff/fff-network/ar71xx/network.tl-wdr4310-v1 b/src/packages/fff/fff-network/ar71xx/network.tl-wdr4310-v1
index fcac1236f90a2ce295c8ad9fd12fb3ac926e13e2..897152ebcba6fee961bb304f9ea3be546b8c2c04 100644
--- a/src/packages/fff/fff-network/ar71xx/network.tl-wdr4310-v1
+++ b/src/packages/fff/fff-network/ar71xx/network.tl-wdr4310-v1
@@ -4,6 +4,5 @@ CLIENT_PORTS="0t 4 5"
 WAN_PORTS="0t 1"
 BATMAN_PORTS="0t 2 3"
 
-CLIENTIF="eth0.1 w2ap w5ap"
 ETHMESHMAC=
-ROUTERMAC=w5mesh
\ No newline at end of file
+ROUTERMAC=w5mesh
diff --git a/src/packages/fff/fff-network/ar71xx/network.tl-wr1043nd-v1 b/src/packages/fff/fff-network/ar71xx/network.tl-wr1043nd-v1
index 4c4629a44516563efb28cb370f2a6dd3d7eb0543..a3ea6c3bcc16f212ad1feec25e08b783f5d8b353 100644
--- a/src/packages/fff/fff-network/ar71xx/network.tl-wr1043nd-v1
+++ b/src/packages/fff/fff-network/ar71xx/network.tl-wr1043nd-v1
@@ -4,6 +4,5 @@ CLIENT_PORTS="3 4 5t"
 WAN_PORTS="0 5t"
 BATMAN_PORTS="1 2 5t"
 
-CLIENTIF="eth0.1 w2ap"
 ETHMESHMAC=w2ap
-ROUTERMAC=eth0
\ No newline at end of file
+ROUTERMAC=eth0
diff --git a/src/packages/fff/fff-network/ar71xx/network.tl-wr1043nd-v2 b/src/packages/fff/fff-network/ar71xx/network.tl-wr1043nd-v2
index 2f0e5f61e29133d9b04e2ffe5d44726ea2072e35..6dd467439e8637626040d85047adc973421b3436 100644
--- a/src/packages/fff/fff-network/ar71xx/network.tl-wr1043nd-v2
+++ b/src/packages/fff/fff-network/ar71xx/network.tl-wr1043nd-v2
@@ -4,6 +4,5 @@ CLIENT_PORTS="1 2 6t"
 WAN_PORTS="5 6t"
 BATMAN_PORTS="3 4 6t"
 
-CLIENTIF="eth0.1 w2ap"
 ETHMESHMAC=
-ROUTERMAC=eth1
\ No newline at end of file
+ROUTERMAC=eth1
diff --git a/src/packages/fff/fff-network/ar71xx/network.tl-wr1043nd-v3 b/src/packages/fff/fff-network/ar71xx/network.tl-wr1043nd-v3
index 2f0e5f61e29133d9b04e2ffe5d44726ea2072e35..6dd467439e8637626040d85047adc973421b3436 100644
--- a/src/packages/fff/fff-network/ar71xx/network.tl-wr1043nd-v3
+++ b/src/packages/fff/fff-network/ar71xx/network.tl-wr1043nd-v3
@@ -4,6 +4,5 @@ CLIENT_PORTS="1 2 6t"
 WAN_PORTS="5 6t"
 BATMAN_PORTS="3 4 6t"
 
-CLIENTIF="eth0.1 w2ap"
 ETHMESHMAC=
-ROUTERMAC=eth1
\ No newline at end of file
+ROUTERMAC=eth1
diff --git a/src/packages/fff/fff-network/ar71xx/network.tl-wr740n-v4 b/src/packages/fff/fff-network/ar71xx/network.tl-wr740n-v4
index 5d19a3885d18b84208b8fc63ed1f78713abd0591..fbe5744a58f61886624e9a383a93c586c8e0ccb1 100644
--- a/src/packages/fff/fff-network/ar71xx/network.tl-wr740n-v4
+++ b/src/packages/fff/fff-network/ar71xx/network.tl-wr740n-v4
@@ -5,6 +5,5 @@ CLIENT_PORTS="1 4 0t"
 WAN_PORTS=
 BATMAN_PORTS="2 3 0t"
 
-CLIENTIF="eth0.1 w2ap"
 ETHMESHMAC=eth1
-ROUTERMAC=w2mesh
\ No newline at end of file
+ROUTERMAC=w2mesh
diff --git a/src/packages/fff/fff-network/ar71xx/network.tl-wr741nd-v2 b/src/packages/fff/fff-network/ar71xx/network.tl-wr741nd-v2
index 2ffdff6438f80bb262ec7a921631911f8b31194f..85abc31453afc1365a3fa0bedd3f0ee4210b42a6 100644
--- a/src/packages/fff/fff-network/ar71xx/network.tl-wr741nd-v2
+++ b/src/packages/fff/fff-network/ar71xx/network.tl-wr741nd-v2
@@ -5,6 +5,5 @@ CLIENT_PORTS="1 2 0t"
 WAN_PORTS=
 BATMAN_PORTS="3 4 0t"
 
-CLIENTIF="eth0.1 w2ap"
 ETHMESHMAC=eth1
-ROUTERMAC=w2mesh
\ No newline at end of file
+ROUTERMAC=w2mesh
diff --git a/src/packages/fff/fff-network/ar71xx/network.tl-wr741nd-v4 b/src/packages/fff/fff-network/ar71xx/network.tl-wr741nd-v4
index 5d19a3885d18b84208b8fc63ed1f78713abd0591..fbe5744a58f61886624e9a383a93c586c8e0ccb1 100644
--- a/src/packages/fff/fff-network/ar71xx/network.tl-wr741nd-v4
+++ b/src/packages/fff/fff-network/ar71xx/network.tl-wr741nd-v4
@@ -5,6 +5,5 @@ CLIENT_PORTS="1 4 0t"
 WAN_PORTS=
 BATMAN_PORTS="2 3 0t"
 
-CLIENTIF="eth0.1 w2ap"
 ETHMESHMAC=eth1
-ROUTERMAC=w2mesh
\ No newline at end of file
+ROUTERMAC=w2mesh
diff --git a/src/packages/fff/fff-network/ar71xx/network.tl-wr841n-v10 b/src/packages/fff/fff-network/ar71xx/network.tl-wr841n-v10
index 02cefd899c1826c8be1ba3bc4121b97a74f37031..81b406c9d6d7667d287ba9be5df42e99936be151 100644
--- a/src/packages/fff/fff-network/ar71xx/network.tl-wr841n-v10
+++ b/src/packages/fff/fff-network/ar71xx/network.tl-wr841n-v10
@@ -6,6 +6,5 @@ CLIENT_PORTS="1 2 0t"
 WAN_PORTS=
 BATMAN_PORTS="3 4 0t"
 
-CLIENTIF="eth0.1 w2ap"
 ETHMESHMAC=eth1
 ROUTERMAC=eth0
diff --git a/src/packages/fff/fff-network/ar71xx/network.tl-wr841n-v11 b/src/packages/fff/fff-network/ar71xx/network.tl-wr841n-v11
index 02cefd899c1826c8be1ba3bc4121b97a74f37031..81b406c9d6d7667d287ba9be5df42e99936be151 100644
--- a/src/packages/fff/fff-network/ar71xx/network.tl-wr841n-v11
+++ b/src/packages/fff/fff-network/ar71xx/network.tl-wr841n-v11
@@ -6,6 +6,5 @@ CLIENT_PORTS="1 2 0t"
 WAN_PORTS=
 BATMAN_PORTS="3 4 0t"
 
-CLIENTIF="eth0.1 w2ap"
 ETHMESHMAC=eth1
 ROUTERMAC=eth0
diff --git a/src/packages/fff/fff-network/ar71xx/network.tl-wr841n-v8 b/src/packages/fff/fff-network/ar71xx/network.tl-wr841n-v8
index 083532273fa40d26521656d44fb9a250804b45ca..8afd85000500ba78be552928e2e7cf4524540ea6 100644
--- a/src/packages/fff/fff-network/ar71xx/network.tl-wr841n-v8
+++ b/src/packages/fff/fff-network/ar71xx/network.tl-wr841n-v8
@@ -6,6 +6,5 @@ CLIENT_PORTS="1 4 0t"
 WAN_PORTS=
 BATMAN_PORTS="3 2 0t"
 
-CLIENTIF="eth1.1 w2ap"
 ETHMESHMAC=eth0
 ROUTERMAC=eth1
diff --git a/src/packages/fff/fff-network/ar71xx/network.tl-wr841n-v9 b/src/packages/fff/fff-network/ar71xx/network.tl-wr841n-v9
index 02cefd899c1826c8be1ba3bc4121b97a74f37031..81b406c9d6d7667d287ba9be5df42e99936be151 100644
--- a/src/packages/fff/fff-network/ar71xx/network.tl-wr841n-v9
+++ b/src/packages/fff/fff-network/ar71xx/network.tl-wr841n-v9
@@ -6,6 +6,5 @@ CLIENT_PORTS="1 2 0t"
 WAN_PORTS=
 BATMAN_PORTS="3 4 0t"
 
-CLIENTIF="eth0.1 w2ap"
 ETHMESHMAC=eth1
 ROUTERMAC=eth0
diff --git a/src/packages/fff/fff-network/ar71xx/network.tl-wr841nd-v7 b/src/packages/fff/fff-network/ar71xx/network.tl-wr841nd-v7
index cd75ea3b935d10d1d7a96b899af1c8d261fc041c..eef816855ffd846a918ef726fb8360760505d93f 100644
--- a/src/packages/fff/fff-network/ar71xx/network.tl-wr841nd-v7
+++ b/src/packages/fff/fff-network/ar71xx/network.tl-wr841nd-v7
@@ -6,6 +6,5 @@ CLIENT_PORTS="1 2 0t"
 WAN_PORTS=
 BATMAN_PORTS="3 4 0t"
 
-CLIENTIF="eth0.1 w2ap"
 ETHMESHMAC=eth1
 ROUTERMAC=wlan0
diff --git a/src/packages/fff/fff-network/ar71xx/network.tl-wr842n-v2 b/src/packages/fff/fff-network/ar71xx/network.tl-wr842n-v2
index fe2e6989bc2bbffca6941b67f035f47e7200931d..c0e38178c1cc0510aaa2f88f0a610b55877ac1ea 100644
--- a/src/packages/fff/fff-network/ar71xx/network.tl-wr842n-v2
+++ b/src/packages/fff/fff-network/ar71xx/network.tl-wr842n-v2
@@ -4,6 +4,5 @@ CLIENT_PORTS="1 4 0t"
 WAN_PORTS=
 BATMAN_PORTS="3 2 0t"
 
-CLIENTIF="eth1.1 w2ap"
 ETHMESHMAC=eth0
 ROUTERMAC=eth1
diff --git a/src/packages/fff/fff-network/ar71xx/network.ubnt-bullet-m b/src/packages/fff/fff-network/ar71xx/network.ubnt-bullet-m
index 1e9223f75c2fb861296a29f0eed493e8cc35afb1..c16993d93707338f3103ffdbcc94e596f8d0439a 100644
--- a/src/packages/fff/fff-network/ar71xx/network.ubnt-bullet-m
+++ b/src/packages/fff/fff-network/ar71xx/network.ubnt-bullet-m
@@ -6,7 +6,6 @@ BATMAN_PORTS=""
 
 . /etc/network.mode
 
-CLIENTIF="w2ap"
 ETHMESHMAC=
 ROUTERMAC=w2mesh
 
@@ -23,7 +22,6 @@ if [ "$ETHMODE" = "WAN" ] ; then
   uci set network.wan.ifname=$WANDEV
 elif [ "$ETHMODE" = "CLIENT" ] ; then
   ## Activate Client:
-  CLIENTIF="w2ap eth0"
   uci set network.mesh.ifname="bat0 $SWITCHDEV"
 else
   ## Activate BATMAN:
diff --git a/src/packages/fff/fff-network/ar71xx/network.ubnt-loco-m-xw b/src/packages/fff/fff-network/ar71xx/network.ubnt-loco-m-xw
index 20ac8bd0be60b188b00d31a574e5a8bb08b68cdd..22981175b0e3082e4aed6cccff23452170617f59 100644
--- a/src/packages/fff/fff-network/ar71xx/network.ubnt-loco-m-xw
+++ b/src/packages/fff/fff-network/ar71xx/network.ubnt-loco-m-xw
@@ -6,7 +6,6 @@ BATMAN_PORTS=""
 
 . /etc/network.mode
 
-CLIENTIF="w2ap"
 ETHMESHMAC=
 ROUTERMAC=w2mesh
 
@@ -25,7 +24,6 @@ if [ "$ETHMODE" = "WAN" ] ; then
   uci set network.wan.ifname=$WANDEV
 elif [ "$ETHMODE" = "CLIENT" ] ; then
   ## Activate Client:
-  CLIENTIF="w2ap eth0"
   uci set network.mesh.ifname="bat0 $SWITCHDEV"
 else
   ## Activate BATMAN:
diff --git a/src/packages/fff/fff-network/ar71xx/network.ubnt-nano-m b/src/packages/fff/fff-network/ar71xx/network.ubnt-nano-m
index 1e9223f75c2fb861296a29f0eed493e8cc35afb1..c16993d93707338f3103ffdbcc94e596f8d0439a 100644
--- a/src/packages/fff/fff-network/ar71xx/network.ubnt-nano-m
+++ b/src/packages/fff/fff-network/ar71xx/network.ubnt-nano-m
@@ -6,7 +6,6 @@ BATMAN_PORTS=""
 
 . /etc/network.mode
 
-CLIENTIF="w2ap"
 ETHMESHMAC=
 ROUTERMAC=w2mesh
 
@@ -23,7 +22,6 @@ if [ "$ETHMODE" = "WAN" ] ; then
   uci set network.wan.ifname=$WANDEV
 elif [ "$ETHMODE" = "CLIENT" ] ; then
   ## Activate Client:
-  CLIENTIF="w2ap eth0"
   uci set network.mesh.ifname="bat0 $SWITCHDEV"
 else
   ## Activate BATMAN:
diff --git a/src/packages/fff/fff-network/files/usr/sbin/configurenetwork b/src/packages/fff/fff-network/files/usr/sbin/configurenetwork
index 41223223ba7b6710a0fb04954bf3b950df607d38..3b21411f5fa62c50f72a8c187e4a55d7ba5c197b 100755
--- a/src/packages/fff/fff-network/files/usr/sbin/configurenetwork
+++ b/src/packages/fff/fff-network/files/usr/sbin/configurenetwork
@@ -12,12 +12,6 @@
 BOARD="$(uci get board.model.name)"
 . /etc/network.$BOARD
 
-if ! uci get nodewatcher.@network[0].client_interfaces; then
-    echo "Setting nodewatchers client interfaces to: $CLIENTIF"
-    uci set nodewatcher.@network[0].client_interfaces="$CLIENTIF"
-    uci commit
-fi
-
 if ! uci get network.$SWITCHDEV.ifname; then
 
     SWITCHHW=$(swconfig list | awk '{ print $4 }')
diff --git a/src/packages/fff/fff-network/mpc85xx/network.tl-wdr4900-v1 b/src/packages/fff/fff-network/mpc85xx/network.tl-wdr4900-v1
index fcac1236f90a2ce295c8ad9fd12fb3ac926e13e2..897152ebcba6fee961bb304f9ea3be546b8c2c04 100644
--- a/src/packages/fff/fff-network/mpc85xx/network.tl-wdr4900-v1
+++ b/src/packages/fff/fff-network/mpc85xx/network.tl-wdr4900-v1
@@ -4,6 +4,5 @@ CLIENT_PORTS="0t 4 5"
 WAN_PORTS="0t 1"
 BATMAN_PORTS="0t 2 3"
 
-CLIENTIF="eth0.1 w2ap w5ap"
 ETHMESHMAC=
-ROUTERMAC=w5mesh
\ No newline at end of file
+ROUTERMAC=w5mesh
diff --git a/src/packages/fff/fff-nodewatcher/Makefile b/src/packages/fff/fff-nodewatcher/Makefile
index 7be6e3b7ca301de8ca2d92e860efbcfe3b89996c..334cc0a2386548e3e89cc34323a974905d46314a 100644
--- a/src/packages/fff/fff-nodewatcher/Makefile
+++ b/src/packages/fff/fff-nodewatcher/Makefile
@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=fff-nodewatcher
-PKG_VERSION:=37
+PKG_VERSION:=38
 PKG_RELEASE:=1
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/fff-nodewatcher
diff --git a/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher b/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher
index e9b734b59c9dd72a898bdf9e717747ea04387e74..966e1b334cda6efcdadac3de9cf468eb30935e65 100755
--- a/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher
+++ b/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher
@@ -2,7 +2,7 @@
 # Netmon Nodewatcher (C) 2010-2012 Freifunk Oldenburg
 # License; GPL v3
 
-SCRIPT_VERSION="37"
+SCRIPT_VERSION="38"
 
 test -f /tmp/started || exit
 
@@ -13,7 +13,6 @@ if [ -f /etc/config/nodewatcher ];then
 	SCRIPT_LOGFILE=`uci get nodewatcher.@script[0].logfile`
 	SCRIPT_DATA_FILE=`uci get nodewatcher.@script[0].data_file`
 	MESH_INTERFACE=`uci get nodewatcher.@network[0].mesh_interface`
-	CLIENT_INTERFACES=`uci get nodewatcher.@network[0].client_interfaces`
 	IFACEBLACKLIST=`uci get nodewatcher.@network[0].iface_blacklist`
 	IPWHITELIST=`uci get nodewatcher.@network[0].ip_whitelist`
 	SCRIPT_STATUS_FILE=`uci get nodewatcher.@script[0].status_text_file`
@@ -228,6 +227,7 @@ crawl() {
     err "`date`: Collecting information about conected clients"
 	#CLIENTS
 	client_count=0
+	CLIENT_INTERFACES=$(bridge link | awk '$2 !~/^bat/{ printf $2" " }')
 	for clientif in ${CLIENT_INTERFACES}; do
 		local cc=$(bridge fdb show br $MESH_INTERFACE brport $clientif | grep -v self | grep -v permanent -c)
 		client_count=$((client_count + $cc))