diff --git a/distrib/acorn32/cdroms/installcd/Makefile b/distrib/acorn32/cdroms/installcd/Makefile
index 0ded8dc55f3a..39fd9a721409 100644
--- a/distrib/acorn32/cdroms/installcd/Makefile
+++ b/distrib/acorn32/cdroms/installcd/Makefile
@@ -1,5 +1,6 @@
-#	$NetBSD: Makefile,v 1.2 2007/10/01 17:28:56 bouyer Exp $
+#	$NetBSD: Makefile,v 1.3 2018/09/28 15:05:19 martin Exp $
 CDBASE=		acorn32cd		# gives ${CDBASE}.iso
 CDRELEASE=	true			# include $RELEASEDIR/$MACHINE
+CDRELEASE_NODEBUG=	true
 
 .include "${.CURDIR}/../../../common/Makefile.bootcd"
diff --git a/distrib/alpha/cdroms/installcd/Makefile b/distrib/alpha/cdroms/installcd/Makefile
index 215c196c8b41..40c7c9d42ff7 100644
--- a/distrib/alpha/cdroms/installcd/Makefile
+++ b/distrib/alpha/cdroms/installcd/Makefile
@@ -1,8 +1,9 @@
-#	$NetBSD: Makefile,v 1.2 2012/01/15 22:34:33 jmcneill Exp $
+#	$NetBSD: Makefile,v 1.3 2018/09/28 15:05:19 martin Exp $
 CDBASE=		alphacd		# gives ${CDBASE}.iso
 CDINSTKERNEL=	../../instkernel/instkernel
 CDKERNELS=	netbsd netbsd
 CDRELEASE=	true			# include $RELEASEDIR/$MACHINE
+CDRELEASE_NODEBUG=	true
 
 #make the CD bootable
 image_md_post:
diff --git a/distrib/amd64/cdroms/installcd/Makefile b/distrib/amd64/cdroms/installcd/Makefile
index 67868c74536b..f365e1d96a57 100644
--- a/distrib/amd64/cdroms/installcd/Makefile
+++ b/distrib/amd64/cdroms/installcd/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.4 2011/01/18 00:16:13 jym Exp $
+#	$NetBSD: Makefile,v 1.5 2018/09/28 15:05:20 martin Exp $
 #
 
 # Install CD, to be made after 'build.sh release'
@@ -9,6 +9,7 @@
 
 CDBASE=		amd64cd			# gives ${CDBASE}.iso
 CDRELEASE=	true			# include $RELEASEDIR/$MACHINE
+CDRELEASE_NODEBUG=	true
 CDBUILDEXTRA=	boot.cfg		# Add boot.cfg file
 CLEANFILES+=	boot.cfg
 
diff --git a/distrib/amiga/cdroms/installcd/Makefile b/distrib/amiga/cdroms/installcd/Makefile
index bdbf5642dbe3..927e447dbcad 100644
--- a/distrib/amiga/cdroms/installcd/Makefile
+++ b/distrib/amiga/cdroms/installcd/Makefile
@@ -1,5 +1,6 @@
-#	$NetBSD: Makefile,v 1.1 2007/03/06 21:56:50 bouyer Exp $
+#	$NetBSD: Makefile,v 1.2 2018/09/28 15:05:20 martin Exp $
 CDBASE=		amigacd			# gives ${CDBASE}.iso
 CDRELEASE=	true			# include $RELEASEDIR/$MACHINE
+CDRELEASE_NODEBUG=	true
 
 .include "${.CURDIR}/../../../common/Makefile.bootcd"
diff --git a/distrib/arc/cdroms/installcd/Makefile b/distrib/arc/cdroms/installcd/Makefile
index ca07821e1349..3e8464bbcfb5 100644
--- a/distrib/arc/cdroms/installcd/Makefile
+++ b/distrib/arc/cdroms/installcd/Makefile
@@ -1,6 +1,7 @@
-#	$NetBSD: Makefile,v 1.3 2008/05/03 05:07:27 tsutsui Exp $
+#	$NetBSD: Makefile,v 1.4 2018/09/28 15:05:20 martin Exp $
 CDBASE=		arccd			# gives ${CDBASE}.iso
 CDRELEASE=	true			# include $RELEASEDIR/$MACHINE
+CDRELEASE_NODEBUG=	true
 CDKERNELS=	netbsd-RAMDISK.gz netbsd
 CDINSTKERNEL=	../../instkernel
 CDBUILDEXTRA=	${DESTDIR}/usr/mdec/boot
diff --git a/distrib/atari/cdroms/installcd/Makefile b/distrib/atari/cdroms/installcd/Makefile
index 41165d523000..4496be4b9b36 100644
--- a/distrib/atari/cdroms/installcd/Makefile
+++ b/distrib/atari/cdroms/installcd/Makefile
@@ -1,5 +1,6 @@
-#	$NetBSD: Makefile,v 1.1 2007/03/06 21:56:55 bouyer Exp $
+#	$NetBSD: Makefile,v 1.2 2018/09/28 15:05:20 martin Exp $
 CDBASE=		ataricd			# gives ${CDBASE}.iso
 CDRELEASE=	true			# include $RELEASEDIR/$MACHINE
