diff --git a/build_patches/openwrt/0050-Disable-ipq40xx-lan-wan-separation.patch b/build_patches/openwrt/0050-Disable-ipq40xx-lan-wan-separation.patch
index 736ecc96..6e062523 100644
--- a/build_patches/openwrt/0050-Disable-ipq40xx-lan-wan-separation.patch
+++ b/build_patches/openwrt/0050-Disable-ipq40xx-lan-wan-separation.patch
@@ -38,20 +38,20 @@ index ac11655904..147e159ea1 100755
  	;;
  avm,fritzbox-7530 |\
 diff --git a/target/linux/ipq40xx/base-files/etc/board.d/02_network b/target/linux/ipq40xx/base-files/etc/board.d/02_network
-index 1d4c78833a..ea2cc60186 100755
+index 87c79db5e1..666be0d145 100755
 --- a/target/linux/ipq40xx/base-files/etc/board.d/02_network
 +++ b/target/linux/ipq40xx/base-files/etc/board.d/02_network
-@@ -59,9 +59,8 @@ ipq40xx_setup_interfaces()
+@@ -58,9 +58,8 @@ ipq40xx_setup_interfaces()
+ 	avm,fritzbox-4040|\
  	linksys,ea6350v3|\
- 	linksys,ea8300|\
- 	linksys,mr8300)
+ 	linksys,ea8300)
 -		ucidef_set_interfaces_lan_wan "eth0" "eth1"
  		ucidef_add_switch "switch0" \
 -			"0u@eth0" "1:lan" "2:lan" "3:lan" "4:lan"
 +			"0@eth0" "1:lan" "2:lan" "3:lan" "4:lan" "5:wan"
  		;;
- 	avm,fritzbox-7530)
- 		ucidef_add_switch "switch0" \
+ 	linksys,mr8300)
+ 		ucidef_set_interfaces_lan_wan "eth0" "eth1"
 diff --git a/target/linux/ipq40xx/files/drivers/net/ethernet/qualcomm/essedma/edma.h b/target/linux/ipq40xx/files/drivers/net/ethernet/qualcomm/essedma/edma.h
 index 015e5f5026..daa60639d1 100644
 --- a/target/linux/ipq40xx/files/drivers/net/ethernet/qualcomm/essedma/edma.h
@@ -80,10 +80,10 @@ index 015e5f5026..daa60639d1 100644
  /* Queues exposed to linux kernel */
  #define EDMA_NETDEV_TX_QUEUE 4
 diff --git a/target/linux/ipq40xx/files/drivers/net/phy/ar40xx.c b/target/linux/ipq40xx/files/drivers/net/phy/ar40xx.c
-index c35ba2799f..0517e4f29e 100644
+index 545e3985ae..28453c2363 100644
 --- a/target/linux/ipq40xx/files/drivers/net/phy/ar40xx.c
 +++ b/target/linux/ipq40xx/files/drivers/net/phy/ar40xx.c
-@@ -1481,6 +1481,7 @@ ar40xx_vlan_init(struct ar40xx_priv *priv)
+@@ -1483,6 +1483,7 @@ ar40xx_vlan_init(struct ar40xx_priv *priv)
  	unsigned long bmp;
  
  	/* By default Enable VLAN */
@@ -91,7 +91,7 @@ index c35ba2799f..0517e4f29e 100644
  	priv->vlan = 1;
  	priv->vlan_table[AR40XX_LAN_VLAN] = priv->cpu_bmp | priv->lan_bmp;
  	priv->vlan_table[AR40XX_WAN_VLAN] = priv->cpu_bmp | priv->wan_bmp;
-@@ -1492,6 +1493,7 @@ ar40xx_vlan_init(struct ar40xx_priv *priv)
+@@ -1494,6 +1495,7 @@ ar40xx_vlan_init(struct ar40xx_priv *priv)
  	bmp = priv->wan_bmp;
  	for_each_set_bit(port, &bmp, AR40XX_NUM_PORTS)
  			priv->pvid[port] = AR40XX_WAN_VLAN;
@@ -100,7 +100,7 @@ index c35ba2799f..0517e4f29e 100644
  	return 0;
  }
 diff --git a/target/linux/ipq40xx/patches-5.4/711-dts-ipq4019-add-ethernet-essedma-node.patch b/target/linux/ipq40xx/patches-5.4/711-dts-ipq4019-add-ethernet-essedma-node.patch
-index 7b2ddfe00d..1a01b08e41 100644
+index 3567eb7810..b13b312a91 100644
 --- a/target/linux/ipq40xx/patches-5.4/711-dts-ipq4019-add-ethernet-essedma-node.patch
 +++ b/target/linux/ipq40xx/patches-5.4/711-dts-ipq4019-add-ethernet-essedma-node.patch
 @@ -36,7 +36,7 @@ Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
diff --git a/buildscript b/buildscript
index 3ea5e6f9..0eefdebb 100755
--- a/buildscript
+++ b/buildscript
@@ -7,9 +7,9 @@ set -o pipefail
 builddir=./build
 
 # OpenWrt: package hashes correspond to core repo version
-OPENWRTREV="v21.02.3"
-PACKAGEREV="78bcd00c13587571b5c79ed2fc3363aa674aaef7"
-ROUTINGREV="a0d61bddb3ce4ca54bd76af86c28f58feb6cc044"
+OPENWRTREV="v21.02.5"
+PACKAGEREV="0b16e3f359fe9d015861596d63c5bde4c56daa2e"
+ROUTINGREV="25e76489c83cfcee61e36a491896e1e9bfc3ec13"
 
 # Gluon packages: master from 2020-02-04
 GLUONREV="12e41d0ff07ec54bbd67a31ab50d12ca04f2238c"