diff --git a/src/packages/fff/fff-layer3-config/Makefile b/src/packages/fff/fff-layer3-config/Makefile
index d9be8265..7a7588c0 100644
--- a/src/packages/fff/fff-layer3-config/Makefile
+++ b/src/packages/fff/fff-layer3-config/Makefile
@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=fff-layer3-config
-PKG_RELEASE:=5
+PKG_RELEASE:=6
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/src/packages/fff/fff-layer3-config/files/etc/layer3.d/30-network-wan b/src/packages/fff/fff-layer3-config/files/etc/layer3.d/30-network-wan
new file mode 100644
index 00000000..17d8b0b0
--- /dev/null
+++ b/src/packages/fff/fff-layer3-config/files/etc/layer3.d/30-network-wan
@@ -0,0 +1,21 @@
+# load board specific properties
+BOARD="$(uci get board.model.name)"
+. /etc/network.$BOARD
+
+configure() {
+	if vlan=$(uci -q get gateway.@wan[0].vlan); then
+		uci set network.wan.ifname="${SWITCHDEV}.$vlan"
+	elif iface=$(uci -q get gateway.@wan[0].iface); then
+		uci set network.wan.ifname="$iface"
+	else
+		echo "WARNING: No vlan/interface for WAN specified. The default setting won't be overwritten."
+	fi
+}
+
+apply() {
+	uci commit network
+}
+
+revert() {
+	uci revert network
+}