diff --git a/distrib/cdrom/4.0.conf b/distrib/cdrom/4.0.conf
index ac49260d4e09..f53a29767c9c 100644
--- a/distrib/cdrom/4.0.conf
+++ b/distrib/cdrom/4.0.conf
@@ -1,4 +1,4 @@
-# $NetBSD: 4.0.conf,v 1.3 2007/03/07 21:59:15 bouyer Exp $
+# $NetBSD: 4.0.conf,v 1.4 2007/03/10 22:11:12 bouyer Exp $
 #
 # Makefile fragment for CD sets; includes config information.
 
@@ -150,13 +150,13 @@ PREPARER=		NetBSD CD Build System
 # * sgimips must be on a disc on its own
 #
 
-BASE_PORTS.multi-cd1-${ISO_RELEASE}=	i386 macppc sparc sparc64
+BASE_PORTS.multi-cd1-${ISO_RELEASE}= amd64 sparc sparc64 macppc
 
 BASE_PORTS.multi-cd2-${ISO_RELEASE} = alpha \
-		amiga atari mac68k next68k sun3 
+		amiga atari mac68k next68k sun3
 
-BASE_PORTS.multi-cd3-${ISO_RELEASE}= amd64 \
-		cobalt hpcmips pmax vax
+BASE_PORTS.multi-cd3-${ISO_RELEASE}= i386 \
+		cobalt hpcmips pmax # vax
 
 BASE_PORTS.acorn26cd-${ISO_RELEASE}=acorn26
 BASE_PORTS.acorn32cd-${ISO_RELEASE}=acorn32
diff --git a/distrib/cdrom/NetBSD-4.0.mk b/distrib/cdrom/NetBSD-4.0.mk
index 3f53ada5676c..93427d832d69 100644
--- a/distrib/cdrom/NetBSD-4.0.mk
+++ b/distrib/cdrom/NetBSD-4.0.mk
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD-4.0.mk,v 1.2 2006/09/17 03:56:03 tsutsui Exp $
+# $NetBSD: NetBSD-4.0.mk,v 1.3 2007/03/10 22:11:12 bouyer Exp $
 #
 # Configuration file for the NetBSD-4.0 binary release.
 
@@ -16,14 +16,20 @@ INTFILES.cats=		netbsd.cats:cats/binary/kernel/netbsd.aout-INSTALL.gz
 
 # BOOTFILE.i386 is relative to CD staging root
 BOOTFILE.i386=		boot.i386
-INTFILES.i386=		boot.i386:i386/installation/floppy/boot-big.fs,link
+INTFILES.i386=		boot.i386:i386/binary/sets/base.tgz,./usr/mdec/bootxx_cd9660 \
+			boot:i386/binary/sets/base.tgz,./usr/mdec/boot \
+			netbsd:i386/binary/kernel/netbsd-INSTALL_LARGE.gz,link \
+			nblaptop:i386/binary/kernel/netbsd-INSTALL_LAPTOP.gz,link \
+			nbnoacpi:i386/binary/kernel/netbsd-INSTALL.gz,link
 
 # BOOTFILE.amd64 is relative to CD staging root
 BOOTFILE.amd64=		boot.amd64
-INTFILES.amd64=		boot.amd64:amd64/installation/floppy/boot-big.fs,link
+INTFILES.amd64=		boot.amd64:amd64/binary/sets/base.tgz,./usr/mdec/bootxx_cd9660 \
+			boot:amd64/binary/sets/base.tgz,./usr/mdec/boot \
+			netbsd:amd64/binary/kernel/netbsd-INSTALL.gz,link
 
 # macppc has external bootblock generation tool
-EXTFILES.macppc=	macppc.bootxx:macppc/binary/sets/base.tgz,./usr/mdec/booxx \
+EXTFILES.macppc=	macppc.bootxx:macppc/binary/sets/base.tgz,./usr/mdec/bootxx \
 			macppc.ofwboot:macppc/binary/sets/base.tgz,./usr/mdec/ofwboot
 INTFILES.macppc=	ofwboot.xcf:macppc/installation/ofwboot.xcf,link \
 			ofwboot:macppc/binary/sets/base.tgz,./usr/mdec/ofwboot \