+CDRELEASE_NODEBUG=	true
 
 .include "${.CURDIR}/../../../common/Makefile.bootcd"
diff --git a/distrib/cats/cdroms/installcd/Makefile b/distrib/cats/cdroms/installcd/Makefile
index 0bdff7aa5c31..478b799b125b 100644
--- a/distrib/cats/cdroms/installcd/Makefile
+++ b/distrib/cats/cdroms/installcd/Makefile
@@ -1,6 +1,7 @@
-#	$NetBSD: Makefile,v 1.2 2010/10/05 14:16:19 tsutsui Exp $
+#	$NetBSD: Makefile,v 1.3 2018/09/28 15:05:20 martin Exp $
 CDBASE=		catscd			# gives ${CDBASE}.iso
 CDRELEASE=	true			# include $RELEASEDIR/$MACHINE
+CDRELEASE_NODEBUG=	true
 CDKERNELS=	netbsd-INSTALL.aout netbsd
 CDINSTKERNEL=	../../instkernel
 
diff --git a/distrib/cobalt/cdroms/installcd/Makefile b/distrib/cobalt/cdroms/installcd/Makefile
index 3a0928984908..931bb56e95b9 100644
--- a/distrib/cobalt/cdroms/installcd/Makefile
+++ b/distrib/cobalt/cdroms/installcd/Makefile
@@ -1,5 +1,6 @@
-#	$NetBSD: Makefile,v 1.1 2008/02/02 14:06:48 tsutsui Exp $
+#	$NetBSD: Makefile,v 1.2 2018/09/28 15:05:20 martin Exp $
 CDBASE=		cobaltcd		# gives ${CDBASE}.iso
 CDRELEASE=	true			# include $RELEASEDIR/$MACHINE
+CDRELEASE_NODEBUG=	true
 
 .include "${.CURDIR}/../../../common/Makefile.bootcd"
diff --git a/distrib/dreamcast/cdroms/installcd/Makefile b/distrib/dreamcast/cdroms/installcd/Makefile
index 33c6323e88b3..ea71df7ecb7d 100644
--- a/distrib/dreamcast/cdroms/installcd/Makefile
+++ b/distrib/dreamcast/cdroms/installcd/Makefile
@@ -1,5 +1,6 @@
-#	$NetBSD: Makefile,v 1.1 2007/03/06 21:56:56 bouyer Exp $
+#	$NetBSD: Makefile,v 1.2 2018/09/28 15:05:20 martin Exp $
 CDBASE=		dreamcastcd		# gives ${CDBASE}.iso
 CDRELEASE=	true			# include $RELEASEDIR/$MACHINE
+CDRELEASE_NODEBUG=	true
 
 .include "${.CURDIR}/../../../common/Makefile.bootcd"
diff --git a/distrib/emips/cdroms/installcd/Makefile b/distrib/emips/cdroms/installcd/Makefile
index d231891a92d0..d23635a4b6b9 100644
--- a/distrib/emips/cdroms/installcd/Makefile
+++ b/distrib/emips/cdroms/installcd/Makefile
@@ -1,6 +1,7 @@
-#	$NetBSD: Makefile,v 1.2 2012/01/15 22:34:33 jmcneill Exp $
+#	$NetBSD: Makefile,v 1.3 2018/09/28 15:05:20 martin Exp $
 CDBASE=		emipscd			# gives ${CDBASE}.iso
 CDRELEASE=	true			# include $RELEASEDIR/$MACHINE
+CDRELEASE_NODEBUG=	true
 CDKERNELS=	netbsd-INSTALL.gz netbsd
 CDINSTKERNEL=	../../instkernel
 
diff --git a/distrib/evbarm/cdroms/installcd/Makefile b/distrib/evbarm/cdroms/installcd/Makefile
index 1c500f7d4552..72fd3476e9d1 100644
--- a/distrib/evbarm/cdroms/installcd/Makefile
+++ b/distrib/evbarm/cdroms/installcd/Makefile
@@ -1,6 +1,7 @@
-#	$NetBSD: Makefile,v 1.2 2012/02/23 11:03:53 nonaka Exp $
+#	$NetBSD: Makefile,v 1.3 2018/09/28 15:05:20 martin Exp $
 
 CDBASE=		evbarm-${MACHINE_ARCH}cd	# gives ${CDBASE}.iso
 CDRELEASE=	true				# include $RELEASEDIR/$MACHINE
+CDRELEASE_NODEBUG=	true
 
 .include "${.CURDIR}/../../../common/Makefile.bootcd"
diff --git a/distrib/evbmips/cdroms/installcd/Makefile b/distrib/evbmips/cdroms/installcd/Makefile
index 8c1e8049b1c5..24df14434f26 100644
--- a/distrib/evbmips/cdroms/installcd/Makefile
+++ b/distrib/evbmips/cdroms/installcd/Makefile
@@ -1,5 +1,6 @@
-#	$NetBSD: Makefile,v 1.1 2007/03/06 21:56:59 bouyer Exp $
+#	$NetBSD: Makefile,v 1.2 2018/09/28 15:05:20 martin Exp $
 CDBASE=		evbmips-${MACHINE_ARCH}cd # gives ${CDBASE}.iso
 CDRELEASE=	true			# include $RELEASEDIR/$MACHINE
