diff --git a/BUILDING b/BUILDING
index 8aa3ad69a87e..bf6a87c80ff5 100644
--- a/BUILDING
+++ b/BUILDING
@@ -632,8 +632,8 @@ BUILDING
                    set (see above).
 
      iso-image     Create a NetBSD installation CD-ROM image in the
-                   RELEASEDIR/iso directory.  The CD-ROM file system will have
-                   a layout as described in release(7).
+                   RELEASEDIR/images directory.  The CD-ROM file system will
+                   have a layout as described in release(7).
 
                    For most machine types, the CD-ROM will be bootable, and
                    will automatically run the sysinst(8) menu-based
@@ -649,8 +649,8 @@ BUILDING
                    the RELEASEDIR/RELEASEMACHINEDIR/installation/cdrom
                    directory by ``make release''.  These smaller images
                    usually contain the same tools as the larger images in
-                   RELEASEDIR/iso, but do not contain additional content such
-                   as the distribution sets.
+                   RELEASEDIR/images, but do not contain additional content
+                   such as the distribution sets.
 
                    Note that the mac68k port still uses an older method of
                    creating CD-ROM images.  This requires the mkisofs(1)
@@ -659,8 +659,8 @@ BUILDING
 
      iso-image-source
                    Create a NetBSD installation CD-ROM image in the
-                   RELEASEDIR/iso directory.  The CD-ROM file system will have
-                   a layout as described in release(7).  It will have top
+                   RELEASEDIR/images directory.  The CD-ROM file system will
+                   have a layout as described in release(7).  It will have top
                    level directories for the machine type and source.
 
                    For most machine types, the CD-ROM will be bootable, and
@@ -678,8 +678,8 @@ BUILDING
                    the RELEASEDIR/RELEASEMACHINEDIR/installation/cdrom
                    directory by ``make release''.  These smaller images
                    usually contain the same tools as the larger images in
-                   RELEASEDIR/iso, but do not contain additional content such
-                   as the distribution sets.
+                   RELEASEDIR/images, but do not contain additional content
+                   such as the distribution sets.
 
                    Note that the mac68k port still uses an older method of
                    creating CD-ROM images.  This requires the mkisofs(1)
diff --git a/Makefile b/Makefile
index 3f36931a4534..517e6ad09565 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.309 2014/06/16 09:06:26 apb Exp $
+#	$NetBSD: Makefile,v 1.309.2.1 2014/11/14 14:58:27 martin Exp $
 
 #
 # This is the top-level makefile for building NetBSD. For an outline of
@@ -64,11 +64,11 @@
 #	Populate ${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/syspkgs
 #	from ${DESTDIR}
 #   iso-image:
-#	Create CD-ROM image in RELEASEDIR/iso.
+#	Create CD-ROM image in RELEASEDIR/images.
 #	RELEASEDIR must already have been populated by `make release'
 #	or equivalent.
 #   iso-image-source:
-#	Create CD-ROM image with source in RELEASEDIR/iso.
+#	Create CD-ROM image with source in RELEASEDIR/images.
 #	RELEASEDIR must already have been populated by
 #	`make release sourcesets' or equivalent.
 #   live-image:
diff --git a/build.sh b/build.sh
index 55b083ccdf00..9548a1224432 100755
--- a/build.sh
+++ b/build.sh
@@ -1,5 +1,5 @@
 #! /usr/bin/env sh
-#	$NetBSD: build.sh,v 1.294.2.2 2014/11/14 14:17:12 martin Exp $
+#	$NetBSD: build.sh,v 1.294.2.3 2014/11/14 14:58:27 martin Exp $
 #
 # Copyright (c) 2001-2011 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -1034,8 +1034,8 @@ Usage: ${progname} [-EhnorUuxy] [-a arch] [-B buildid] [-C cdextras]
     sourcesets          Create source sets in RELEASEDIR/source/sets.
     syspkgs             Create syspkgs in
                         RELEASEDIR/RELEASEMACHINEDIR/binary/syspkgs.
-    iso-image           Create CD-ROM image in RELEASEDIR/iso.
-    iso-image-source    Create CD-ROM image with source in RELEASEDIR/iso.
+    iso-image           Create CD-ROM image in RELEASEDIR/images.
+    iso-image-source    Create CD-ROM image with source in RELEASEDIR/images.
     live-image          Create bootable live image in
                         RELEASEDIR/RELEASEMACHINEDIR/installation/liveimage.
     install-image       Create bootable installation image in
@@ -1863,7 +1863,7 @@ createmakewrapper()
 	eval cat <<EOF ${makewrapout}
 #! ${HOST_SH}
 # Set proper variables to allow easy "make" building of a NetBSD subtree.
-# Generated from:  \$NetBSD: build.sh,v 1.294.2.2 2014/11/14 14:17:12 martin Exp $
+# Generated from:  \$NetBSD: build.sh,v 1.294.2.3 2014/11/14 14:58:27 martin Exp $
 # with these arguments: ${_args}
 #
 
