diff --git a/bsp/wdr4900/root_file_system/etc/config/network b/bsp/wdr4900/root_file_system/etc/config/network
index ffc255f..b2ec5d9 100644
--- a/bsp/wdr4900/root_file_system/etc/config/network
+++ b/bsp/wdr4900/root_file_system/etc/config/network
@@ -16,7 +16,6 @@ config interface 'w5mesh'
 
 config 'interface' 'mesh'
 	option 'type' 'bridge'
-	option 'ifname' 'eth0.1 w2ap w5ap bat0 tap0'
 	option 'auto' '1'
 
 config 'interface' 'wan'
@@ -24,32 +23,8 @@ config 'interface' 'wan'
 	option 'proto' 'dhcp'
 
 config 'interface' 'ethmesh'
-	option 'ifname' 'eth0.3'
 	option 'mtu' '1528'
 	option proto 'batadv'
 	option mesh 'bat0'
 
-config 'switch'
-	option 'name' 'switch0'
-	option 'reset' '1'
-	option 'enable_vlan' '1'
-
-#3. und 4. LAN Port
-config 'switch_vlan'
-	option 'device' 'switch0'
-	option 'vlan' '1'
-	option 'ports' '0t 4 5'
-
-#WAN
-config 'switch_vlan'
-	option 'device' 'switch0'
-	option 'vlan' '2'
-	option 'ports' '0t 1'
-
-#1. und 2. LAN Port
-config 'switch_vlan'
-	option 'device' 'switch0'
-	option 'vlan' '3'
-	option 'ports' '0t 2 3'
-
 # vim: noexpandtab
diff --git a/bsp/wdr4900/root_file_system/etc/config/wireless.tpl b/bsp/wdr4900/root_file_system/etc/config/wireless.tpl
index 9d32135..f3cd49e 100644
--- a/bsp/wdr4900/root_file_system/etc/config/wireless.tpl
+++ b/bsp/wdr4900/root_file_system/etc/config/wireless.tpl
@@ -19,7 +19,7 @@ config wifi-iface 'w5mesh'
 
 config wifi-iface 'w5ap'
 	option device   radio0
-	option network  w5ap
+	option network  mesh
 	option ifname   w5ap
 	option mode     ap
 	option ssid     '${ESSID_AP}'
@@ -46,7 +46,7 @@ config wifi-iface 'w2mesh'
 
 config wifi-iface 'w2ap'
 	option device   radio1
-	option network  w2ap
+	option network  mesh
 	option ifname   w2ap
 	option mode     ap
 	option ssid     '${ESSID_AP}'
diff --git a/bsp/wdr4900/root_file_system/etc/network.wdr4900 b/bsp/wdr4900/root_file_system/etc/network.wdr4900
new file mode 100644
index 0000000..e18c599
--- /dev/null
+++ b/bsp/wdr4900/root_file_system/etc/network.wdr4900
@@ -0,0 +1,10 @@
+
+WANDEV=eth0
+SWITCHDEV=eth0
+CLIENT_PORTS="0t 4 5"
+WAN_PORTS="0t 1"
+BATMAN_PORTS="0t 2 3"
+
+CLIENTIF="eth0.1 w2ap w5ap"
+ETHMESHMAC=
+ROUTERMAC=