diff --git a/distrib/acorn32/cdroms/installcd/Makefile b/distrib/acorn32/cdroms/installcd/Makefile
index 39fd9a721409..1d96b7111ce0 100644
--- a/distrib/acorn32/cdroms/installcd/Makefile
+++ b/distrib/acorn32/cdroms/installcd/Makefile
@@ -1,6 +1,6 @@
-#	$NetBSD: Makefile,v 1.3 2018/09/28 15:05:19 martin Exp $
+#	$NetBSD: Makefile,v 1.4 2019/09/23 13:42:30 christos Exp $
 CDBASE=		acorn32cd		# gives ${CDBASE}.iso
-CDRELEASE=	true			# include $RELEASEDIR/$MACHINE
+CDRELEASE=	true			# include $RELEASEDIR/$RELEASEMACHINEDIR
 CDRELEASE_NODEBUG=	true
 
 .include "${.CURDIR}/../../../common/Makefile.bootcd"
diff --git a/distrib/alpha/cdroms/installcd/Makefile b/distrib/alpha/cdroms/installcd/Makefile
index 40c7c9d42ff7..5870aa897d53 100644
--- a/distrib/alpha/cdroms/installcd/Makefile
+++ b/distrib/alpha/cdroms/installcd/Makefile
@@ -1,8 +1,8 @@
-#	$NetBSD: Makefile,v 1.3 2018/09/28 15:05:19 martin Exp $
+#	$NetBSD: Makefile,v 1.4 2019/09/23 13:42:30 christos Exp $
 CDBASE=		alphacd		# gives ${CDBASE}.iso
 CDINSTKERNEL=	../../instkernel/instkernel
 CDKERNELS=	netbsd netbsd
-CDRELEASE=	true			# include $RELEASEDIR/$MACHINE
+CDRELEASE=	true			# include $RELEASEDIR/$RELEASEMACHINEDIR
 CDRELEASE_NODEBUG=	true
 
 #make the CD bootable
diff --git a/distrib/amd64/cdroms/installcd/Makefile b/distrib/amd64/cdroms/installcd/Makefile
index f365e1d96a57..d2a236b263aa 100644
--- a/distrib/amd64/cdroms/installcd/Makefile
+++ b/distrib/amd64/cdroms/installcd/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.5 2018/09/28 15:05:20 martin Exp $
+#	$NetBSD: Makefile,v 1.6 2019/09/23 13:42:30 christos Exp $
 #
 
 # Install CD, to be made after 'build.sh release'
@@ -8,7 +8,7 @@
 .include "${.CURDIR}/../Makefile.cdrom"
 
 CDBASE=		amd64cd			# gives ${CDBASE}.iso
-CDRELEASE=	true			# include $RELEASEDIR/$MACHINE
+CDRELEASE=	true			# include $RELEASEDIR/$RELEASEMACHINEDIR
 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 927e447dbcad..41606b5d1298 100644
--- a/distrib/amiga/cdroms/installcd/Makefile
+++ b/distrib/amiga/cdroms/installcd/Makefile
@@ -1,6 +1,6 @@
-#	$NetBSD: Makefile,v 1.2 2018/09/28 15:05:20 martin Exp $
+#	$NetBSD: Makefile,v 1.3 2019/09/23 13:42:31 christos Exp $
 CDBASE=		amigacd			# gives ${CDBASE}.iso
-CDRELEASE=	true			# include $RELEASEDIR/$MACHINE
+CDRELEASE=	true			# include $RELEASEDIR/$RELEASEMACHINEDIR
 CDRELEASE_NODEBUG=	true
 
 .include "${.CURDIR}/../../../common/Makefile.bootcd"
diff --git a/distrib/arc/cdroms/installcd/Makefile b/distrib/arc/cdroms/installcd/Makefile
index 3e8464bbcfb5..8018560e913c 100644
--- a/distrib/arc/cdroms/installcd/Makefile
+++ b/distrib/arc/cdroms/installcd/Makefile
@@ -1,6 +1,6 @@
-#	$NetBSD: Makefile,v 1.4 2018/09/28 15:05:20 martin Exp $
+#	$NetBSD: Makefile,v 1.5 2019/09/23 13:42:31 christos Exp $
 CDBASE=		arccd			# gives ${CDBASE}.iso
-CDRELEASE=	true			# include $RELEASEDIR/$MACHINE
+CDRELEASE=	true			# include $RELEASEDIR/$RELEASEMACHINEDIR
 CDRELEASE_NODEBUG=	true
 CDKERNELS=	netbsd-RAMDISK.gz netbsd
 CDINSTKERNEL=	../../instkernel
diff --git a/distrib/atari/cdroms/installcd/Makefile b/distrib/atari/cdroms/installcd/Makefile
index 4496be4b9b36..d0ef95f002f4 100644
--- a/distrib/atari/cdroms/installcd/Makefile
+++ b/distrib/atari/cdroms/installcd/Makefile
@@ -1,6 +1,6 @@
-#	$NetBSD: Makefile,v 1.2 2018/09/28 15:05:20 martin Exp $
+#	$NetBSD: Makefile,v 1.3 2019/09/23 13:42:31 christos Exp $
 CDBASE=		ataricd			# gives ${CDBASE}.iso
-CDRELEASE=	true			# include $RELEASEDIR/$MACHINE
+CDRELEASE=	true			# include $RELEASEDIR/$RELEASEMACHINEDIR
 CDRELEASE_NODEBUG=	true
 
 .include "${.CURDIR}/../../../common/Makefile.bootcd"
diff --git a/distrib/cats/cdroms/installcd/Makefile b/distrib/cats/cdroms/installcd/Makefile
index 478b799b125b..d4b14351f338 100644
--- a/distrib/cats/cdroms/installcd/Makefile
+++ b/distrib/cats/cdroms/installcd/Makefile
@@ -1,6 +1,6 @@
-#	$NetBSD: Makefile,v 1.3 2018/09/28 15:05:20 martin Exp $
+#	$NetBSD: Makefile,v 1.4 2019/09/23 13:42:31 christos Exp $
 CDBASE=		catscd			# gives ${CDBASE}.iso
-CDRELEASE=	true			# include $RELEASEDIR/$MACHINE
+CDRELEASE=	true			# include $RELEASEDIR/$RELEASEMACHINEDIR
 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 931bb56e95b9..9ce73403549a 100644