+CDRELEASE_NODEBUG=	true
 
 .include "${.CURDIR}/../../../common/Makefile.bootcd"
diff --git a/distrib/evbppc/cdroms/installcd/Makefile b/distrib/evbppc/cdroms/installcd/Makefile
index 8422c6c5b66b..97c70437d53d 100644
--- a/distrib/evbppc/cdroms/installcd/Makefile
+++ b/distrib/evbppc/cdroms/installcd/Makefile
@@ -1,5 +1,6 @@
-#	$NetBSD: Makefile,v 1.1 2007/03/06 21:57:00 bouyer Exp $
+#	$NetBSD: Makefile,v 1.2 2018/09/28 15:05:20 martin Exp $
 CDBASE=		evbppccd		# gives ${CDBASE}.iso
 CDRELEASE=	true			# include $RELEASEDIR/$MACHINE
+CDRELEASE_NODEBUG=	true
 
 .include "${.CURDIR}/../../../common/Makefile.bootcd"
diff --git a/distrib/evbsh3/cdroms/installcd/Makefile b/distrib/evbsh3/cdroms/installcd/Makefile
index 7220376f14aa..a9ff01a7164f 100644
--- a/distrib/evbsh3/cdroms/installcd/Makefile
+++ b/distrib/evbsh3/cdroms/installcd/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1 2011/06/18 06:25:43 nonaka Exp $
+# $NetBSD: Makefile,v 1.2 2018/09/28 15:05:20 martin Exp $
 
 CDBASE=		evbsh3-${MACHINE_ARCH}cd	# gives ${CDBASE}.iso
 CDRELEASE=	true				# include $RELEASEDIR/$MACHINE
+CDRELEASE_NODEBUG=	true
 
 .include "${.CURDIR}/../../../common/Makefile.bootcd"
diff --git a/distrib/ews4800mips/cdroms/installcd/Makefile b/distrib/ews4800mips/cdroms/installcd/Makefile
index 4f16454615e5..f59f3e8b88ad 100644
--- a/distrib/ews4800mips/cdroms/installcd/Makefile
+++ b/distrib/ews4800mips/cdroms/installcd/Makefile
@@ -1,5 +1,6 @@
-#	$NetBSD: Makefile,v 1.1 2007/03/06 21:57:01 bouyer Exp $
+#	$NetBSD: Makefile,v 1.2 2018/09/28 15:05:21 martin Exp $
 CDBASE=		ews4800mipscd		# gives ${CDBASE}.iso
 CDRELEASE=	true			# include $RELEASEDIR/$MACHINE
+CDRELEASE_NODEBUG=	true
 
 .include "${.CURDIR}/../../../common/Makefile.bootcd"
diff --git a/distrib/hp300/cdroms/installcd/Makefile b/distrib/hp300/cdroms/installcd/Makefile
index 94e963c99d3f..36c942a2e49c 100644
--- a/distrib/hp300/cdroms/installcd/Makefile
+++ b/distrib/hp300/cdroms/installcd/Makefile
@@ -1,5 +1,6 @@
-#	$NetBSD: Makefile,v 1.1 2007/03/06 21:57:01 bouyer Exp $
+#	$NetBSD: Makefile,v 1.2 2018/09/28 15:05:21 martin Exp $
 CDBASE=		hp300cd			# gives ${CDBASE}.iso
 CDRELEASE=	true			# include $RELEASEDIR/$MACHINE
+CDRELEASE_NODEBUG=	true
 
 .include "${.CURDIR}/../../../common/Makefile.bootcd"
diff --git a/distrib/hpcarm/cdroms/installcd/Makefile b/distrib/hpcarm/cdroms/installcd/Makefile
index 56a3098c846e..ca6006df3ac5 100644
--- a/distrib/hpcarm/cdroms/installcd/Makefile
+++ b/distrib/hpcarm/cdroms/installcd/Makefile
@@ -1,5 +1,6 @@
-#	$NetBSD: Makefile,v 1.1 2007/03/06 21:57:03 bouyer Exp $
+#	$NetBSD: Makefile,v 1.2 2018/09/28 15:05:21 martin Exp $
 CDBASE=		hpcarmcd		# gives ${CDBASE}.iso
 CDRELEASE=	true			# include $RELEASEDIR/$MACHINE
+CDRELEASE_NODEBUG=	true
 
 .include "${.CURDIR}/../../../common/Makefile.bootcd"
diff --git a/distrib/hpcmips/cdroms/installcd/Makefile b/distrib/hpcmips/cdroms/installcd/Makefile
index cc19be831a19..a45c5b19e929 100644
--- a/distrib/hpcmips/cdroms/installcd/Makefile
+++ b/distrib/hpcmips/cdroms/installcd/Makefile
@@ -1,5 +1,6 @@
-#	$NetBSD: Makefile,v 1.1 2007/03/06 21:57:04 bouyer Exp $
+#	$NetBSD: Makefile,v 1.2 2018/09/28 15:05:21 martin Exp $
 CDBASE=		hpcmipscd		# gives ${CDBASE}.iso
 CDRELEASE=	true			# include $RELEASEDIR/$MACHINE