diff --git a/distrib/notes/arc/prep b/distrib/notes/arc/prep
index c03292fabf50..552e4b5453fd 100644
--- a/distrib/notes/arc/prep
+++ b/distrib/notes/arc/prep
@@ -1,4 +1,4 @@
-.\"	$NetBSD: prep,v 1.2 2009/04/23 01:56:48 snj Exp $
+.\"	$NetBSD: prep,v 1.2.26.1 2014/11/14 14:58:28 martin Exp $
 .
 First and foremost, before beginning the installation process,
 .Em make sure you have a reliable backup
@@ -40,7 +40,7 @@ install kernel onto a CD-R.
 Go to one of the
 .Nx
 mirror sites and download CD-R image from the
-.Pa pub/NetBSD/iso
+.Pa pub/NetBSD/images
 directory.
 .Lk http://www.NetBSD.org/mirrors/#iso
 .Pp
@@ -54,7 +54,7 @@ collection should get it from the official website:
 .Lk http://cdrecord.berlios.de/old/private/cdrecord.html
 .Pp
 .(disp
-.No # Ic "cdrecord -v speed=16 dev=/dev/cd0d arccd.iso"
+.No # Ic "cdrecord -v speed=16 dev=/dev/cd0d NetBSD-arc-\*V.iso"
 .disp)
 .Pp
 You will need to substitute the correct name of the disk image file,
diff --git a/distrib/notes/cats/prep b/distrib/notes/cats/prep
index 95567b2536b6..0cb22d7dc0b1 100644
--- a/distrib/notes/cats/prep
+++ b/distrib/notes/cats/prep
@@ -1,4 +1,4 @@
-.\"	$NetBSD: prep,v 1.11 2009/04/23 01:56:49 snj Exp $
+.\"	$NetBSD: prep,v 1.11.26.1 2014/11/14 14:58:28 martin Exp $
 .
 A \*M machine usually needs little or no preparation before installing
 .Nx ,
@@ -36,7 +36,7 @@ install kernel onto a CD-R.
 Go to one of the
 .Nx
 mirror sites and download CD-R image from the
-.Pa pub/NetBSD/iso
+.Pa pub/NetBSD/images
 directory.
 .Lk http://www.NetBSD.org/mirrors/#iso
 .Pp
@@ -50,12 +50,11 @@ collection should get it from the official website:
 .Lk http://www.fokus.gmd.de/research/cc/glone/employees/joerg.schilling/private/cdrecord.html
 .Pp
 .(disp
-.No # Ic "cdrecord -v speed=4 dev=/dev/cd1d output.iso"
+.No # Ic "cdrecord -v speed=4 dev=/dev/cd1d NetBSD-\*V-cats.iso"
 .disp)
 .Pp
