diff --git a/bcm2711-rpi-400.dtb b/bcm2711-rpi-400.dtb
index 505f804..d3fab8d 100644
Binary files a/bcm2711-rpi-400.dtb and b/bcm2711-rpi-400.dtb differ
diff --git a/bcm283x-firmware.spec b/bcm283x-firmware.spec
index b0c3a87..72993a0 100644
--- a/bcm283x-firmware.spec
+++ b/bcm283x-firmware.spec
@@ -8,7 +8,7 @@
 
 Name:          bcm283x-firmware
 Version:       20240229
-Release:       1.%{gitshort}%{?dist}
+Release:       2.%{gitshort}%{?dist}
 Summary:       Firmware for the Broadcom bcm283x/bcm271x used in the Raspberry Pi
 # see LICENSE.broadcom
 # DT Overlays covered under Linux Kernel GPLv2
@@ -104,6 +104,10 @@ install -p %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{buildroot}%{
 %{efi_esp_root}/start4*
 
 %changelog
+* Mon Mar 18 2024 Peter Robinson <pbrobinson@fedoraproject.org> - 20240229-2.dc94391
+- Update RPi400 firmware DTB
+- Reorder config.txt to be closer to upstream
+
 * Thu Feb 15 2024 Peter Robinson <pbrobinson@fedoraproject.org> - 20240229-1.dc94391
 - Update to latest firmware
 - Rebuild RPi4 FW DT to fix dma40 sound/display issue
diff --git a/config.txt b/config.txt
index 211e9f8..3835760 100644
--- a/config.txt
+++ b/config.txt
@@ -9,35 +9,13 @@
 # Details on overlays and additional parameters are documented in
 # /boot/efi/overlays/README
 
-# Raspberry Pi 4
-[pi4]
-dtoverlay=upstream-pi4
-
-# Allow 256Mb of CMA by default on RPi4+
-dtoverlay=cma,cma-256
-# 4K display support - RPi4+ only, only one port possible
-# hdmi_enable_4kp60=1
-
-# Raspberry Pi CM4
-[cm4]
-# Enable host mode on the 2711 built-in XHCI USB controller.
-# This line should be removed if the legacy DWC2 controller is required
-# (e.g. for USB device mode) or if USB support is not required.
-otg_mode=1
-
-# Raspberry Pi 5
-[pi5]
-# Allow 256Mb of CMA by default on RPi4+
-dtoverlay=cma,cma-256
-# 4K display support - RPi4+ only, only one port possible
-# hdmi_enable_4kp60=1
-
 # Default Fedora configs for all Raspberry Pi Revisions
-[all]
+
 # Put the RPi into 64 bit mode
 arm_64bit=1
+
+# We use U-Boot
 kernel=rpi-u-boot.bin
-dtoverlay=upstream
 
 # Run as fast as the firmware allows
 arm_boost=1
@@ -47,43 +25,56 @@ arm_boost=1
 # Serial console is ttyS0 on RPi3 and ttyAMA0 on all other variants
 # u-boot will auto detect serial and pass corrent options to kernel if enabled
 # Speed details: https://www.raspberrypi.org/forums/viewtopic.php?f=28&t=141195
-
-# Terrible hack to work around U-Boot issues on most devices
 enable_uart=1
 
-# Early boot delay in the hope monitors are initialised enough to provide EDID
-bootcode_delay=1
-
 # Enable audio (loads snd_bcm2835)
 dtparam=audio=on
 
-# Use eXtended firmware by default
-start_x=1
+# Automatically load overlays for detected cameras
+camera_auto_detect=1
 
-# We need this to be 32Mb to support VCHI services and drivers which use them
-# but this isn't used by mainline VC4 driver so reduce to lowest supported value
-# You need to set this to at least 80 for using the camera
-gpu_mem=32
+# Automatically load overlays for detected DSI displays
+display_auto_detect=1
 
-# Enable open source VC4 V3D display drivers
+# Enable DRM VC4 V3D driver
 dtoverlay=vc4-kms-v3d
 max_framebuffers=2
 
+# Don't have the firmware create an initial video= setting in cmdline.txt.
+# Use the kernel's default instead.
+disable_fw_kms_setup=1
+
 # Stop the RPi turning on HDMI monitors on reboot
 hdmi_ignore_cec_init=1
 
-# Automatically load overlays for detected DSI displays
-display_auto_detect=1
+# Raspberry Pi 3 series
+[pi3]
+dtoverlay=upstream
 
-# Disable compensation for displays with overscan
-disable_overscan=1
+# Raspberry Pi 4 series
+[pi4]
+dtoverlay=upstream-pi4
 
-# Don't have the firmware create an initial video= setting in cmdline.txt.
-# Use the kernel's default instead.
-disable_fw_kms_setup=1
+# Allow 256Mb of CMA by default on RPi4+
+dtoverlay=cma,cma-256
+# 4K display support - RPi4+ only, only one port possible
+# hdmi_enable_4kp60=1
 
-# Automatically load overlays for detected cameras
-camera_auto_detect=1
+# Raspberry Pi CM4
+[cm4]
+# Enable host mode on the 2711 built-in XHCI USB controller.
+# This line should be removed if the legacy DWC2 controller is required
+# (e.g. for USB device mode) or if USB support is not required.
+otg_mode=1
+
+# Raspberry Pi 5
+[pi5]
+# Allow 256Mb of CMA by default on RPi4+
+dtoverlay=cma,cma-256
+# 4K display support - RPi4+ only, only one port possible
+# hdmi_enable_4kp60=1
+
+[all]
 
 # HAT and DT overlays. Documentation at Raspberry Pi here:
 # https://www.raspberrypi.org/documentation/configuration/device-tree.md