+CDRELEASE_NODEBUG=	true
 
 .include "${.CURDIR}/../../../common/Makefile.bootcd"
diff --git a/distrib/hpcsh/cdroms/installcd/Makefile b/distrib/hpcsh/cdroms/installcd/Makefile
index 7a9d5fa1a381..52c74a543408 100644
--- a/distrib/hpcsh/cdroms/installcd/Makefile
+++ b/distrib/hpcsh/cdroms/installcd/Makefile
@@ -1,5 +1,6 @@
-#	$NetBSD: Makefile,v 1.1 2007/03/06 21:57:05 bouyer Exp $
+#	$NetBSD: Makefile,v 1.2 2018/09/28 15:05:21 martin Exp $
 CDBASE=		hpcshcd			# gives ${CDBASE}.iso
 CDRELEASE=	true			# include $RELEASEDIR/$MACHINE
+CDRELEASE_NODEBUG=	true
 
 .include "${.CURDIR}/../../../common/Makefile.bootcd"
diff --git a/distrib/hppa/cdroms/installcd/Makefile b/distrib/hppa/cdroms/installcd/Makefile
index ea21f4a1c67b..8651ec49de10 100644
--- a/distrib/hppa/cdroms/installcd/Makefile
+++ b/distrib/hppa/cdroms/installcd/Makefile
@@ -1,8 +1,9 @@
-#	$NetBSD: Makefile,v 1.1 2014/02/24 07:23:38 skrll Exp $
+#	$NetBSD: Makefile,v 1.2 2018/09/28 15:05:21 martin Exp $
 
 .include "${.CURDIR}/../Makefile.cdrom"
 
 CDBASE=		hppacd			# gives ${CDBASE}.iso
 CDRELEASE=	true			# include $RELEASEDIR/$MACHINE
+CDRELEASE_NODEBUG=	true
 
 .include "${.CURDIR}/../../../common/Makefile.bootcd"
diff --git a/distrib/i386/cdroms/installcd/Makefile b/distrib/i386/cdroms/installcd/Makefile
index 5fef92eee9f6..e8ae32c6743c 100644
--- a/distrib/i386/cdroms/installcd/Makefile
+++ b/distrib/i386/cdroms/installcd/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.8 2008/12/02 10:48:21 ad Exp $
+#	$NetBSD: Makefile,v 1.9 2018/09/28 15:05:21 martin Exp $
 #
 
 # Install CD, to be made after 'build.sh release'
@@ -9,6 +9,7 @@
 
 CDBASE=		i386cd			# gives ${CDBASE}.iso
 CDRELEASE=	true                    # include $RELEASEDIR/$MACHINE
+CDRELEASE_NODEBUG=	true
 CDBUILDEXTRA+=	boot.cfg		# Add boot.cfg file
 CLEANFILES+=	boot.cfg
 
diff --git a/distrib/ia64/cdroms/installcd/Makefile b/distrib/ia64/cdroms/installcd/Makefile
index 5e0a3985ef24..146f778826ce 100644
--- a/distrib/ia64/cdroms/installcd/Makefile
+++ b/distrib/ia64/cdroms/installcd/Makefile
@@ -1,8 +1,9 @@
-#	$NetBSD: Makefile,v 1.2 2017/01/09 13:36:22 christos Exp $
+#	$NetBSD: Makefile,v 1.3 2018/09/28 15:05:21 martin Exp $
 CDBASE=		ia64cd		# gives ${CDBASE}.iso
 #CDINSTKERNEL=	../../instkernel/instkernel
 CDKERNELS=	netbsd netbsd
 CDRELEASE=	true			# include $RELEASEDIR/$MACHINE
+CDRELEASE_NODEBUG=	true
 
 # don't make the CD bootable, there is no installboot support for ia64
 # image_md_post:
diff --git a/distrib/ibmnws/cdroms/installcd/Makefile b/distrib/ibmnws/cdroms/installcd/Makefile
index fe491809ec58..e3a4e6899d10 100644
--- a/distrib/ibmnws/cdroms/installcd/Makefile
+++ b/distrib/ibmnws/cdroms/installcd/Makefile
@@ -1,5 +1,6 @@
-#	$NetBSD: Makefile,v 1.1 2007/03/06 21:57:06 bouyer Exp $
+#	$NetBSD: Makefile,v 1.2 2018/09/28 15:05:21 martin Exp $
 CDBASE=		ibmnwscd		# gives ${CDBASE}.iso
 CDRELEASE=	true			# include $RELEASEDIR/$MACHINE
+CDRELEASE_NODEBUG=	true
 
 .include "${.CURDIR}/../../../common/Makefile.bootcd"
diff --git a/distrib/luna68k/cdroms/installcd/Makefile b/distrib/luna68k/cdroms/installcd/Makefile
index 02375678d0d7..301da71b77df 100644
--- a/distrib/luna68k/cdroms/installcd/Makefile
+++ b/distrib/luna68k/cdroms/installcd/Makefile
@@ -1,5 +1,6 @@
-#	$NetBSD: Makefile,v 1.1 2011/07/16 15:52:21 tsutsui Exp $
+#	$NetBSD: Makefile,v 1.2 2018/09/28 15:05:21 martin Exp $
 CDBASE=		luna68kcd		# gives ${CDBASE}.iso
 CDRELEASE=	true			# include $RELEASEDIR/$MACHINE
