diff --git a/sim/Makefile.in b/sim/Makefile.in
index df5d396e4bc..96305a397ce 100644
--- a/sim/Makefile.in
+++ b/sim/Makefile.in
@@ -217,7 +217,8 @@ TESTS = testsuite/common/bits32m0$(EXEEXT) \
 @SIM_ENABLE_ARCH_microblaze_TRUE@am__append_67 = microblaze/run
 @SIM_ENABLE_ARCH_mips_TRUE@am__append_68 = mips/run
 @SIM_ENABLE_ARCH_mips_TRUE@am__append_69 = mips_SIM_EXTRA_HW_DEVICES="$(mips_SIM_EXTRA_HW_DEVICES)"
-@SIM_ENABLE_ARCH_mips_TRUE@am__append_70 = mips/itable.h
+@SIM_ENABLE_ARCH_mips_TRUE@am__append_70 = mips/itable.h \
+@SIM_ENABLE_ARCH_mips_TRUE@	$(SIM_MIPS_MULTI_SRC)
 @SIM_ENABLE_ARCH_mips_TRUE@@SIM_MIPS_GEN_MODE_SINGLE_TRUE@am__append_71 = \
 @SIM_ENABLE_ARCH_mips_TRUE@@SIM_MIPS_GEN_MODE_SINGLE_TRUE@	$(mips_BUILT_SRC_FROM_GEN_MODE_SINGLE) \
 @SIM_ENABLE_ARCH_mips_TRUE@@SIM_MIPS_GEN_MODE_SINGLE_TRUE@	mips/stamp-gen-mode-single
diff --git a/sim/mips/local.mk b/sim/mips/local.mk
index fa70edde35b..9db960ca4be 100644
--- a/sim/mips/local.mk
+++ b/sim/mips/local.mk
@@ -29,6 +29,10 @@ AM_MAKEFLAGS += %C%_SIM_EXTRA_HW_DEVICES="$(%C%_SIM_EXTRA_HW_DEVICES)"
 
 ## List all generated headers to help Automake dependency tracking.
 BUILT_SOURCES += %D%/itable.h
+## The multi files are a bit of a mess with generated multirun files depending
+## on generated igen files.  Be lazy for now and declare them all built so they
+## are generated early on.
+BUILT_SOURCES += $(SIM_MIPS_MULTI_SRC)
 %C%_BUILT_SRC_FROM_IGEN_ITABLE = \
 	%D%/itable.h \
 	%D%/itable.c