diff --git a/makefile b/makefile
index 823b3982415..e94be2b3426 100644
--- a/makefile
+++ b/makefile
@@ -714,7 +714,7 @@ buildtools: maketree $(BUILD)
 # $(SRC)/emu, as well as all the OSD objects and anything in the $(OBJ) tree
 depend: maketree $(MAKEDEP_TARGET)
 	@echo Rebuilding depend.mak...
-	$(MAKEDEP) -I. $(INCPATH) -X$(SRC)/emu -X$(SRC)/osd/... -X$(OBJ)/... src/$(TARGET) > depend.mak
+	$(MAKEDEP) -I. $(INCPATH) -X$(SRC)/emu -X$(SRC)/osd/... -X$(OBJ)/... src/$(TARGET) > depend_$(TARGET).mak
 
 tools: maketree $(TOOLS)
 
@@ -824,4 +824,4 @@ endif
 # optional dependencies file
 #-------------------------------------------------
 
--include depend.mak
+-include depend_$(TARGET).mak
diff --git a/src/ume/ume.mak b/src/ume/ume.mak
index df3fbbb147b..46a8b6a1606 100644
--- a/src/ume/ume.mak
+++ b/src/ume/ume.mak
@@ -20,3 +20,10 @@ $(DRIVLISTSRC): $(SRC)/mame/mame.lst $(SRC)/mess/mess.lst
 
 include $(SRC)/mame/mame.mak
 include $(SRC)/mess/mess.mak
+
+depend_ume: maketree $(MAKEDEP_TARGET)
+	@echo Rebuilding depend.mak...
+	$(MAKEDEP) -I. $(INCPATH) -X$(SRC)/emu -X$(SRC)/osd/... -X$(OBJ)/... src/mame > depend_mame.mak
+	$(MAKEDEP) -I. $(INCPATH) -X$(SRC)/emu -X$(SRC)/osd/... -X$(OBJ)/... src/mess > depend_mess.mak
+	@echo -include depend_mame.mak > depend_ume.mak
+	@echo -include depend_mess.mak >> depend_ume.mak