diff --git a/patches/0017-ipq807x-add-the-Qualcomm-AX-target-support.patch b/patches/0017-ipq807x-add-the-Qualcomm-AX-target-support.patch
index 38bcade15..16d642fba 100644
--- a/patches/0017-ipq807x-add-the-Qualcomm-AX-target-support.patch
+++ b/patches/0017-ipq807x-add-the-Qualcomm-AX-target-support.patch
@@ -1,7 +1,7 @@
-From 819a2761333e89e5b4dd480f1be44ad05d0a8cb3 Mon Sep 17 00:00:00 2001
+From 85462b8b429bbd0bd5b56ac58ea861b9eef32a2e Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Sat, 18 Jul 2020 08:53:44 +0200
-Subject: [PATCH 01/30] ipq807x: add the Qualcomm AX target support
+Subject: [PATCH 01/34] ipq807x: add the Qualcomm AX target support
 
 Signed-off-by: John Crispin <john@phrozen.org>
 ---
@@ -13,8 +13,9 @@ Signed-off-by: John Crispin <john@phrozen.org>
  target/linux/ipq807x/109-logspam.patch        |    24 +
  target/linux/ipq807x/Makefile                 |    22 +
  .../ipq807x/base-files/etc/board.d/01_leds    |    38 +
- .../ipq807x/base-files/etc/board.d/02_network |    82 +
+ .../ipq807x/base-files/etc/board.d/02_network |    80 +
  .../etc/hotplug.d/firmware/10-ath11k-caldata  |    95 +
+ .../ipq807x/base-files/etc/hotplug.d/net/macs |     3 +
  .../ipq807x/base-files/etc/init.d/aq_phy      |    16 +
  .../ipq807x/base-files/etc/init.d/bootcount   |    12 +
  .../linux/ipq807x/base-files/etc/init.d/wdt   |    14 +
@@ -65,13 +66,14 @@ Signed-off-by: John Crispin <john@phrozen.org>
  target/linux/ipq807x/patches/112-pstore.patch |   147 +
  .../ipq807x/patches/200-bpf_backport.patch    | 44780 ++++++++++++++++
  toolchain/kernel-headers/Makefile             |     8 +
- 60 files changed, 56684 insertions(+), 2 deletions(-)
+ 61 files changed, 56685 insertions(+), 2 deletions(-)
  create mode 100644 package/boot/uboot-envtools/files/ipq807x
  create mode 100644 target/linux/ipq807x/109-logspam.patch
  create mode 100644 target/linux/ipq807x/Makefile
  create mode 100755 target/linux/ipq807x/base-files/etc/board.d/01_leds
  create mode 100755 target/linux/ipq807x/base-files/etc/board.d/02_network
  create mode 100755 target/linux/ipq807x/base-files/etc/hotplug.d/firmware/10-ath11k-caldata
+ create mode 100644 target/linux/ipq807x/base-files/etc/hotplug.d/net/macs
  create mode 100755 target/linux/ipq807x/base-files/etc/init.d/aq_phy
  create mode 100755 target/linux/ipq807x/base-files/etc/init.d/bootcount
  create mode 100755 target/linux/ipq807x/base-files/etc/init.d/wdt
@@ -342,10 +344,10 @@ index 0000000000..1f1797b0c6
 +exit 0
 diff --git a/target/linux/ipq807x/base-files/etc/board.d/02_network b/target/linux/ipq807x/base-files/etc/board.d/02_network
 new file mode 100755
-index 0000000000..2c30b01aab
+index 0000000000..9d7dd4e61e
 --- /dev/null
 +++ b/target/linux/ipq807x/base-files/etc/board.d/02_network
-@@ -0,0 +1,82 @@
+@@ -0,0 +1,80 @@
 +#!/bin/sh
 +
 +. /lib/functions.sh
@@ -408,8 +410,6 @@ index 0000000000..2c30b01aab
 +		lan_mac=$(macaddr_add "$wan_mac" 1)
 +		ucidef_set_network_device_mac eth0 $lan_mac
 +		ucidef_set_network_device_mac eth1 $wan_mac
-+		ip link set eth0 address $lan_mac
-+		ip link set eth1 address $wan_mac
 +		;;
 +	*)
 +		wan_mac=$(cat /sys/class/net/eth0/address)
@@ -529,6 +529,15 @@ index 0000000000..1788908ab0
 +	exit 1
 +	;;
 +esac
+diff --git a/target/linux/ipq807x/base-files/etc/hotplug.d/net/macs b/target/linux/ipq807x/base-files/etc/hotplug.d/net/macs
+new file mode 100644
+index 0000000000..13e95ec947
+--- /dev/null
++++ b/target/linux/ipq807x/base-files/etc/hotplug.d/net/macs
+@@ -0,0 +1,3 @@
++#!/bin/sh
++mac=$(cat /etc/board.json | jsonfilter -e '@["network-device"]["'$DEVICENAME'"]'.macaddr)
++[ -n "$mac" ] && ip link set $DEVICENAME address $mac
 diff --git a/target/linux/ipq807x/base-files/etc/init.d/aq_phy b/target/linux/ipq807x/base-files/etc/init.d/aq_phy
 new file mode 100755
 index 0000000000..e64755b5d6