diff --git a/Makefile.inc1 b/Makefile.inc1
index 7608f2b4eb6..7f29afe0316 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -667,7 +667,7 @@ _xargs=		usr.bin/xargs
 _yacc=		usr.bin/yacc
 .endif
 
-.if exists(${.CURDIR}/rescue) && !defined(NO_RESCUE) && \
+.if exists(${.CURDIR}/rescue) && defined(RESCUE) && \
     ${BOOTSTRAPPING} < 501100
 _crunchgen=	usr.sbin/crunch/crunchgen
 .endif
@@ -752,7 +752,7 @@ _elf2aout=	usr.bin/elf2aout
 _btxld=		usr.sbin/btxld
 .endif
 
-.if (exists(${.CURDIR}/rescue) && !defined(NO_RESCUE) || \
+.if (exists(${.CURDIR}/rescue) && defined(RESCUE) || \
     defined(RELEASEDIR)) && \
     ( ${TARGET_ARCH} != ${MACHINE_ARCH} || ${BOOTSTRAPPING} < 501101 )
 _crunchide=	usr.sbin/crunch/crunchide