--- a/distrib/cobalt/cdroms/installcd/Makefile
+++ b/distrib/cobalt/cdroms/installcd/Makefile
@@ -1,6 +1,6 @@
-#	$NetBSD: Makefile,v 1.2 2018/09/28 15:05:20 martin Exp $
+#	$NetBSD: Makefile,v 1.3 2019/09/23 13:42:31 christos Exp $
 CDBASE=		cobaltcd		# gives ${CDBASE}.iso
-CDRELEASE=	true			# include $RELEASEDIR/$MACHINE
+CDRELEASE=	true			# include $RELEASEDIR/$RELEASEMACHINEDIR
 CDRELEASE_NODEBUG=	true
 
 .include "${.CURDIR}/../../../common/Makefile.bootcd"
diff --git a/distrib/common/Makefile.bootcd b/distrib/common/Makefile.bootcd
index 2f9edee2ef16..b0e4bf25ba04 100644
--- a/distrib/common/Makefile.bootcd
+++ b/distrib/common/Makefile.bootcd
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.bootcd,v 1.41 2018/09/28 15:03:34 martin Exp $
+#	$NetBSD: Makefile.bootcd,v 1.42 2019/09/23 13:42:31 christos Exp $
 #
 # Makefile snipped to create a CD/DVD ISO
 #
@@ -12,7 +12,7 @@
 #	CDBASE		Basename of the iso
 #
 # Optional variables:
-#	CDRELEASE	Set to 'true' to include $RELEASEDIR/$MACHINE on the CD
+#	CDRELEASE	Set to 'true' to include $RELEASEDIR/$RELEASEMACHINEDIR on the CD
 #	CDRELEASE_NOISOS Excludes installation/cdrom directory if set
 #	CDRELEASE_NODEBUG	Excludes debug sets if set
 #	CDSOURCE	Set to 'true' to include $RELEASEDIR/source on the CD
diff --git a/distrib/dreamcast/cdroms/installcd/Makefile b/distrib/dreamcast/cdroms/installcd/Makefile
index ea71df7ecb7d..b37dd3f6f486 100644
--- a/distrib/dreamcast/cdroms/installcd/Makefile
+++ b/distrib/dreamcast/cdroms/installcd/Makefile
@@ -1,6 +1,6 @@
-#	$NetBSD: Makefile,v 1.2 2018/09/28 15:05:20 martin Exp $
+#	$NetBSD: Makefile,v 1.3 2019/09/23 13:42:31 christos Exp $
 CDBASE=		dreamcastcd		# gives ${CDBASE}.iso
-CDRELEASE=	true			# include $RELEASEDIR/$MACHINE
+CDRELEASE=	true			# include $RELEASEDIR/$RELEASEMACHINEDIR
 CDRELEASE_NODEBUG=	true
 
 .include "${.CURDIR}/../../../common/Makefile.bootcd"
diff --git a/distrib/emips/cdroms/installcd/Makefile b/distrib/emips/cdroms/installcd/Makefile
index d23635a4b6b9..186e178fa353 100644
--- a/distrib/emips/cdroms/installcd/Makefile
+++ b/distrib/emips/cdroms/installcd/Makefile
@@ -1,6 +1,6 @@
-#	$NetBSD: Makefile,v 1.3 2018/09/28 15:05:20 martin Exp $
+#	$NetBSD: Makefile,v 1.4 2019/09/23 13:42:31 christos Exp $
 CDBASE=		emipscd			# gives ${CDBASE}.iso
-CDRELEASE=	true			# include $RELEASEDIR/$MACHINE
+CDRELEASE=	true			# include $RELEASEDIR/$RELEASEMACHINEDIR
 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 72fd3476e9d1..118bf78299b7 100644
--- a/distrib/evbarm/cdroms/installcd/Makefile
+++ b/distrib/evbarm/cdroms/installcd/Makefile
@@ -1,7 +1,7 @@
-#	$NetBSD: Makefile,v 1.3 2018/09/28 15:05:20 martin Exp $
+#	$NetBSD: Makefile,v 1.4 2019/09/23 13:42:32 christos Exp $
 
 CDBASE=		evbarm-${MACHINE_ARCH}cd	# gives ${CDBASE}.iso
-CDRELEASE=	true				# include $RELEASEDIR/$MACHINE
+CDRELEASE=	true				# include $RELEASEDIR/$RELEASEMACHINEDIR
 CDRELEASE_NODEBUG=	true
 
 .include "${.CURDIR}/../../../common/Makefile.bootcd"
diff --git a/distrib/evbmips/cdroms/installcd/Makefile b/distrib/evbmips/cdroms/installcd/Makefile
index 24df14434f26..e016816594e1 100644
--- a/distrib/evbmips/cdroms/installcd/Makefile
+++ b/distrib/evbmips/cdroms/installcd/Makefile
@@ -1,6 +1,6 @@
-#	$NetBSD: Makefile,v 1.2 2018/09/28 15:05:20 martin Exp $
+#	$NetBSD: Makefile,v 1.3 2019/09/23 13:42:32 christos Exp $
 CDBASE=		evbmips-${MACHINE_ARCH}cd # gives ${CDBASE}.iso
-CDRELEASE=	true			# include $RELEASEDIR/$MACHINE
+CDRELEASE=	true			# include $RELEASEDIR/$RELEASEMACHINEDIR
 CDRELEASE_NODEBUG=	true
 
 .include "${.CURDIR}/../../../common/Makefile.bootcd"
diff --git a/distrib/evbppc/cdroms/installcd/Makefile b/distrib/evbppc/cdroms/installcd/Makefile
index 97c70437d53d..2e66cab5fe46 100644
--- a/distrib/evbppc/cdroms/installcd/Makefile
+++ b/distrib/evbppc/cdroms/installcd/Makefile
@@ -1,6 +1,6 @@
-#	$NetBSD: Makefile,v 1.2 2018/09/28 15:05:20 martin Exp $
+#	$NetBSD: Makefile,v 1.3 2019/09/23 13:42:32 christos Exp $
 CDBASE=		evbppccd		# gives ${CDBASE}.iso
-CDRELEASE=	true			# include $RELEASEDIR/$MACHINE
+CDRELEASE=	true			# include $RELEASEDIR/$RELEASEMACHINEDIR
 CDRELEASE_NODEBUG=	true
 
 .include "${.CURDIR}/../../../common/Makefile.bootcd"
diff --git a/distrib/evbsh3/cdroms/installcd/Makefile b/distrib/evbsh3/cdroms/installcd/Makefile
index a9ff01a7164f..a733c2e0d05e 100644
--- a/distrib/evbsh3/cdroms/installcd/Makefile
+++ b/distrib/evbsh3/cdroms/installcd/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2018/09/28 15:05:20 martin Exp $
+# $NetBSD: Makefile,v 1.3 2019/09/23 13:42:32 christos Exp $
 
 CDBASE=		evbsh3-${MACHINE_ARCH}cd	# gives ${CDBASE}.iso
