diff --git a/modules b/modules
index 4182f719f91677b45fbc3c97074bfbe2c38a931a..8cdf4e3bd48ee0acc5263c64e336c32556042abd 100644
--- a/modules
+++ b/modules
@@ -1,20 +1,20 @@
 GLUON_FEEDS='packages routing luci gluon'
 
 OPENWRT_REPO=https://git.openwrt.org/openwrt/openwrt.git
-OPENWRT_BRANCH=openwrt-18.06
-OPENWRT_COMMIT=89808e211cd5ef5989bd0becb8cd45f9340610ff
+OPENWRT_BRANCH=master
+OPENWRT_COMMIT=ced2b7bb988426aaece07a78c17d5a7c268e54c4
 
 PACKAGES_PACKAGES_REPO=https://github.com/openwrt/packages.git
-PACKAGES_PACKAGES_BRANCH=openwrt-18.06
-PACKAGES_PACKAGES_COMMIT=1eeea30fda0f573e57cd00bd3560f7af63fa6d10
+PACKAGES_PACKAGES_BRANCH=master
+PACKAGES_PACKAGES_COMMIT=1d9c28fca1a66070dcb000cdc5245fd1eca03c5f
 
 PACKAGES_ROUTING_REPO=https://github.com/openwrt-routing/packages.git
-PACKAGES_ROUTING_BRANCH=openwrt-18.06
-PACKAGES_ROUTING_COMMIT=7589804a56baac804421b492c93004c28a627abb
+PACKAGES_ROUTING_BRANCH=master
+PACKAGES_ROUTING_COMMIT=5d7f4af534b43b16453e6df71869e3db41e92dea
 
 PACKAGES_LUCI_REPO=https://github.com/openwrt/luci.git
-PACKAGES_LUCI_BRANCH=openwrt-18.06
-PACKAGES_LUCI_COMMIT=b99e77d5c36a9d51559bae3bb61a138695d60b95
+PACKAGES_LUCI_BRANCH=master
+PACKAGES_LUCI_COMMIT=f3bcb918bf60ef9f3e8fff0a98ca570bfca26888
 
 PACKAGES_GLUON_REPO=https://github.com/freifunk-gluon/packages.git
 PACKAGES_GLUON_COMMIT=fb1594606c1bec630ba2ecda92033dab56208ef4
diff --git a/targets/brcm2708-bcm2711 b/targets/brcm2708-bcm2711
new file mode 100644
index 0000000000000000000000000000000000000000..5a8b6424c9eddee77be166143148e6f809023b31
--- /dev/null
+++ b/targets/brcm2708-bcm2711
@@ -0,0 +1,7 @@
+include 'brcm2708.inc'
+
+device('raspberry-pi-4', 'rpi-4', {
+	manifest_aliases = {
+		'raspberry-pi-4-model-b',
+	},
+})
diff --git a/targets/targets.mk b/targets/targets.mk
index 1f54082942366b779454f5f3502ab55be11651cd..7ad4c8e3db99e55c9d1781763367e8fa8dc56d89 100644
--- a/targets/targets.mk
+++ b/targets/targets.mk
@@ -7,6 +7,7 @@ endif
 $(eval $(call GluonTarget,ar71xx,nand))
 $(eval $(call GluonTarget,brcm2708,bcm2708))
 $(eval $(call GluonTarget,brcm2708,bcm2709))
+$(eval $(call GluonTarget,brcm2708,bcm2711))
 $(eval $(call GluonTarget,mpc85xx,generic))
 $(eval $(call GluonTarget,mpc85xx,p1020))
 $(eval $(call GluonTarget,ramips,mt7621))