diff --git a/release/Makefile b/release/Makefile
index 9cb729ef59b1..1cf01aabd99b 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -273,13 +273,16 @@ CRUNCH_TARGETS=	boot fixit
 FIXIT_TARGET= release.10
 .endif
 
-EXTRAS= cdrom.1 ftp.1
+EXTRAS= ftp.1
+.if !defined(NOCDROM)
+EXTRAS+= cdrom.1
 .if defined(MAKE_ISOS)
 EXTRAS+= iso.1
 .if ${TARGET} != "pc98"
 BOOTABLE="-b"
 .endif
 .endif
+.endif
 
 .if !defined(NODOC)
 DOCREL= doc.1 doc.2
@@ -404,7 +407,7 @@ rerelease release:
 	AUTO_KEYBOARD_DETECT BOOT_CONFIG BUILDNAME \
 	CD_EXTRA_BITS DISTRIBUTIONS DOC_LANG DOMINIMALDOCPORTS \
 	EXTRA_SRC FIXCRYPTO KERNELS KERNEL_FLAGS \
-	MAKE_ISOS NODOC NO_FLOPPIES NOKERBEROS NOPORTS NOSHARED \
+	MAKE_ISOS NOCDROM NODOC NO_FLOPPIES NOKERBEROS NOPORTS NOSHARED \
 	NOSRC NO_SENDMAIL RELEASETAG \
 	RELNOTES_LANG TARGET TARGET_ARCH WORLD_FLAGS
 .if defined(${var})