diff --git a/src/mainboard/pcengines/apu1/mainboard.c b/src/mainboard/pcengines/apu1/mainboard.c
index a2a78c55ce..45d326a818 100644
--- a/src/mainboard/pcengines/apu1/mainboard.c
+++ b/src/mainboard/pcengines/apu1/mainboard.c
@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <amdblocks/acpimmio.h>
-#include <AGESA.h>
-#include <AMD.h>
+
 #include <console/console.h>
 #include <device/device.h>
 #include <device/mmio.h>
@@ -11,12 +10,14 @@
 #include <southbridge/amd/common/amd_pci_util.h>
 #include <smbios.h>
 #include <string.h>
-#include <southbridge/amd/cimx/sb800/SBPLATFORM.h>
 #include <southbridge/amd/cimx/sb800/pci_devs.h>
 #include <northbridge/amd/agesa/agesa_helper.h>
 #include <northbridge/amd/agesa/family14/pci_devs.h>
 #include <superio/nuvoton/nct5104d/nct5104d.h>
 #include "gpio_ftns.h"
+#include <AGESA.h>
+#include <AMD.h>
+#include <southbridge/amd/cimx/sb800/SBPLATFORM.h>
 
 /***********************************************************
  * These arrays set up the FCH PCI_INTR registers 0xC00/0xC01.
@@ -301,7 +302,7 @@ const char *smbios_mainboard_serial_number(void)
 
 	/* Read in the last 3 bytes of NIC's MAC address. */
 	bar18 = pci_read_config32(dev, 0x18);
-	bar18 &= 0xFFFFFC00;
+	bar18 &= 0xFFFFFFF0;
 	for (i = 3; i < 6; i++) {
 		mac_addr <<= 8;
 		mac_addr |= read8((u8 *)bar18 + i);