diff --git a/BUILDING b/BUILDING
index 1aa5a311e82b..16f5ede5ac09 100644
--- a/BUILDING
+++ b/BUILDING
@@ -495,7 +495,7 @@ BUILDING
                    already have been populated by ``make release'' or equiva-
                    lent.  This requires the mkisofs(1) utility, which is not
                    part of NetBSD, but which can be installed from
-                   pkgsrc/sysutils/cdrecord.
+                   pkgsrc/sysutils/cdrtools.
 
      regression-tests
                    Can only be run after building the regression tests in the
@@ -715,7 +715,7 @@ OBSOLETE VARIABLES
                  TOOLCHAIN_MISSING=yes.
 
 SEE ALSO
-     make(1), hier(7), release(7), pkgsrc/sysutils/cdrecord
+     make(1), hier(7), release(7), pkgsrc/sysutils/cdrtools
 
 HISTORY
      The build.sh based build scheme was introduced for NetBSD 1.6 as
diff --git a/doc/BUILDING.mdoc b/doc/BUILDING.mdoc
index d5b1ab14e8ef..4cc8f478bb3e 100644
--- a/doc/BUILDING.mdoc
+++ b/doc/BUILDING.mdoc
@@ -1,4 +1,4 @@
-.\"	$NetBSD: BUILDING.mdoc,v 1.42 2006/01/28 21:34:08 apb Exp $
+.\"	$NetBSD: BUILDING.mdoc,v 1.43 2006/01/29 14:03:59 apb Exp $
 .\"
 .\" Copyright (c) 2001-2004 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -912,7 +912,7 @@ This requires the
 utility, which is not part of
 .Nx ,
 but which can be installed from
-.Pa pkgsrc/sysutils/cdrecord .
+.Pa pkgsrc/sysutils/cdrtools .
 .
 .It Sy regression-tests
 Can only be run after building the regression tests in the directory
@@ -1401,7 +1401,7 @@ To disable, use
 .Xr make 1 ,
 .Xr hier 7 ,
 .Xr release 7 ,
-.Pa pkgsrc/sysutils/cdrecord
+.Pa pkgsrc/sysutils/cdrtools
 .
 .Sh HISTORY
 .
diff --git a/etc/Makefile b/etc/Makefile
index 996bd99ef400..79a333b99420 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.319 2006/01/28 21:37:11 apb Exp $
+#	$NetBSD: Makefile,v 1.320 2006/01/29 14:03:59 apb Exp $
 #	from: @(#)Makefile	8.7 (Berkeley) 5/25/95
 
 # Environment variables without default values:
@@ -54,7 +54,7 @@ MAKESUMS=	CKSUM=${CKSUM:Q} ${HOST_SH} ${NETBSDSRCDIR}/distrib/sets/makesums
 DISTRIBVER!=	${HOST_SH} ${NETBSDSRCDIR}/sys/conf/osrelease.sh
 
 # Flags for creating ISO CDROM image
-# mkisofs is expected to be in $PATH, install via pkgsrc/sysutils/cdrecord
+# mkisofs is expected to be in $PATH, install via pkgsrc/sysutils/cdrtools
 # Note: At least mkisofs 2.0 should be used.
 #
 MKISOFS?=	mkisofs
@@ -433,7 +433,7 @@ iso-image-setup: .PHONY check_RELEASEDIR
 iso-image-mi: .PHONY check_DESTDIR check_RELEASEDIR .WAIT \
 		iso-image-setup .WAIT iso-image-md-pre
 	@if ! ${MKISOFS} --version; then \
-		echo "install pkgsrc/sysutils/cdrecord and run 'make iso-image'." ; \
+		echo "install pkgsrc/sysutils/cdrtools and run 'make iso-image'." ; \
 		false; \
 	fi
 	${MKISOFS} ${MKISOFS_FLAGS} -graft-points -path-list ${CDROM.pathlist} \