-You will need to substitute the correct name of the disk image file,
-speed for your CD writer, and the
-correct device for your system (for i386 it would be
+You will need to substitute the correct speed for your CD writer, as well
+as the correct device for your system (for i386 it would be
 .Pa /dev/cd1d ) .
 .
 .Ss2 Booting from CD-ROM
diff --git a/distrib/notes/common/main b/distrib/notes/common/main
index 9a6732ca6309..fce187ce7094 100644
--- a/distrib/notes/common/main
+++ b/distrib/notes/common/main
@@ -1,4 +1,4 @@
-.\"	$NetBSD: main,v 1.510 2014/03/31 11:25:47 martin Exp $
+.\"	$NetBSD: main,v 1.510.4.1 2014/11/14 14:58:28 martin Exp $
 .\"
 .\" Copyright (c) 1999-2012 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -119,7 +119,7 @@ full distribution.
 .Pp
 These can be found
 on an FTP site near you, usually located in the
-.Pa /pub/NetBSD/iso/
+.Pa /pub/NetBSD/images/
 directory.
 Check the list of
 .Nx
diff --git a/distrib/notes/macppc/prep.OPENFIRMWARE b/distrib/notes/macppc/prep.OPENFIRMWARE
index ad61965e90e1..d4145877efe3 100644
--- a/distrib/notes/macppc/prep.OPENFIRMWARE
+++ b/distrib/notes/macppc/prep.OPENFIRMWARE
@@ -1,4 +1,4 @@
-.\"	$NetBSD: prep.OPENFIRMWARE,v 1.15 2012/01/14 22:56:30 jmcneill Exp $
+.\"	$NetBSD: prep.OPENFIRMWARE,v 1.15.20.1 2014/11/14 14:58:28 martin Exp $
 .if \*[OF_VERSION_3] \{\
 .
 .Ss2 Updating your BootROM
@@ -1177,7 +1177,7 @@ Go to one of the
 mirror sites and download the CD-R image
 .Pa NetBSD-\*V-macppc.iso
 from the
-.Pa pub/NetBSD/iso
+.Pa pub/NetBSD/images
 directory.
 .Lk http://www.NetBSD.org/mirrors/#iso
 .Pp
@@ -1385,12 +1385,12 @@ systems should get it from the official website:
 .Pp
 .(disp
 .if \*[OF_VERSION_12] \{\
-.No # Ic "mkisofs -o output.iso -l -J -r -L -N /cdsources"
+.No # Ic "mkisofs -o NetBSD-\*V-macppc.iso -l -J -r -L -N /cdsources"
 .\}
 .if \*[OF_VERSION_3] \{\
-.No # Ic "mkisofs -o output.iso -hfs -part -l -J -r -L -N /cdsources"
+.No # Ic "mkisofs -o NetBSD-\*V-macppc.iso -hfs -part -l -J -r -L -N /cdsources"
 .\}
-.No # Ic "cdrecord -v speed=4 dev=/dev/cd1c output.iso"
+.No # Ic "cdrecord -v speed=4 dev=/dev/cd1c NetBSD-\*V-macppc.iso"
 .disp)
 .Pp
 You will need to substitute the correct speed for your CD writer, and the
diff --git a/distrib/notes/sparc/install b/distrib/notes/sparc/install
index bf9998383aea..f3d23d0beef6 100644
--- a/distrib/notes/sparc/install
+++ b/distrib/notes/sparc/install
@@ -1,4 +1,4 @@
-.\"	$NetBSD: install,v 1.57 2012/01/14 22:56:30 jmcneill Exp $
+.\"	$NetBSD: install,v 1.57.20.1 2014/11/14 14:58:28 martin Exp $
 .\"
 .\" Copyright (c) 1999-2002 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -136,7 +136,7 @@ below.
 .
 If you wish to burn a CD-R containing a bootable NetBSD installation,
 then you can either burn the prepared disk image in
-.Pa iso/NetBSD-\*V-sparc.iso
+.Pa images/NetBSD-\*V-sparc.iso
 or create your own.
 If you wish to create your own, you should follow the directions on the
 .Nx
diff --git a/doc/BUILDING.mdoc b/doc/BUILDING.mdoc
index 06d86c88a19c..0131bcbbcaf4 100644
--- a/doc/BUILDING.mdoc
+++ b/doc/BUILDING.mdoc
@@ -1,4 +1,4 @@
-.\"	$NetBSD: BUILDING.mdoc,v 1.104 2014/08/07 21:45:27 apb Exp $
+.\"	$NetBSD: BUILDING.mdoc,v 1.104.2.1 2014/11/14 14:58:28 martin Exp $
 .\"
 .\" Copyright (c) 2001-2011 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -1146,7 +1146,7 @@ be set (see above).
 Create a
 .Nx
 installation CD-ROM image in the
-.Sy RELEASEDIR Ns Pa /iso
+.Sy RELEASEDIR Ns Pa /images
 directory.
 The CD-ROM file system will have a layout as described in
 .Xr release 7 .
@@ -1173,7 +1173,7 @@ Note that other, smaller, CD-ROM images may be created in the
 directory by
 .Dq "make release" .
 These smaller images usually contain the same tools as the larger images in
-.Sy RELEASEDIR Ns Pa /iso ,
+.Sy RELEASEDIR Ns Pa /images ,
 but do not contain additional content such as the distribution sets.
 .Pp
 Note that the mac68k port still uses an older method of creating
@@ -1189,7 +1189,7 @@ but which can be installed from
 Create a
 .Nx
 installation CD-ROM image in the
-.Sy RELEASEDIR Ns Pa /iso
+.Sy RELEASEDIR Ns Pa /images
 directory.
 The CD-ROM file system will have a layout as described in
 .Xr release 7 .
@@ -1217,7 +1217,7 @@ Note that other, smaller, CD-ROM images may be created in the
 directory by
 .Dq make release .
 These smaller images usually contain the same tools as the larger images in
-.Sy RELEASEDIR Ns Pa /iso ,
+.Sy RELEASEDIR Ns Pa /images ,
 but do not contain additional content such as the distribution sets.
 .Pp
 Note that the mac68k port still uses an older method of creating
diff --git a/share/man/man8/man8.macppc/ofwboot.8 b/share/man/man8/man8.macppc/ofwboot.8
index 2bf6435e4bdb..5fbf4cba6a74 100644
--- a/share/man/man8/man8.macppc/ofwboot.8
+++ b/share/man/man8/man8.macppc/ofwboot.8
@@ -1,4 +1,4 @@
-.\"	$NetBSD: ofwboot.8,v 1.12 2012/03/17 12:25:11 wiz Exp $
+.\"	$NetBSD: ofwboot.8,v 1.12.10.1 2014/11/14 14:58:28 martin Exp $
 .\"
 .\" Copyright (c) 2001 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -256,10 +256,10 @@ GENERIC kernel (the same as
 with RAM disk and
 .Ic sysinst
 included.
-.It macppccd.iso
+.It NetBSD-{RELEASE}-macppc.iso
 bootable CDROM image for all supported systems.
 Usually located at
-.Pa ftp://ftp.NetBSD.org/pub/NetBSD/iso/{RELEASE}/macppccd.iso
+.Pa ftp://ftp.NetBSD.org/pub/NetBSD/images/{RELEASE}/NetBSD-{RELEASE}-macppc.iso
 .El
 .Sh EXAMPLES
 .Bl -item