diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 7c72de1..8b6236e 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -610,8 +610,9 @@ AUTO_LIBNAME_PKGS = "${PACKAGES}"
 #
 # This works for  functions as well, they are really just environment variables.
 # Default OVERRIDES to make compilation fail fast in case of build system misconfiguration.
-OVERRIDES = "local:${MACHINE}:${DISTROOVERRIDES}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}:forcevariable"
+OVERRIDES = "local:${MACHINEOVERRIDES}:${DISTROOVERRIDES}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}:forcevariable"
 DISTROOVERRIDES ?= "${DISTRO}"
+MACHINEOVERRIDES ?= "${MACHINE}"
 
 CPU_FEATURES ?= ""
 CPU_FEATURES_arm ?= "vfp"