+CDRELEASE_NODEBUG=	true
 
 .include "${.CURDIR}/../../../common/Makefile.bootcd"
diff --git a/distrib/macppc/cdroms/installcd/Makefile b/distrib/macppc/cdroms/installcd/Makefile
index 2244a8da5f60..addd8080e581 100644
--- a/distrib/macppc/cdroms/installcd/Makefile
+++ b/distrib/macppc/cdroms/installcd/Makefile
@@ -1,6 +1,7 @@
-#	$NetBSD: Makefile,v 1.2 2010/05/04 14:09:11 tsutsui Exp $
+#	$NetBSD: Makefile,v 1.3 2018/09/28 15:05:21 martin Exp $
 CDBASE=		macppccd		# gives ${CDBASE}.iso
 CDRELEASE=	true			# include $RELEASEDIR/$MACHINE
+CDRELEASE_NODEBUG=	true
 CDKERNELS=	netbsd-INSTALL.gz netbsd
 CDINSTKERNEL=	../../floppies/md-kernel
 CDBUILDEXTRA=	${DESTDIR}/usr/mdec/ofwboot.xcf
diff --git a/distrib/mipsco/cdroms/installcd/Makefile b/distrib/mipsco/cdroms/installcd/Makefile
index e6c5779af454..b41547faa0f8 100644
--- a/distrib/mipsco/cdroms/installcd/Makefile
+++ b/distrib/mipsco/cdroms/installcd/Makefile
@@ -1,5 +1,6 @@
-#	$NetBSD: Makefile,v 1.1 2007/03/06 21:57:07 bouyer Exp $
+#	$NetBSD: Makefile,v 1.2 2018/09/28 15:05:22 martin Exp $
 CDBASE=		mipscocd		# gives ${CDBASE}.iso
 CDRELEASE=	true			# include $RELEASEDIR/$MACHINE
+CDRELEASE_NODEBUG=	true
 
 .include "${.CURDIR}/../../../common/Makefile.bootcd"
diff --git a/distrib/mvme68k/cdroms/installcd/Makefile b/distrib/mvme68k/cdroms/installcd/Makefile
index d2e886070a75..b7ccc78cd612 100644
--- a/distrib/mvme68k/cdroms/installcd/Makefile
+++ b/distrib/mvme68k/cdroms/installcd/Makefile
@@ -1,5 +1,6 @@
-#	$NetBSD: Makefile,v 1.1 2007/03/06 21:57:10 bouyer Exp $
+#	$NetBSD: Makefile,v 1.2 2018/09/28 15:05:22 martin Exp $
 CDBASE=		mvme68kcd		# gives ${CDBASE}.iso
 CDRELEASE=	true			# include $RELEASEDIR/$MACHINE
+CDRELEASE_NODEBUG=	true
 
 .include "${.CURDIR}/../../../common/Makefile.bootcd"
diff --git a/distrib/mvmeppc/cdroms/installcd/Makefile b/distrib/mvmeppc/cdroms/installcd/Makefile
index 2ff8f3d359a9..50fbf3a0eb1f 100644
--- a/distrib/mvmeppc/cdroms/installcd/Makefile
+++ b/distrib/mvmeppc/cdroms/installcd/Makefile
@@ -1,5 +1,6 @@
-#	$NetBSD: Makefile,v 1.1 2007/03/06 21:57:11 bouyer Exp $
+#	$NetBSD: Makefile,v 1.2 2018/09/28 15:05:22 martin Exp $
 CDBASE=		mvmeppccd		# gives ${CDBASE}.iso
 CDRELEASE=	true			# include $RELEASEDIR/$MACHINE
+CDRELEASE_NODEBUG=	true
 
 .include "${.CURDIR}/../../../common/Makefile.bootcd"
diff --git a/distrib/news68k/cdroms/installcd/Makefile b/distrib/news68k/cdroms/installcd/Makefile
index 6e3c1889e2ec..09b0aaefeece 100644
--- a/distrib/news68k/cdroms/installcd/Makefile
+++ b/distrib/news68k/cdroms/installcd/Makefile
@@ -1,5 +1,6 @@
-#	$NetBSD: Makefile,v 1.1 2007/03/06 21:57:11 bouyer Exp $
+#	$NetBSD: Makefile,v 1.2 2018/09/28 15:05:22 martin Exp $
 CDBASE=		news68kcd		# gives ${CDBASE}.iso
 CDRELEASE=	true			# include $RELEASEDIR/$MACHINE
+CDRELEASE_NODEBUG=	true
 
 .include "${.CURDIR}/../../../common/Makefile.bootcd"
