diff --git a/Makefile.inc1 b/Makefile.inc1
index 023e3b29e3e3..8b1db9162f3d 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -780,7 +780,7 @@ _yacc=		usr.bin/yacc
 .endif
 
 .if !defined(NO_RESCUE) && \
-    ${BOOTSTRAPPING} < 502128
+    ${BOOTSTRAPPING} < 600008
 _crunchgen=	usr.sbin/crunch/crunchgen
 .endif
 
diff --git a/usr.sbin/crunch/crunchgen/crunchgen.c b/usr.sbin/crunch/crunchgen/crunchgen.c
index 7984d543921e..ff8b6eca6119 100644
--- a/usr.sbin/crunch/crunchgen/crunchgen.c
+++ b/usr.sbin/crunch/crunchgen/crunchgen.c
@@ -700,7 +700,7 @@ void fillin_program_objs(prog_t *p, char *path)
 
 	fclose(f);
 
-	snprintf(line, MAXLINELEN, "cd %s && make -f %s crunchgen_objs 2>&1",
+	snprintf(line, MAXLINELEN, "cd %s && make -f %s crunchgen_objs",
 	    p->srcdir, tempfname);
 	if ((f = popen(line, "r")) == NULL) {
 		warn("submake pipe");