-CDRELEASE=	true				# include $RELEASEDIR/$MACHINE
+CDRELEASE=	true				# include $RELEASEDIR/$RELEASEMACHINEDIR
 CDRELEASE_NODEBUG=	true
 
 .include "${.CURDIR}/../../../common/Makefile.bootcd"
diff --git a/distrib/ews4800mips/cdroms/installcd/Makefile b/distrib/ews4800mips/cdroms/installcd/Makefile
index f59f3e8b88ad..dce2fcc8e58f 100644
--- a/distrib/ews4800mips/cdroms/installcd/Makefile
+++ b/distrib/ews4800mips/cdroms/installcd/Makefile
@@ -1,6 +1,6 @@
-#	$NetBSD: Makefile,v 1.2 2018/09/28 15:05:21 martin Exp $
+#	$NetBSD: Makefile,v 1.3 2019/09/23 13:42:32 christos Exp $
 CDBASE=		ews4800mipscd		# gives ${CDBASE}.iso
-CDRELEASE=	true			# include $RELEASEDIR/$MACHINE
+CDRELEASE=	true			# include $RELEASEDIR/$RELEASEMACHINEDIR
 CDRELEASE_NODEBUG=	true
 
 .include "${.CURDIR}/../../../common/Makefile.bootcd"
diff --git a/distrib/hp300/cdroms/installcd/Makefile b/distrib/hp300/cdroms/installcd/Makefile
index 36c942a2e49c..96c9b1dfd1ec 100644
--- a/distrib/hp300/cdroms/installcd/Makefile
+++ b/distrib/hp300/cdroms/installcd/Makefile
@@ -1,6 +1,6 @@
-#	$NetBSD: Makefile,v 1.2 2018/09/28 15:05:21 martin Exp $
+#	$NetBSD: Makefile,v 1.3 2019/09/23 13:42:32 christos Exp $
 CDBASE=		hp300cd			# gives ${CDBASE}.iso
-CDRELEASE=	true			# include $RELEASEDIR/$MACHINE
+CDRELEASE=	true			# include $RELEASEDIR/$RELEASEMACHINEDIR
 CDRELEASE_NODEBUG=	true
 
 .include "${.CURDIR}/../../../common/Makefile.bootcd"
diff --git a/distrib/hpcarm/cdroms/installcd/Makefile b/distrib/hpcarm/cdroms/installcd/Makefile
index ca6006df3ac5..4e11f70beba8 100644
--- a/distrib/hpcarm/cdroms/installcd/Makefile
+++ b/distrib/hpcarm/cdroms/installcd/Makefile
@@ -1,6 +1,6 @@
-#	$NetBSD: Makefile,v 1.2 2018/09/28 15:05:21 martin Exp $
+#	$NetBSD: Makefile,v 1.3 2019/09/23 13:42:32 christos Exp $
 CDBASE=		hpcarmcd		# gives ${CDBASE}.iso
-CDRELEASE=	true			# include $RELEASEDIR/$MACHINE
+CDRELEASE=	true			# include $RELEASEDIR/$RELEASEMACHINEDIR
 CDRELEASE_NODEBUG=	true
 
 .include "${.CURDIR}/../../../common/Makefile.bootcd"
diff --git a/distrib/hpcmips/cdroms/installcd/Makefile b/distrib/hpcmips/cdroms/installcd/Makefile
index a45c5b19e929..a28da851d872 100644
--- a/distrib/hpcmips/cdroms/installcd/Makefile
+++ b/distrib/hpcmips/cdroms/installcd/Makefile
@@ -1,6 +1,6 @@
-#	$NetBSD: Makefile,v 1.2 2018/09/28 15:05:21 martin Exp $
+#	$NetBSD: Makefile,v 1.3 2019/09/23 13:42:32 christos Exp $
 CDBASE=		hpcmipscd		# gives ${CDBASE}.iso
-CDRELEASE=	true			# include $RELEASEDIR/$MACHINE
+CDRELEASE=	true			# include $RELEASEDIR/$RELEASEMACHINEDIR
 CDRELEASE_NODEBUG=	true
 
 .include "${.CURDIR}/../../../common/Makefile.bootcd"
diff --git a/distrib/hpcsh/cdroms/installcd/Makefile b/distrib/hpcsh/cdroms/installcd/Makefile
index 52c74a543408..03150e13049f 100644
--- a/distrib/hpcsh/cdroms/installcd/Makefile
+++ b/distrib/hpcsh/cdroms/installcd/Makefile
@@ -1,6 +1,6 @@
-#	$NetBSD: Makefile,v 1.2 2018/09/28 15:05:21 martin Exp $
+#	$NetBSD: Makefile,v 1.3 2019/09/23 13:42:33 christos Exp $
 CDBASE=		hpcshcd			# gives ${CDBASE}.iso
-CDRELEASE=	true			# include $RELEASEDIR/$MACHINE
+CDRELEASE=	true			# include $RELEASEDIR/$RELEASEMACHINEDIR
 CDRELEASE_NODEBUG=	true
 
 .include "${.CURDIR}/../../../common/Makefile.bootcd"
diff --git a/distrib/hppa/cdroms/installcd/Makefile b/distrib/hppa/cdroms/installcd/Makefile
index 8651ec49de10..82249df55f5e 100644
--- a/distrib/hppa/cdroms/installcd/Makefile
+++ b/distrib/hppa/cdroms/installcd/Makefile
@@ -1,9 +1,9 @@
-#	$NetBSD: Makefile,v 1.2 2018/09/28 15:05:21 martin Exp $
+#	$NetBSD: Makefile,v 1.3 2019/09/23 13:42:33 christos Exp $
 
 .include "${.CURDIR}/../Makefile.cdrom"
 
 CDBASE=		hppacd			# gives ${CDBASE}.iso
-CDRELEASE=	true			# include $RELEASEDIR/$MACHINE
+CDRELEASE=	true			# include $RELEASEDIR/$RELEASEMACHINEDIR
 CDRELEASE_NODEBUG=	true
 
 .include "${.CURDIR}/../../../common/Makefile.bootcd"
diff --git a/distrib/i386/cdroms/installcd/Makefile b/distrib/i386/cdroms/installcd/Makefile
index e8ae32c6743c..04e33740a86b 100644
--- a/distrib/i386/cdroms/installcd/Makefile
+++ b/distrib/i386/cdroms/installcd/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.9 2018/09/28 15:05:21 martin Exp $
+#	$NetBSD: Makefile,v 1.10 2019/09/23 13:42:33 christos Exp $
 #
 
 # Install CD, to be made after 'build.sh release'