diff --git a/distrib/newsmips/cdroms/installcd/Makefile b/distrib/newsmips/cdroms/installcd/Makefile
index efaecdd35ab2..77e36517ca5d 100644
--- a/distrib/newsmips/cdroms/installcd/Makefile
+++ b/distrib/newsmips/cdroms/installcd/Makefile
@@ -1,5 +1,6 @@
-#	$NetBSD: Makefile,v 1.1 2007/03/06 21:57:12 bouyer Exp $
+#	$NetBSD: Makefile,v 1.2 2018/09/28 15:05:22 martin Exp $
 CDBASE=		newsmipscd		# gives ${CDBASE}.iso
 CDRELEASE=	true			# include $RELEASEDIR/$MACHINE
+CDRELEASE_NODEBUG=	true
 
 .include "${.CURDIR}/../../../common/Makefile.bootcd"
diff --git a/distrib/ofppc/cdroms/installcd/Makefile b/distrib/ofppc/cdroms/installcd/Makefile
index 257388abdf71..084faf72069f 100644
--- a/distrib/ofppc/cdroms/installcd/Makefile
+++ b/distrib/ofppc/cdroms/installcd/Makefile
@@ -1,7 +1,8 @@
-#	$NetBSD: Makefile,v 1.5 2017/02/10 16:43:59 christos Exp $
+#	$NetBSD: Makefile,v 1.6 2018/09/28 15:05:22 martin Exp $
 
 CDBASE=		ofppccd		# gives ${CDBASE}.iso
 CDRELEASE=	true			# include $RELEASEDIR/$MACHINE
+CDRELEASE_NODEBUG=	true
 CDKERNELS+=	netbsd-INSTALL.gz netbsd
 CDINSTKERNEL=	../../instkernel
 
diff --git a/distrib/playstation2/cdroms/installcd/Makefile b/distrib/playstation2/cdroms/installcd/Makefile
index 595a45ca9de8..9ff503c76865 100644
--- a/distrib/playstation2/cdroms/installcd/Makefile
+++ b/distrib/playstation2/cdroms/installcd/Makefile
@@ -1,5 +1,6 @@
-#	$NetBSD: Makefile,v 1.3 2014/03/31 11:25:47 martin Exp $
+#	$NetBSD: Makefile,v 1.4 2018/09/28 15:05:22 martin Exp $
 CDBASE=		playstation2cd		# gives ${CDBASE}.iso
 CDRELEASE=	true			# include $RELEASEDIR/$MACHINE
+CDRELEASE_NODEBUG=	true
 
 .include "${.CURDIR}/../../../common/Makefile.bootcd"
diff --git a/distrib/pmax/cdroms/installcd/Makefile b/distrib/pmax/cdroms/installcd/Makefile
index c4ec17435a9e..56dd85f6b18b 100644
--- a/distrib/pmax/cdroms/installcd/Makefile
+++ b/distrib/pmax/cdroms/installcd/Makefile
@@ -1,6 +1,7 @@
-#	$NetBSD: Makefile,v 1.3 2013/12/13 10:27:56 mrg Exp $
+#	$NetBSD: Makefile,v 1.4 2018/09/28 15:05:22 martin Exp $
 CDBASE=		pmaxcd			# gives ${CDBASE}.iso
 CDRELEASE=	true			# include $RELEASEDIR/$MACHINE
+CDRELEASE_NODEBUG=	true
 .if ${MACHINE_ARCH} == "mipsel"
 CDKERNELS=	netbsd-INSTALL.gz netbsd
 .else
diff --git a/distrib/prep/cdroms/installcd/Makefile b/distrib/prep/cdroms/installcd/Makefile
index 61cf070aec9f..e67d4d9c528e 100644
--- a/distrib/prep/cdroms/installcd/Makefile
+++ b/distrib/prep/cdroms/installcd/Makefile
@@ -1,6 +1,7 @@
-#	$NetBSD: Makefile,v 1.3 2012/01/15 22:34:33 jmcneill Exp $
+#	$NetBSD: Makefile,v 1.4 2018/09/28 15:05:22 martin Exp $
 CDBASE=		prepcd		# gives ${CDBASE}.iso
 CDRELEASE=	true		# include $RELEASEDIR/$MACHINE
+CDRELEASE_NODEBUG=	true
 CDMAKEFSOPTIONS=bootimage=powerpc;cdrom/prep/installation/floppy/sysinst_com0.fs
 
 # prep needs a fdisk partition table at the head of the cd, pointing to the
diff --git a/distrib/sandpoint/cdroms/installcd/Makefile b/distrib/sandpoint/cdroms/installcd/Makefile
index d90016c0a52f..2226a327f026 100644
--- a/distrib/sandpoint/cdroms/installcd/Makefile
+++ b/distrib/sandpoint/cdroms/installcd/Makefile
@@ -1,5 +1,6 @@
-#	$NetBSD: Makefile,v 1.1 2007/03/06 21:57:21 bouyer Exp $
+#	$NetBSD: Makefile,v 1.2 2018/09/28 15:05:22 martin Exp $
 CDBASE=		sandpointcd		# gives ${CDBASE}.iso
 CDRELEASE=	true			# include $RELEASEDIR/$MACHINE
+CDRELEASE_NODEBUG=	true
 
 .include "${.CURDIR}/../../../common/Makefile.bootcd"
