diff --git a/common/recipes-graphics/mesa/mesa-dri_8.0.4.bbappend b/common/recipes-graphics/mesa/mesa-dri_8.0.4.bbappend
new file mode 100644
index 00000000..90e43944
--- /dev/null
+++ b/common/recipes-graphics/mesa/mesa-dri_8.0.4.bbappend
@@ -0,0 +1,5 @@
+# Temporary avoid warnings of duplicate files providers until
+# mesa-dri & emgd-driver-bin recipes are fixed
+SSTATE_DUPWHITELIST += "${STAGING_INCDIR}/KHR ${STAGING_INCDIR}/EGL \
+                        ${STAGING_INCDIR}/GLES ${STAGING_INCDIR}/GLES2"
+