@@ -8,7 +8,7 @@
 .include "${.CURDIR}/../Makefile.cdrom"
 
 CDBASE=		i386cd			# gives ${CDBASE}.iso
-CDRELEASE=	true                    # include $RELEASEDIR/$MACHINE
+CDRELEASE=	true                    # include $RELEASEDIR/$RELEASEMACHINEDIR
 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 146f778826ce..f60e1681cb2a 100644
--- a/distrib/ia64/cdroms/installcd/Makefile
+++ b/distrib/ia64/cdroms/installcd/Makefile
@@ -1,8 +1,8 @@
-#	$NetBSD: Makefile,v 1.3 2018/09/28 15:05:21 martin Exp $
+#	$NetBSD: Makefile,v 1.4 2019/09/23 13:42:33 christos Exp $
 CDBASE=		ia64cd		# gives ${CDBASE}.iso
 #CDINSTKERNEL=	../../instkernel/instkernel
 CDKERNELS=	netbsd netbsd
-CDRELEASE=	true			# include $RELEASEDIR/$MACHINE
+CDRELEASE=	true			# include $RELEASEDIR/$RELEASEMACHINEDIR
 CDRELEASE_NODEBUG=	true
 
 # don't make the CD bootable, there is no installboot support for ia64
diff --git a/distrib/ibmnws/cdroms/installcd/Makefile b/distrib/ibmnws/cdroms/installcd/Makefile
index e3a4e6899d10..a690e5947eb3 100644
--- a/distrib/ibmnws/cdroms/installcd/Makefile
+++ b/distrib/ibmnws/cdroms/installcd/Makefile
@@ -1,6 +1,6 @@
-#	$NetBSD: Makefile,v 1.2 2018/09/28 15:05:21 martin Exp $
+#	$NetBSD: Makefile,v 1.3 2019/09/23 13:42:33 christos Exp $
 CDBASE=		ibmnwscd		# gives ${CDBASE}.iso
-CDRELEASE=	true			# include $RELEASEDIR/$MACHINE
+CDRELEASE=	true			# include $RELEASEDIR/$RELEASEMACHINEDIR
 CDRELEASE_NODEBUG=	true
 
 .include "${.CURDIR}/../../../common/Makefile.bootcd"
diff --git a/distrib/luna68k/cdroms/installcd/Makefile b/distrib/luna68k/cdroms/installcd/Makefile
index 301da71b77df..27ebcdb05428 100644
--- a/distrib/luna68k/cdroms/installcd/Makefile
+++ b/distrib/luna68k/cdroms/installcd/Makefile
@@ -1,6 +1,6 @@
-#	$NetBSD: Makefile,v 1.2 2018/09/28 15:05:21 martin Exp $
+#	$NetBSD: Makefile,v 1.3 2019/09/23 13:42:33 christos Exp $
 CDBASE=		luna68kcd		# gives ${CDBASE}.iso
-CDRELEASE=	true			# include $RELEASEDIR/$MACHINE
+CDRELEASE=	true			# include $RELEASEDIR/$RELEASEMACHINEDIR
 CDRELEASE_NODEBUG=	true
 
 .include "${.CURDIR}/../../../common/Makefile.bootcd"
diff --git a/distrib/macppc/cdroms/installcd/Makefile b/distrib/macppc/cdroms/installcd/Makefile
index 6b53c1533b9e..759528c292a9 100644
--- a/distrib/macppc/cdroms/installcd/Makefile
+++ b/distrib/macppc/cdroms/installcd/Makefile
@@ -1,6 +1,6 @@
-#	$NetBSD: Makefile,v 1.4 2018/11/13 03:07:21 scole Exp $
+#	$NetBSD: Makefile,v 1.5 2019/09/23 13:42:33 christos Exp $
 CDBASE=		macppccd		# gives ${CDBASE}.iso
-CDRELEASE=	true			# include $RELEASEDIR/$MACHINE
+CDRELEASE=	true			# include $RELEASEDIR/$RELEASEMACHINEDIR
 CDRELEASE_NODEBUG=	true
 CDKERNELS=	netbsd-INSTALL.gz netbsd
 CDKERNELS+=	netbsd-INSTALL_601.gz netbsd.601
diff --git a/distrib/mipsco/cdroms/installcd/Makefile b/distrib/mipsco/cdroms/installcd/Makefile
index b41547faa0f8..ac78cfaa21b8 100644
--- a/distrib/mipsco/cdroms/installcd/Makefile
+++ b/distrib/mipsco/cdroms/installcd/Makefile
@@ -1,6 +1,6 @@
-#	$NetBSD: Makefile,v 1.2 2018/09/28 15:05:22 martin Exp $
+#	$NetBSD: Makefile,v 1.3 2019/09/23 13:42:33 christos Exp $
 CDBASE=		mipscocd		# gives ${CDBASE}.iso
-CDRELEASE=	true			# include $RELEASEDIR/$MACHINE
+CDRELEASE=	true			# include $RELEASEDIR/$RELEASEMACHINEDIR
 CDRELEASE_NODEBUG=	true
 
 .include "${.CURDIR}/../../../common/Makefile.bootcd"
diff --git a/distrib/mvme68k/cdroms/installcd/Makefile b/distrib/mvme68k/cdroms/installcd/Makefile
index b7ccc78cd612..e6f881248c9e 100644
--- a/distrib/mvme68k/cdroms/installcd/Makefile
+++ b/distrib/mvme68k/cdroms/installcd/Makefile
@@ -1,6 +1,6 @@
-#	$NetBSD: Makefile,v 1.2 2018/09/28 15:05:22 martin Exp $
+#	$NetBSD: Makefile,v 1.3 2019/09/23 13:42:34 christos Exp $
 CDBASE=		mvme68kcd		# gives ${CDBASE}.iso
-CDRELEASE=	true			# include $RELEASEDIR/$MACHINE
+CDRELEASE=	true			# include $RELEASEDIR/$RELEASEMACHINEDIR
 CDRELEASE_NODEBUG=	true
 
 .include "${.CURDIR}/../../../common/Makefile.bootcd"
