diff --git a/distrib/i386/floppies/bootfloppy-common/Makefile.inc b/distrib/i386/floppies/bootfloppy-common/Makefile.inc
index 963251ae2a60..ce847eb0a9c3 100644
--- a/distrib/i386/floppies/bootfloppy-common/Makefile.inc
+++ b/distrib/i386/floppies/bootfloppy-common/Makefile.inc
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.1 1997/06/14 18:56:04 perry Exp $
+#	$NetBSD: Makefile.inc,v 1.2 1997/06/21 21:30:49 christos Exp $
 
 # TOP is assumed to be defined by Makefile including this one.
 
@@ -13,7 +13,10 @@ KERN?=		netbsd-xxx
 MDEC=		${DESTDIR}/usr/mdec
 
 LISTS=		${COMMONDIR}/list
-RAMDISK?=	${.CURDIR}/../ramdisk/ramdisk-${REV}.fs
+RAMDISK	!=cd $(.CURDIR)/../ramdisk/; \
+        printf "xxx: .MAKE\n\t@echo \$${.OBJDIR}/ramdisk-${REV}.fs\n" | \
+	${MAKE} -s -f-
+
 
 CLEANFILES+=	netbsd.ram.gz
 
diff --git a/distrib/i386/floppies/bootfloppy-common/list b/distrib/i386/floppies/bootfloppy-common/list
index c4003c68d65a..d772181e5ec8 100644
--- a/distrib/i386/floppies/bootfloppy-common/list
+++ b/distrib/i386/floppies/bootfloppy-common/list
@@ -1,4 +1,4 @@
-#	$NetBSD: list,v 1.1 1997/06/14 18:56:04 perry Exp $
+#	$NetBSD: list,v 1.2 1997/06/21 21:30:52 christos Exp $
 
 # copy the kernel
-COPY	${CURDIR}/netbsd.ram.gz	netbsd.gz
+COPY	${OBJDIR}/netbsd.ram.gz	netbsd.gz
diff --git a/distrib/i386/floppies/ramdisk/Makefile b/distrib/i386/floppies/ramdisk/Makefile
index 2b90c9228d00..832376c842d7 100644
--- a/distrib/i386/floppies/ramdisk/Makefile
+++ b/distrib/i386/floppies/ramdisk/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 1997/06/14 18:56:05 perry Exp $
+#	$NetBSD: Makefile,v 1.2 1997/06/21 21:31:11 christos Exp $
 
 TOP=		${.CURDIR}/..
 
@@ -36,9 +36,9 @@ all: ${AUXTARGETS} ${CBIN}
 	vnconfig -v -c ${VND_DEV} ${IMAGE}
 	newfs -m 0 -o space -i 5120 -c 80 ${VND_RDEV} floppy3
 	mount ${VND_DEV} ${MOUNT_POINT}
-	mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u
+	mtree -def ${.CURDIR}/${MTREE} -p ${MOUNT_POINT}/ -u
 	TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \
-	    TARGDIR=${MOUNT_POINT} sh ${TOP}/runlist.sh ${LISTS}
+	    TARGDIR=${MOUNT_POINT} sh ${TOP}/runlist.sh ${.CURDIR}/${LISTS}
 	@echo ""
 	@df -i ${MOUNT_POINT}
 	@echo ""
@@ -53,7 +53,7 @@ unconfig:
 	cat /*bin/* > /dev/null
 
 ${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF}
-	crunchgen -D ${TOP}/../../.. -L ${DESTDIR}/usr/lib ${CRUNCHCONF}
+	crunchgen -D ${TOP}/../../.. -L ${DESTDIR}/usr/lib ${.ALLSRC}
 
 ${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c
 	make -f ${CBIN}.mk all
diff --git a/distrib/i386/floppies/ramdisk/list b/distrib/i386/floppies/ramdisk/list
index 9fc1d2090fcd..b927444fb170 100644
--- a/distrib/i386/floppies/ramdisk/list
+++ b/distrib/i386/floppies/ramdisk/list
@@ -1,4 +1,4 @@
-#	$NetBSD: list,v 1.2 1997/06/15 23:16:33 perry Exp $
+#	$NetBSD: list,v 1.3 1997/06/21 21:31:12 christos Exp $
 
 # copy the crunched binary, link to it, and kill it
 COPY	${OBJDIR}/ramdiskbin		ramdiskbin
@@ -82,9 +82,9 @@ COPY	disktab.preinstall		etc/disktab.preinstall
 # and the installation tools
 COPY	dot.profile			.profile
 COPY	dot.instutils			.instutils
-COPY	install.sh			install
-COPY	upgrade.sh			upgrade
-COPY	start.sh			start
+COPY	${OBJDIR}/install.sh		install
+COPY	${OBJDIR}/upgrade.sh		upgrade
+COPY	${OBJDIR}/start.sh		start
 COPY	dot.hdprofile			tmp/.hdprofile
 SPECIAL	chmod 755 install
 SPECIAL	chmod 755 upgrade