diff --git a/src/packages/fff/fff-network/Makefile b/src/packages/fff/fff-network/Makefile
index c97a816..21af16a 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_RELEASE:=31
+PKG_RELEASE:=32
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/src/packages/fff/fff-network/files/usr/sbin/configurenetwork b/src/packages/fff/fff-network/files/usr/sbin/configurenetwork
index c8a8ecc..9821303 100755
--- a/src/packages/fff/fff-network/files/usr/sbin/configurenetwork
+++ b/src/packages/fff/fff-network/files/usr/sbin/configurenetwork
@@ -118,12 +118,12 @@ if [ "$ONE_PORT" = "YES" ] && ( ! uci -q get network.$SWITCHDEV.ifname || [ "$FO
         uci set network.client.ifname="bat0"
         uci set network.wan.ifname="$WANDEV"
         uci del network.ethmesh.ifname
-        uci del network.eth0.macaddr
+        uci del network.${SWITCHDEV}.macaddr
     elif [ "$ETHMODE" = "CLIENT" ] ; then
         uci set network.client.ifname="bat0 $SWITCHDEV"
         uci set network.wan.ifname="eth2" #eth2 because it is default in config file
         uci del network.ethmesh.ifname
-        uci del network.eth0.macaddr
+        uci del network.${SWITCHDEV}.macaddr
     elif [ "$ETHMODE" = "BATMAN" ] ; then
         uci set network.client.ifname="bat0"
         uci set network.wan.ifname="eth2" #eth2 because it is default in config file
@@ -172,14 +172,14 @@ if [ -n "$ROUTERMAC" ]; then
 fi
 
 if [ -n "$ETH0MAC" ]; then
-        echo "Fixing MAC on eth0"
+        echo "Fixing MAC on $SWITCHDEV"
         sleep 10
         NEW_MACADDR=$(cat "/sys/class/net/${ETH0MAC}/address")
-        uci set network.eth0.macaddr=$NEW_MACADDR
+        uci set network.${SWITCHDEV}.macaddr=$NEW_MACADDR
         uci commit network
-        ifconfig eth0 down
-        ifconfig eth0 hw ether $NEW_MACADDR
-        ifconfig eth0 up
+        ifconfig $SWITCHDEV down
+        ifconfig $SWITCHDEV hw ether $NEW_MACADDR
+        ifconfig $SWITCHDEV up
         /etc/init.d/network restart
 fi