diff --git a/distrib/mvmeppc/cdroms/installcd/Makefile b/distrib/mvmeppc/cdroms/installcd/Makefile
index 50fbf3a0eb1f..8e54dcfd6f9f 100644
--- a/distrib/mvmeppc/cdroms/installcd/Makefile
+++ b/distrib/mvmeppc/cdroms/installcd/Makefile
@@ -1,6 +1,6 @@
-#	$NetBSD: Makefile,v 1.2 2018/09/28 15:05:22 martin Exp $
+#	$NetBSD: Makefile,v 1.3 2019/09/23 13:42:34 christos Exp $
 CDBASE=		mvmeppccd		# gives ${CDBASE}.iso
-CDRELEASE=	true			# include $RELEASEDIR/$MACHINE
+CDRELEASE=	true			# include $RELEASEDIR/$RELEASEMACHINEDIR
 CDRELEASE_NODEBUG=	true
 
 .include "${.CURDIR}/../../../common/Makefile.bootcd"
diff --git a/distrib/news68k/cdroms/installcd/Makefile b/distrib/news68k/cdroms/installcd/Makefile
index 09b0aaefeece..742b2bc2b03c 100644
--- a/distrib/news68k/cdroms/installcd/Makefile
+++ b/distrib/news68k/cdroms/installcd/Makefile
@@ -1,6 +1,6 @@
-#	$NetBSD: Makefile,v 1.2 2018/09/28 15:05:22 martin Exp $
+#	$NetBSD: Makefile,v 1.3 2019/09/23 13:42:34 christos Exp $
 CDBASE=		news68kcd		# gives ${CDBASE}.iso
-CDRELEASE=	true			# include $RELEASEDIR/$MACHINE
+CDRELEASE=	true			# include $RELEASEDIR/$RELEASEMACHINEDIR
 CDRELEASE_NODEBUG=	true
 
 .include "${.CURDIR}/../../../common/Makefile.bootcd"
diff --git a/distrib/newsmips/cdroms/installcd/Makefile b/distrib/newsmips/cdroms/installcd/Makefile
index 77e36517ca5d..f99179cae7dc 100644
--- a/distrib/newsmips/cdroms/installcd/Makefile
+++ b/distrib/newsmips/cdroms/installcd/Makefile
@@ -1,6 +1,6 @@
-#	$NetBSD: Makefile,v 1.2 2018/09/28 15:05:22 martin Exp $
+#	$NetBSD: Makefile,v 1.3 2019/09/23 13:42:34 christos Exp $
 CDBASE=		newsmipscd		# gives ${CDBASE}.iso
-CDRELEASE=	true			# include $RELEASEDIR/$MACHINE
+CDRELEASE=	true			# include $RELEASEDIR/$RELEASEMACHINEDIR
 CDRELEASE_NODEBUG=	true
 
 .include "${.CURDIR}/../../../common/Makefile.bootcd"
diff --git a/distrib/ofppc/cdroms/installcd/Makefile b/distrib/ofppc/cdroms/installcd/Makefile
index 084faf72069f..cf58bc44e8ef 100644
--- a/distrib/ofppc/cdroms/installcd/Makefile
+++ b/distrib/ofppc/cdroms/installcd/Makefile
@@ -1,7 +1,7 @@
-#	$NetBSD: Makefile,v 1.6 2018/09/28 15:05:22 martin Exp $
+#	$NetBSD: Makefile,v 1.7 2019/09/23 13:42:34 christos Exp $
 
 CDBASE=		ofppccd		# gives ${CDBASE}.iso
-CDRELEASE=	true			# include $RELEASEDIR/$MACHINE
+CDRELEASE=	true			# include $RELEASEDIR/$RELEASEMACHINEDIR
 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 9ff503c76865..150891b8c215 100644
--- a/distrib/playstation2/cdroms/installcd/Makefile
+++ b/distrib/playstation2/cdroms/installcd/Makefile
@@ -1,6 +1,6 @@
-#	$NetBSD: Makefile,v 1.4 2018/09/28 15:05:22 martin Exp $
+#	$NetBSD: Makefile,v 1.5 2019/09/23 13:42:34 christos Exp $
 CDBASE=		playstation2cd		# gives ${CDBASE}.iso
-CDRELEASE=	true			# include $RELEASEDIR/$MACHINE
+CDRELEASE=	true			# include $RELEASEDIR/$RELEASEMACHINEDIR
 CDRELEASE_NODEBUG=	true
 
 .include "${.CURDIR}/../../../common/Makefile.bootcd"
diff --git a/distrib/pmax/cdroms/installcd/Makefile b/distrib/pmax/cdroms/installcd/Makefile
index 56dd85f6b18b..b2e733c9d0b0 100644
--- a/distrib/pmax/cdroms/installcd/Makefile
+++ b/distrib/pmax/cdroms/installcd/Makefile
@@ -1,6 +1,6 @@
-#	$NetBSD: Makefile,v 1.4 2018/09/28 15:05:22 martin Exp $
+#	$NetBSD: Makefile,v 1.5 2019/09/23 13:42:34 christos Exp $
 CDBASE=		pmaxcd			# gives ${CDBASE}.iso
-CDRELEASE=	true			# include $RELEASEDIR/$MACHINE
+CDRELEASE=	true			# include $RELEASEDIR/$RELEASEMACHINEDIR
 CDRELEASE_NODEBUG=	true
 .if ${MACHINE_ARCH} == "mipsel"
 CDKERNELS=	netbsd-INSTALL.gz netbsd
diff --git a/distrib/prep/cdroms/installcd/Makefile b/distrib/prep/cdroms/installcd/Makefile
index e67d4d9c528e..77aa7ab3885f 100644
--- a/distrib/prep/cdroms/installcd/Makefile
+++ b/distrib/prep/cdroms/installcd/Makefile
@@ -1,6 +1,6 @@
-#	$NetBSD: Makefile,v 1.4 2018/09/28 15:05:22 martin Exp $
+#	$NetBSD: Makefile,v 1.5 2019/09/23 13:42:34 christos Exp $
 CDBASE=		prepcd		# gives ${CDBASE}.iso
-CDRELEASE=	true		# include $RELEASEDIR/$MACHINE
+CDRELEASE=	true		# include $RELEASEDIR/$RELEASEMACHINEDIR
 CDRELEASE_NODEBUG=	true
 CDMAKEFSOPTIONS=bootimage=powerpc;cdrom/prep/installation/floppy/sysinst_com0.fs
 
diff --git a/distrib/sandpoint/cdroms/installcd/Makefile b/distrib/sandpoint/cdroms/installcd/Makefile
index 2226a327f026..ddbe47c9605f 100644
--- a/distrib/sandpoint/cdroms/installcd/Makefile
+++ b/distrib/sandpoint/cdroms/installcd/Makefile
@@ -1,6 +1,6 @@
-#	$NetBSD: Makefile,v 1.2 2018/09/28 15:05:22 martin Exp $
+#	$NetBSD: Makefile,v 1.3 2019/09/23 13:42:35 christos Exp $
 CDBASE=		sandpointcd		# gives ${CDBASE}.iso
