Index: nodes/CNodePlantsoen2/wleiden.conf
===================================================================
--- nodes/CNodePlantsoen2/wleiden.conf	(revision 9829)
+++ nodes/CNodePlantsoen2/wleiden.conf	(revision 9836)
@@ -74,23 +74,14 @@
 STATUS=up
 EXTRA_TYPE=eth2wifibridge
-IP=172.16.3.170/30
+IP=172.16.5.91/29
 DHCP=no
 DESC=ethernet
 STATUS=up to interlink noord-2
 SDESC=2vosko
+MODE=bridge station
+ESSID=il-zo.vosko3.wleiden.net
+CHANNEL=116
+DISTANCE=0.7 km
+NS_MAC= 00:15:6D:BD:67:FF
+NS_IP=172.16.5.90/29
 VR2
-
-$config{'vr2:0'}=sprintf <<VR20;
-COMMENT=to Nanostation2 management interface
-TYPE=ethernet
-STATUS=up
-IP=172.16.3.193/30
-DESC=ethernet
-STATUS=up to Nanostation2 management interface
-SDESC=manageNS2
-DHCP=no
-MODE=managed
-ESSID=il-zo.vosko3.wleiden.net
-CHANNEL=
-DISTANCE=0.7 km
-VR20
Index: nodes/CNodeStadhuis/wleiden.conf
===================================================================
--- nodes/CNodeStadhuis/wleiden.conf	(revision 9829)
+++ nodes/CNodeStadhuis/wleiden.conf	(revision 9836)
@@ -117,27 +117,17 @@
 STATUS=up
 EXTRA_TYPE=eth2wifibridge
-IP=172.16.3.105/30
+IP=172.16.5.116/29
 DHCP=no
 DESC=Ethernet to interlink south east (Plantsoen)
 SDESC=2Plantsoen
-VR3
-
-$config{'vr3:0'}=sprintf <<VR30;
-COMMENT=ethernet
-STATUS=up to nanostation mgmt interface
-TYPE=ethernet
-STATUS=up
-IP=172.16.3.237/30
-DESC=ethernet
-STATUS=up to nanostation mgmt interface
-SDESC=manageNS5
-DHCP=no
-MODE=master
+MODE=bridge ap
 ESSID=il-zo.stadhuis.wleiden.net
 CHANNEL=44
 DISTANCE=0.5 km
-VR30
-
-$config{'vr3:1'}=sprintf <<VR31;
+NS_MAC=00:15:6D:BD:8A:B3
+NS_IP=172.16.5.115/29
+VR3
+
+$config{'vr3:0'}=sprintf <<VR30;
 COMMENT=ethernet
 STATUS=down
@@ -148,5 +138,5 @@
 SDESC=2victoria
 DHCP=no
-VR31
+VR30
 
 $config{'sis0'}=sprintf <<SIS0;
@@ -182,24 +172,15 @@
 STATUS=up
 EXTRA_TYPE=eth2wifibridge
-IP=172.16.3.166/30
+IP=172.16.5.68/29
 DHCP=no
 DESC=Ethernet to interlink west (Vosko3)
 SDESC=2Vosko3
-SIS1
-
-$config{'sis1:0'}=sprintf <<SIS10;
-COMMENT=to nanostation mgmt interface
-TYPE=ethernet
-STATUS=up
-IP=172.16.3.201/30
-DESC=ethernet
-STATUS=up to nanostation mgmt interface
-SDESC=manageNS5
-DHCP=no
-MODE=managed
+NS_IP=172.16.5.67/29
+NS_MAC= 00:15:6D:BD:8A:B2
+MODE=ap station
 ESSID=il-o.vosko3.wleiden.net
 CHANNEL=108
 DISTANCE=0.5 km
-SIS10
+SIS1
 
 $config{'sis2'}=sprintf <<SIS2;
Index: nodes/CNodeVosko3/wleiden.conf
===================================================================
--- nodes/CNodeVosko3/wleiden.conf	(revision 9829)
+++ nodes/CNodeVosko3/wleiden.conf	(revision 9836)
@@ -29,5 +29,5 @@
 STATUS=up
 EXTRA_TYPE=eth2wifibridge
-IP=172.16.3.165/30
+IP=172.16.5.65/29
 DESC=Ethernet to interlink east (Stadhuis)
 SDESC=2stadhuis
@@ -36,18 +36,7 @@
 ESSID=il-o.vosko3.wleiden.net
 CHANNEL=108
-NS_MAC=
+NS_MAC=00:15:6D:BD:67:FE
+NS_IP=172.16.5.66/29
 VR0
-
-$config{'vr0:0'}=sprintf <<VR00;
-COMMENT=to nanostation mgmt interface
-TYPE=ethernet
-STATUS=up
-IP=172.16.3.177/30
-DESC=ethernet
-STATUS=up to nanostation mgmt interface
-SDESC=manageNS5
-DHCP=no
-VR00
-
 
 $config{'vr1'}=sprintf <<VR1;
@@ -56,5 +45,5 @@
 STATUS=up
 EXTRA_TYPE=eth2wifibridge
-IP=172.16.3.169/30
+IP=172.16.5.89/29
 DESC=Ethernet to interlink south-east (Plantsoen)
 SDESC=2Plantsoen
@@ -63,17 +52,7 @@
 ESSID=il-zo.vosko3.wleiden.net
 CHANNEL=92
-NS_MAC=
+NS_MAC=00:15:6D:BD:67:FF
+NS_IP=172.16.5.90/29
 VR1
-
-$config{'vr1:0'}=sprintf <<VR10;
-COMMENT=to nanostation mgmt interface
-TYPE=ethernet
-STATUS=up
-IP=172.16.3.181/30
-DESC=ethernet
-STATUS=up to nanostation mgmt interface
-SDESC=manageNS5
-DHCP=no
-VR10
 
 $config{'vr2'}=sprintf <<VR2;