diff --git a/distrib/sgimips/cdroms/installcd/Makefile b/distrib/sgimips/cdroms/installcd/Makefile
index 771d7206575b..bdc48197a802 100644
--- a/distrib/sgimips/cdroms/installcd/Makefile
+++ b/distrib/sgimips/cdroms/installcd/Makefile
@@ -1,6 +1,7 @@
-#	$NetBSD: Makefile,v 1.2 2012/01/15 22:34:34 jmcneill Exp $
+#	$NetBSD: Makefile,v 1.3 2018/09/28 15:05:22 martin Exp $
 CDBASE=		sgimipscd		# gives ${CDBASE}.iso
 CDRELEASE=	true			# include $RELEASEDIR/$MACHINE
+CDRELEASE_NODEBUG=	true
 CDKERNELS=	netbsd-INSTALL32_IP2x.gz ip2x
 CDKERNELS+=	netbsd-INSTALL32_IP3x.gz ip3x
 CDINSTKERNEL=	../../instkernel
diff --git a/distrib/shark/cdroms/installcd/Makefile b/distrib/shark/cdroms/installcd/Makefile
index 6dd25cbaaab2..03635c78d0c4 100644
--- a/distrib/shark/cdroms/installcd/Makefile
+++ b/distrib/shark/cdroms/installcd/Makefile
@@ -1,5 +1,6 @@
-#	$NetBSD: Makefile,v 1.1 2007/03/06 21:57:22 bouyer Exp $
+#	$NetBSD: Makefile,v 1.2 2018/09/28 15:05:22 martin Exp $
 CDBASE=		sharkcd			# gives ${CDBASE}.iso
 CDRELEASE=	true			# include $RELEASEDIR/$MACHINE
+CDRELEASE_NODEBUG=	true
 
 .include "${.CURDIR}/../../../common/Makefile.bootcd"
diff --git a/distrib/sparc/cdroms/installcd/Makefile b/distrib/sparc/cdroms/installcd/Makefile
index e4e90a9bcbf6..b63807a817e7 100644
--- a/distrib/sparc/cdroms/installcd/Makefile
+++ b/distrib/sparc/cdroms/installcd/Makefile
@@ -1,6 +1,7 @@
-#	$NetBSD: Makefile,v 1.2 2012/01/15 22:34:34 jmcneill Exp $
+#	$NetBSD: Makefile,v 1.3 2018/09/28 15:05:23 martin Exp $
 CDBASE=		sparccd		# gives ${CDBASE}.iso
 CDRELEASE=	true			# include $RELEASEDIR/$MACHINE
+CDRELEASE_NODEBUG=	true
 
 # for PRINTOBJDIR
 .include <bsd.own.mk>
diff --git a/distrib/sparc64/cdroms/installcd/Makefile b/distrib/sparc64/cdroms/installcd/Makefile
index 6a559b254a6d..91754f46fcda 100644
--- a/distrib/sparc64/cdroms/installcd/Makefile
+++ b/distrib/sparc64/cdroms/installcd/Makefile
@@ -1,9 +1,10 @@
-#	$NetBSD: Makefile,v 1.29 2017/09/08 09:50:45 martin Exp $
+#	$NetBSD: Makefile,v 1.30 2018/09/28 15:05:23 martin Exp $
 
 .include <bsd.own.mk>
 
 CDBASE=		sparc64cd		# gives ${CDBASE}.iso
 CDRELEASE=	true			# include $RELEASEDIR/$MACHINE
+CDRELEASE_NODEBUG=	true
 CDKERNELS=	${RELEASEDIR}/${MACHINE}/binary/kernel/netbsd-GENERIC.gz	netbsd
 CD_SETS=	base etc
 .if ${MKKMOD} != "no"
@@ -13,7 +14,6 @@ CD_SETS+=	modules
 SYSINSTDIR!= cd ${.CURDIR}/../../../../usr.sbin/sysinst/arch/${MACHINE} && ${PRINTOBJDIR}
 
 CDRELEASE_NOISOS=	true
-CDRELEASE_NODEBUG=	true
 CDBOOTIMAGEDIR!= cd ${NETBSDSRCDIR}/distrib/sparc64/bootfs && ${PRINTOBJDIR}
 CDBOOTIMAGE=    ${CDBOOTIMAGEDIR}/boot.fs
 SUN_BOOT_ARGS:=  - - - - ${CDBOOTIMAGE}
diff --git a/distrib/sparc64/instfs/list b/distrib/sparc64/instfs/list
index 198872d72644..224992dacc0c 100644
--- a/distrib/sparc64/instfs/list
+++ b/distrib/sparc64/instfs/list
@@ -1,4 +1,4 @@
-#	$NetBSD: list,v 1.26 2013/11/30 08:19:30 nakayama Exp $
+#	$NetBSD: list,v 1.27 2018/09/28 15:05:23 martin Exp $
 
 SRCDIRS	bin sbin libexec external/bsd/less/bin usr.bin usr.sbin
 
@@ -58,6 +58,7 @@ PROG	usr/bin/gzip		usr/bin/gzcat usr/bin/gunzip
 PROG	usr/bin/less		usr/bin/more
 PROG	usr/bin/sed
 PROG	usr/bin/tip