-CDRELEASE=	true			# include $RELEASEDIR/$MACHINE
+CDRELEASE=	true			# include $RELEASEDIR/$RELEASEMACHINEDIR
 CDRELEASE_NODEBUG=	true
 
 .include "${.CURDIR}/../../../common/Makefile.bootcd"
diff --git a/distrib/sgimips/cdroms/installcd/Makefile b/distrib/sgimips/cdroms/installcd/Makefile
index bdc48197a802..55adcb7615df 100644
--- a/distrib/sgimips/cdroms/installcd/Makefile
+++ b/distrib/sgimips/cdroms/installcd/Makefile
@@ -1,6 +1,6 @@
-#	$NetBSD: Makefile,v 1.3 2018/09/28 15:05:22 martin Exp $
+#	$NetBSD: Makefile,v 1.4 2019/09/23 13:42:35 christos Exp $
 CDBASE=		sgimipscd		# gives ${CDBASE}.iso
-CDRELEASE=	true			# include $RELEASEDIR/$MACHINE
+CDRELEASE=	true			# include $RELEASEDIR/$RELEASEMACHINEDIR
 CDRELEASE_NODEBUG=	true
 CDKERNELS=	netbsd-INSTALL32_IP2x.gz ip2x
 CDKERNELS+=	netbsd-INSTALL32_IP3x.gz ip3x
diff --git a/distrib/shark/cdroms/installcd/Makefile b/distrib/shark/cdroms/installcd/Makefile
index 03635c78d0c4..d6540fa8bb32 100644
--- a/distrib/shark/cdroms/installcd/Makefile
+++ b/distrib/shark/cdroms/installcd/Makefile
@@ -1,6 +1,6 @@
-#	$NetBSD: Makefile,v 1.2 2018/09/28 15:05:22 martin Exp $
+#	$NetBSD: Makefile,v 1.3 2019/09/23 13:42:35 christos Exp $
 CDBASE=		sharkcd			# gives ${CDBASE}.iso
-CDRELEASE=	true			# include $RELEASEDIR/$MACHINE
+CDRELEASE=	true			# include $RELEASEDIR/$RELEASEMACHINEDIR
 CDRELEASE_NODEBUG=	true
 
 .include "${.CURDIR}/../../../common/Makefile.bootcd"
diff --git a/distrib/sparc/cdroms/installcd/Makefile b/distrib/sparc/cdroms/installcd/Makefile
index b63807a817e7..f92311a90ea8 100644
--- a/distrib/sparc/cdroms/installcd/Makefile
+++ b/distrib/sparc/cdroms/installcd/Makefile
@@ -1,6 +1,6 @@
-#	$NetBSD: Makefile,v 1.3 2018/09/28 15:05:23 martin Exp $
+#	$NetBSD: Makefile,v 1.4 2019/09/23 13:42:35 christos Exp $
 CDBASE=		sparccd		# gives ${CDBASE}.iso
-CDRELEASE=	true			# include $RELEASEDIR/$MACHINE
+CDRELEASE=	true			# include $RELEASEDIR/$RELEASEMACHINEDIR
 CDRELEASE_NODEBUG=	true
 
 # for PRINTOBJDIR
diff --git a/distrib/sparc64/cdroms/installcd/Makefile b/distrib/sparc64/cdroms/installcd/Makefile
index 91754f46fcda..a34d181aea27 100644
--- a/distrib/sparc64/cdroms/installcd/Makefile
+++ b/distrib/sparc64/cdroms/installcd/Makefile
@@ -1,11 +1,11 @@
-#	$NetBSD: Makefile,v 1.30 2018/09/28 15:05:23 martin Exp $
+#	$NetBSD: Makefile,v 1.31 2019/09/23 13:42:35 christos Exp $
 
 .include <bsd.own.mk>
 
 CDBASE=		sparc64cd		# gives ${CDBASE}.iso
-CDRELEASE=	true			# include $RELEASEDIR/$MACHINE
+CDRELEASE=	true			# include $RELEASEDIR/$RELEASEMACHINEDIR
 CDRELEASE_NODEBUG=	true
