diff --git a/usr.bin/config/gram.y b/usr.bin/config/gram.y
index e8835a027a7..adf33ad5e75 100644
--- a/usr.bin/config/gram.y
+++ b/usr.bin/config/gram.y
@@ -1345,6 +1345,15 @@ setmachine(const char *mch, const char *mcharch, struct nvlist *mchsubarches,
 	if (include(_PATH_DEVNULL, ENDDEFS, 0, 0) != 0)
 		exit(1);
 
+	/*
+	 * Include any arch/${MACHINE}/conf/files.${MACHINE_ARCH}
+	 */
+	if (machinearch != NULL) {
+		(void)snprintf(buf, sizeof(buf), "arch/%s/conf/files.%s",
+		    machine, machinearch);
+		(void)include(buf, ENDFILE, 1, 0);
+	}
+
 	/* Include arch/${MACHINE}/conf/files.${MACHINE} */
 	(void)snprintf(buf, sizeof(buf), "arch/%s/conf/files.%s",
 	    machine, machine);