diff --git a/drivers/memory/Makefile b/drivers/memory/Makefile
index 78efeff19..fa9089452 100644
--- a/drivers/memory/Makefile
+++ b/drivers/memory/Makefile
@@ -15,4 +15,6 @@ INSTALLFLAGS+=	-S 8k
 CPPFLAGS.memory.c+=	-I${MINIXSRCDIR}
 CPPFLAGS.imgrd.c+=	-I${.CURDIR}/../ramdisk -T /usr/tmp
 
+imgrd.o: ${.CURDIR}/../ramdisk/image.c
+
 .include <bsd.prog.mk>
diff --git a/tools/Makefile b/tools/Makefile
index ff40cc5d9..982bdc441 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -49,9 +49,6 @@ image_mb: includes
 	installboot -image $@ $(PROGRAMS)
 	
 image:  includes services
-	cd ../kernel && $(MAKE)
-	cd ../servers && $(MAKE) all
-	cd ../drivers && $(MAKE) all
 	padtext ../kernel/kernel kernel
 	installboot -image $@ $(PROGRAMS)
 
@@ -62,9 +59,15 @@ includes:
 depend: includes
 	$(MAKE) -C ../ depend
 
-services: includes 
+services: includes kernel servers .WAIT drivers
+
+kernel: includes
 	$(MAKE) -C ../kernel 
+
+servers: includes
 	$(MAKE) -C ../servers all install
+
+drivers: includes servers
 	$(MAKE) -C ../drivers all install
 
 libraries: includes