-CDKERNELS=	${RELEASEDIR}/${MACHINE}/binary/kernel/netbsd-GENERIC.gz	netbsd
+CDKERNELS=	${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/kernel/netbsd-GENERIC.gz	netbsd
 CD_SETS=	base etc
 .if ${MKKMOD} != "no"
 CD_SETS+=	modules
diff --git a/distrib/sun2/cdroms/installcd/Makefile b/distrib/sun2/cdroms/installcd/Makefile
index 50d19143b099..ea88e8e47fff 100644
--- a/distrib/sun2/cdroms/installcd/Makefile
+++ b/distrib/sun2/cdroms/installcd/Makefile
@@ -1,6 +1,6 @@
-#	$NetBSD: Makefile,v 1.2 2018/09/28 15:05:23 martin Exp $
+#	$NetBSD: Makefile,v 1.3 2019/09/23 13:42:35 christos Exp $
 CDBASE=		sun2cd			# gives ${CDBASE}.iso
-CDRELEASE=	true			# include $RELEASEDIR/$MACHINE
+CDRELEASE=	true			# include $RELEASEDIR/$RELEASEMACHINEDIR
 CDRELEASE_NODEBUG=	true
 
 .include "${.CURDIR}/../../../common/Makefile.bootcd"
diff --git a/distrib/sun3/cdroms/installcd/Makefile b/distrib/sun3/cdroms/installcd/Makefile
index 303ff47df83f..cbc84ab815ea 100644
--- a/distrib/sun3/cdroms/installcd/Makefile
+++ b/distrib/sun3/cdroms/installcd/Makefile
@@ -1,6 +1,6 @@
-#	$NetBSD: Makefile,v 1.3 2018/09/28 15:05:23 martin Exp $
+#	$NetBSD: Makefile,v 1.4 2019/09/23 13:42:35 christos Exp $
 CDBASE=		sun3cd			# gives ${CDBASE}.iso
-CDRELEASE=	true			# include $RELEASEDIR/$MACHINE
+CDRELEASE=	true			# include $RELEASEDIR/$RELEASEMACHINEDIR
 CDRELEASE_NODEBUG=	true
 
 # for PRINTOBJDIR
diff --git a/distrib/vax/cdroms/installcd/Makefile b/distrib/vax/cdroms/installcd/Makefile
index cd6ed9a4c942..9e8b37d7d405 100644
--- a/distrib/vax/cdroms/installcd/Makefile
+++ b/distrib/vax/cdroms/installcd/Makefile
@@ -1,8 +1,8 @@
-#	$NetBSD: Makefile,v 1.17 2018/09/28 15:05:23 martin Exp $
+#	$NetBSD: Makefile,v 1.18 2019/09/23 13:42:35 christos Exp $
 CDBASE=		vaxcd			# gives ${CDBASE}.iso
-CDRELEASE=	true			# include $RELEASEDIR/$MACHINE
+CDRELEASE=	true			# include $RELEASEDIR/$RELEASEMACHINEDIR
 CDRELEASE_NODEBUG=	true
-CDKERNELS=	${RELEASEDIR}/${MACHINE}/binary/kernel/netbsd-GENERIC.gz	netbsd.gz
+CDKERNELS=	${RELEASEDIR}/${RELEASEMACHINEDIR}/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 b9b093b874db..9a901ebb7e5a 100644
--- a/distrib/x68k/cdroms/installcd/Makefile
+++ b/distrib/x68k/cdroms/installcd/Makefile
@@ -1,6 +1,6 @@
-#	$NetBSD: Makefile,v 1.4 2018/09/28 15:05:23 martin Exp $
+#	$NetBSD: Makefile,v 1.5 2019/09/23 13:42:36 christos Exp $
 CDBASE=		x68kcd			# gives ${CDBASE}.iso
-CDRELEASE=	true			# include $RELEASEDIR/$MACHINE
+CDRELEASE=	true			# include $RELEASEDIR/$RELEASEMACHINEDIR
 CDRELEASE_NODEBUG=	true
 CDINSTKERNEL=	../../floppies/instkernel
 CDKERNELS=	netbsd-INSTALL.gz	netbsd
diff --git a/distrib/zaurus/cdroms/installcd/Makefile b/distrib/zaurus/cdroms/installcd/Makefile
index e25cd7a5ad37..64a4de298678 100644
--- a/distrib/zaurus/cdroms/installcd/Makefile
+++ b/distrib/zaurus/cdroms/installcd/Makefile
@@ -1,6 +1,6 @@
-#	$NetBSD: Makefile,v 1.2 2018/09/28 15:05:23 martin Exp $
+#	$NetBSD: Makefile,v 1.3 2019/09/23 13:42:36 christos Exp $
 CDBASE=		zauruscd		# gives ${CDBASE}.iso
-CDRELEASE=	true			# include $RELEASEDIR/$MACHINE
+CDRELEASE=	true			# include $RELEASEDIR/$RELEASEMACHINEDIR
 CDRELEASE_NODEBUG=	true
 
 .include "${.CURDIR}/../../../common/Makefile.bootcd"
diff --git a/sys/arch/alpha/stand/netboot/Makefile b/sys/arch/alpha/stand/netboot/Makefile
index db2be15475ca..34c608824a96 100644
--- a/sys/arch/alpha/stand/netboot/Makefile
+++ b/sys/arch/alpha/stand/netboot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2012/07/20 15:23:02 matt Exp $
+# $NetBSD: Makefile,v 1.27 2019/09/23 13:42:36 christos Exp $
 
 PROG = netboot
 
@@ -33,4 +33,4 @@ ${PROG}.sym: ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN}
 
 release: check_RELEASEDIR .WAIT ${PROG}
 	${HOST_INSTALL_FILE} -m ${NONBINMODE} ${PROG} \
-	    ${RELEASEDIR}/${MACHINE}/installation/netboot
+	    ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/netboot
diff --git a/sys/arch/hp300/stand/inst/Makefile b/sys/arch/hp300/stand/inst/Makefile
index 8c07b448e605..e683007f7cb6 100644
--- a/sys/arch/hp300/stand/inst/Makefile
+++ b/sys/arch/hp300/stand/inst/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.9 2005/12/11 12:17:23 christos Exp $
+#	$NetBSD: Makefile,v 1.10 2019/09/23 13:42:36 christos Exp $
 
 PROGAOUT=	inst
 PROGSOURCE=	inst.c
@@ -18,4 +18,4 @@ install:
 
 release: check_RELEASEDIR .WAIT inst.lif
 	${HOST_INSTALL_FILE} -m ${NONBINMODE} inst.lif \
-	    ${RELEASEDIR}/${MACHINE}/installation/misc/SYS_INST
+	    ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/misc/SYS_INST
diff --git a/sys/arch/hp300/stand/uboot/Makefile b/sys/arch/hp300/stand/uboot/Makefile
index f4930b0e8469..104ecb5aa4f9 100644
--- a/sys/arch/hp300/stand/uboot/Makefile
+++ b/sys/arch/hp300/stand/uboot/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.8 2003/01/03 15:34:42 lukem Exp $
+#	$NetBSD: Makefile,v 1.9 2019/09/23 13:42:36 christos Exp $
 
 PROGAOUT=	uboot
 PROGSOURCE=	uboot.c tgets.c
@@ -30,4 +30,4 @@ install:
 
 release: check_RELEASEDIR .WAIT uboot.lif
 	${HOST_INSTALL_FILE} -m ${NONBINMODE} uboot.lif \
-	    ${RELEASEDIR}/${MACHINE}/installation/misc/SYS_UBOOT
+	    ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/misc/SYS_UBOOT
diff --git a/sys/arch/i386/stand/dosboot/Makefile b/sys/arch/i386/stand/dosboot/Makefile
index 4f15243506fc..74f77cb66f8f 100644
--- a/sys/arch/i386/stand/dosboot/Makefile
+++ b/sys/arch/i386/stand/dosboot/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.32 2019/09/13 02:19:45 manu Exp $
+#	$NetBSD: Makefile,v 1.33 2019/09/23 13:42:36 christos Exp $
 
 S=	${.CURDIR}/../../../..
 
@@ -37,6 +37,6 @@ VERSIONFILE= ${.CURDIR}/version
 
 release: check_RELEASEDIR
 	${HOST_INSTALL_FILE} -m ${BINMODE} dosboot.com \
-	    ${RELEASEDIR}/${MACHINE}/installation/misc
+	    ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/misc
 
 .include "../Makefile.booters"
diff --git a/sys/arch/i386/stand/misc/Makefile b/sys/arch/i386/stand/misc/Makefile
index 2c0654d5a23e..c13d0a404636 100644
--- a/sys/arch/i386/stand/misc/Makefile
+++ b/sys/arch/i386/stand/misc/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.11 2019/01/27 04:56:46 dholland Exp $
+#	$NetBSD: Makefile,v 1.12 2019/09/23 13:42:36 christos Exp $
 
 .include <bsd.hostinit.mk>
 