+# PROG	usr/bin/xz
 
 PROG	libexec/lfs_cleanerd
 
@@ -75,6 +76,7 @@ SPECIAL	ifconfig	srcdir	distrib/utils/x_ifconfig
 SPECIAL	ping		srcdir	distrib/utils/x_ping
 SPECIAL	pppd		srcdir	external/bsd/ppp/usr.sbin/pppd
 SPECIAL	route		srcdir	distrib/utils/x_route
+# SPECIAL	xz		srcdir	external/public-domain/xz/bin
 
 LIBS	libhack.o
 LIBS	-ledit -lutil -lcurses -lterminfo -lrmt -lcrypt -ll -lm -lpcap -lz -lprop
diff --git a/distrib/sun2/cdroms/installcd/Makefile b/distrib/sun2/cdroms/installcd/Makefile
index c3bf25231593..50d19143b099 100644
--- a/distrib/sun2/cdroms/installcd/Makefile
+++ b/distrib/sun2/cdroms/installcd/Makefile
@@ -1,5 +1,6 @@
-#	$NetBSD: Makefile,v 1.1 2007/03/06 21:57:25 bouyer Exp $
+#	$NetBSD: Makefile,v 1.2 2018/09/28 15:05:23 martin Exp $
 CDBASE=		sun2cd			# gives ${CDBASE}.iso
 CDRELEASE=	true			# include $RELEASEDIR/$MACHINE
+CDRELEASE_NODEBUG=	true
 
 .include "${.CURDIR}/../../../common/Makefile.bootcd"
diff --git a/distrib/sun3/cdroms/installcd/Makefile b/distrib/sun3/cdroms/installcd/Makefile
index 6f265bd0943e..303ff47df83f 100644
--- a/distrib/sun3/cdroms/installcd/Makefile
+++ b/distrib/sun3/cdroms/installcd/Makefile
@@ -1,6 +1,7 @@
-#	$NetBSD: Makefile,v 1.2 2012/01/15 22:34:34 jmcneill Exp $
+#	$NetBSD: Makefile,v 1.3 2018/09/28 15:05:23 martin Exp $
 CDBASE=		sun3cd			# gives ${CDBASE}.iso
 CDRELEASE=	true			# include $RELEASEDIR/$MACHINE
+CDRELEASE_NODEBUG=	true
 
 # for PRINTOBJDIR
 .include <bsd.own.mk>
diff --git a/distrib/vax/cdroms/installcd/Makefile b/distrib/vax/cdroms/installcd/Makefile
index de5f0f034716..cd6ed9a4c942 100644
--- a/distrib/vax/cdroms/installcd/Makefile
+++ b/distrib/vax/cdroms/installcd/Makefile
@@ -1,6 +1,7 @@
-#	$NetBSD: Makefile,v 1.16 2017/02/10 16:43:59 christos Exp $
+#	$NetBSD: Makefile,v 1.17 2018/09/28 15:05:23 martin Exp $
 CDBASE=		vaxcd			# gives ${CDBASE}.iso
 CDRELEASE=	true			# include $RELEASEDIR/$MACHINE
+CDRELEASE_NODEBUG=	true
 CDKERNELS=	${RELEASEDIR}/${MACHINE}/binary/kernel/netbsd-GENERIC.gz	netbsd.gz
 CDRELEASE_NOISOS=true
 CD_SETS=	base etc	# no modules for VAX
diff --git a/distrib/x68k/cdroms/installcd/Makefile b/distrib/x68k/cdroms/installcd/Makefile
index 6e93d0c51bef..b9b093b874db 100644
--- a/distrib/x68k/cdroms/installcd/Makefile
+++ b/distrib/x68k/cdroms/installcd/Makefile
@@ -1,6 +1,7 @@
-#	$NetBSD: Makefile,v 1.3 2012/11/22 20:26:33 tsutsui Exp $
+#	$NetBSD: Makefile,v 1.4 2018/09/28 15:05:23 martin Exp $
 CDBASE=		x68kcd			# gives ${CDBASE}.iso
 CDRELEASE=	true			# include $RELEASEDIR/$MACHINE
+CDRELEASE_NODEBUG=	true
 CDINSTKERNEL=	../../floppies/instkernel
 CDKERNELS=	netbsd-INSTALL.gz	netbsd
 CDBUILDEXTRA=	${BOOT}
diff --git a/distrib/zaurus/cdroms/installcd/Makefile b/distrib/zaurus/cdroms/installcd/Makefile
index e3c418ce068c..e25cd7a5ad37 100644
--- a/distrib/zaurus/cdroms/installcd/Makefile
+++ b/distrib/zaurus/cdroms/installcd/Makefile
@@ -1,5 +1,6 @@
-#	$NetBSD: Makefile,v 1.1 2011/05/29 17:19:31 tsutsui Exp $
+#	$NetBSD: Makefile,v 1.2 2018/09/28 15:05:23 martin Exp $
 CDBASE=		zauruscd		# gives ${CDBASE}.iso
 CDRELEASE=	true			# include $RELEASEDIR/$MACHINE
+CDRELEASE_NODEBUG=	true
 
 .include "${.CURDIR}/../../../common/Makefile.bootcd"