diff --git a/release/picobsd/build/Makefile.crunch b/release/picobsd/build/Makefile.crunch
index 53afe4f1c47e..0879ef685e85 100644
--- a/release/picobsd/build/Makefile.crunch
+++ b/release/picobsd/build/Makefile.crunch
@@ -1,43 +1,42 @@
 #
 # $FreeBSD$
 #
 SRC?=/usr/src
 
 all: crunch
 
 crunch:
 	@cat crunch.conf|sed -e "s@/usr/src@${SRC}@" >crunch1.conf
 	@( if [ -f crunch.inc ] ; then \
-		crunchgen -o -h ./crunch.inc ./crunch1.conf ; \
+		crunchgen -p ${PICO_OBJ} -o -h ./crunch.inc ./crunch1.conf ; \
 	else \
-		crunchgen -o ./crunch1.conf ; \
+		crunchgen -p ${PICO_OBJ} -o ./crunch1.conf ; \
 	fi )
-	@perl -pi -e 's#${OBJ}#${PICO_OBJ}#g' crunch1.mk ;
-	@env MAKEOBJDIRPREFIX=${PICO_OBJ} ${MAKE} -f crunch1.mk all
+	@${MAKE} -f crunch1.mk
 	strip --remove-section=.note --remove-section=.comment crunch1
 
 
 clean:
 	rm  -f *.o *.stub *.lo *_stub.c *.mk \
 		crunch.cache \
 		crunch.mk \
 		crunch.c \
 		crunch1* \
 		crunch \
 		.tmp_* \
 		*.gz
 
 install: 
 	cp crunch1 ${MFS_MOUNTPOINT}/stand/crunch
 	chmod 555 ${MFS_MOUNTPOINT}/stand/crunch
 	for i in `crunchgen -l crunch1.conf` ; \
 	do \
 		ln ${MFS_MOUNTPOINT}/stand/crunch ${MFS_MOUNTPOINT}/stand/$${i}; \
 	done
 	rm ${MFS_MOUNTPOINT}/stand/crunch
 	# Install the MIB files
 	#mkdir -p ${MFS_MOUNTPOINT}/usr/local/share/snmp/mibs
 	#cp ../../net/crunch1/mibs/*.txt ${MFS_MOUNTPOINT}/usr/local/share/snmp/mibs/
 
 
 .include <bsd.prog.mk>