@@ -13,8 +13,8 @@ release: check_RELEASEDIR .WAIT ${MISC_FILES} ${UUDECODE_FILES}
 	${_MKMSG_INSTALL} ${MISC_FILES}
 	cd ${.CURDIR} && \
 	${HOST_INSTALL_FILE} -m ${NONBINMODE} ${MISC_FILES} \
-	    ${RELEASEDIR}/${MACHINE}/installation/misc
+	    ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/misc
 	${_MKMSG_INSTALL} ${UUDECODE_FILES}
 	cd ${.OBJDIR} && \
 	${HOST_INSTALL_FILE} -m ${NONBINMODE} ${UUDECODE_FILES} \
-	    ${RELEASEDIR}/${MACHINE}/installation/misc
+	    ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/misc
diff --git a/sys/arch/i386/stand/pxeboot/Makefile b/sys/arch/i386/stand/pxeboot/Makefile
index 4c78183fa6d1..473c71c7a756 100644
--- a/sys/arch/i386/stand/pxeboot/Makefile
+++ b/sys/arch/i386/stand/pxeboot/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.26 2019/09/13 02:19:46 manu Exp $
+#	$NetBSD: Makefile,v 1.27 2019/09/23 13:42:37 christos Exp $
 
 S=	${.CURDIR}/../../../..
 
@@ -83,4 +83,4 @@ VERSIONFILE= ${.CURDIR}/../pxeboot/version
 
 release: check_RELEASEDIR
 	${HOST_INSTALL_FILE} -m ${BINMODE} ${PROG} \
-		${RELEASEDIR}/${MACHINE}/installation/misc
+		${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/misc
diff --git a/sys/arch/x68k/stand/loadbsd/Makefile b/sys/arch/x68k/stand/loadbsd/Makefile
index 6498bc1bfe1b..1358a4aeb374 100644
--- a/sys/arch/x68k/stand/loadbsd/Makefile
+++ b/sys/arch/x68k/stand/loadbsd/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.18 2016/12/10 14:06:44 rin Exp $
+#	$NetBSD: Makefile,v 1.19 2019/09/23 13:42:37 christos Exp $
 
 S=	${.CURDIR}/../../../..
 
@@ -48,8 +48,8 @@ ${BASE}${i}:	${OBJS} ${LIBDOS}/libdos.a ${LIBIOCS}/libiocs.a
 
 release: check_RELEASEDIR
 	${HOST_INSTALL_FILE} -m ${NONBINMODE} ${PROG} \
-	    ${RELEASEDIR}/${MACHINE}/installation/misc
+	    ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/misc
 	${TOOL_MANDOC_ASCII} ${DESTDIR}/usr/share/man/man8/x68k/loadbsd.8 > \
-	    ${RELEASEDIR}/${MACHINE}/installation/misc/loadbsd.0
+	    ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/misc/loadbsd.0
 	${TOOL_MANDOC_HTML} ${DESTDIR}/usr/share/man/man8/x68k/loadbsd.8 > \
-	    ${RELEASEDIR}/${MACHINE}/installation/misc/loadbsd.html
+	    ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/misc/loadbsd.html
diff --git a/sys/arch/zaurus/stand/zboot/Makefile b/sys/arch/zaurus/stand/zboot/Makefile
index 5658648b3328..74be05bc5c10 100644
--- a/sys/arch/zaurus/stand/zboot/Makefile
+++ b/sys/arch/zaurus/stand/zboot/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.20 2017/04/08 19:53:23 christos Exp $
+#	$NetBSD: Makefile,v 1.21 2019/09/23 13:42:37 christos Exp $
 
 PROG=		zboot
 
@@ -67,4 +67,4 @@ cleanlibdir:
 
 release: check_RELEASEDIR
 	${HOST_INSTALL_FILE} -m ${BINMODE} ${PROG} \
-	    ${RELEASEDIR}/${MACHINE}/installation
+	    ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation
diff --git a/sys/arch/zaurus/stand/zbsdmod/Makefile b/sys/arch/zaurus/stand/zbsdmod/Makefile
index 61afd8b0592c..c01b87f938ae 100644
--- a/sys/arch/zaurus/stand/zbsdmod/Makefile
+++ b/sys/arch/zaurus/stand/zbsdmod/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.10 2016/01/31 15:32:13 christos Exp $
+#	$NetBSD: Makefile,v 1.11 2019/09/23 13:42:37 christos Exp $
 
 WARNS?=	4
 
@@ -30,4 +30,4 @@ CPPFLAGS+=	-I${.OBJDIR} -I${S}
 
 release: check_RELEASEDIR
 	${HOST_INSTALL_FILE} -m ${NONBINMODE} ${OBJS} \
-	    ${RELEASEDIR}/${MACHINE}/installation
+	    ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation
diff --git a/sys/stand/efiboot/bootaa64/Makefile b/sys/stand/efiboot/bootaa64/Makefile
index 5e12a6b139c1..b3552705829c 100644
--- a/sys/stand/efiboot/bootaa64/Makefile
+++ b/sys/stand/efiboot/bootaa64/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2018/10/28 10:17:47 jmcneill Exp $
+# $NetBSD: Makefile,v 1.6 2019/09/23 13:42:37 christos Exp $
 
 PROG=		bootaa64.efi
 OBJFMT=		binary
@@ -17,4 +17,4 @@ CFLAGS+=	-DEFIBOOT_ACPI
 
 release: check_RELEASEDIR
 	${HOST_INSTALL_FILE} -m ${BINMODE} ${PROG} \
-		${RELEASEDIR}/${MACHINE}/installation/misc
+		${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/misc
diff --git a/sys/stand/efiboot/bootarm/Makefile b/sys/stand/efiboot/bootarm/Makefile
index e9e0484ec1da..78300e5cbebe 100644
--- a/sys/stand/efiboot/bootarm/Makefile
+++ b/sys/stand/efiboot/bootarm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2019/03/30 12:48:50 jmcneill Exp $
+# $NetBSD: Makefile,v 1.2 2019/09/23 13:42:37 christos Exp $
 
 PROG=		bootarm.efi
 OBJFMT=		binary
@@ -17,4 +17,4 @@ LDFLAGS+=	-N
 
 release: check_RELEASEDIR
 	${HOST_INSTALL_FILE} -m ${BINMODE} ${PROG} \
-		${RELEASEDIR}/${MACHINE}/installation/misc
+		${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/misc