diff --git a/release/picobsd/bridge/crunch1/crunch.inc b/release/picobsd/bridge/crunch1/crunch.inc
new file mode 100644
index 000000000000..eb7826768a78
--- /dev/null
+++ b/release/picobsd/bridge/crunch1/crunch.inc
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+# Anything that you add to OPTS will be added to the build rules for each
+# program built.
+
+OPTS= -DNOPAM -DRELEASE_CRUNCH -DNOSECURE -DNOCRYPT -DNONETGRAPH -DNOIPSEC
+
+
+# Per program options can be added also...
+# i.e.
+# ppp_OPTS= -DNOKLDLOAD -DNOINET6 -DNONAT -DNOATM -DNOSUID -DHAVE_DES -DNORADIUS -DNOI4B -DNONETGRAPH
+
+#end
diff --git a/release/picobsd/build/Makefile.crunch b/release/picobsd/build/Makefile.crunch
index a473956be180..13605482e1aa 100644
--- a/release/picobsd/build/Makefile.crunch
+++ b/release/picobsd/build/Makefile.crunch
@@ -2,7 +2,6 @@
 # $FreeBSD$
 #
 SRC?=/usr/src
-CRUNCHFLAGS+= -DNOPAM -DRELEASE_CRUNCH -DNOSECURE -DNOCRYPT -DNONETGRAPH -DNOIPSEC
 
 all: crunch
 
@@ -11,17 +10,11 @@ crunch:
 	@( if [ -f crunch.inc ] ; then \
 		crunchgen -h ./crunch.inc ./crunch1.conf ; \
 	else \
-		crunchgen -h ../../build/crunch.inc ./crunch1.conf ; \
+		crunchgen ./crunch1.conf ; \
 	fi )
 	@perl -pi -e 's#${OBJ}#${PICO_OBJ}#g' crunch1.mk ;
 	../../build/munge_crunchmk.pl crunch1.mk ;
-	@( if [ -f buildopts.inc ] ; then \
-		echo '.include "buildopts.inc"' > crunch1.mk.tmp ; \
-		cat crunch1.mk >> crunch1.mk.tmp ; \
-		mv crunch1.mk.tmp crunch1.mk ; \
-	fi )
-	@env MAKEOBJDIRPREFIX=${PICO_OBJ} ${MAKE} -f crunch1.mk $(CRUNCHFLAGS) all \
-	    "CFLAGS=${CFLAGS} ${CRUNCHFLAGS}" #2>&1 >/dev/null
+	@env MAKEOBJDIRPREFIX=${PICO_OBJ} ${MAKE} -f crunch1.mk all
 	strip --remove-section=.note --remove-section=.comment crunch1
 
 
diff --git a/release/picobsd/build/crunch.inc b/release/picobsd/build/crunch.inc
deleted file mode 100644
index 09ecb019faa9..000000000000
--- a/release/picobsd/build/crunch.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-# header file for crunch1.mk
-RELEASE_CRUNCH=yes
-NOCRYPT=yes
-NOPAM=yes
-NOSECURE=yes
-NONETGRAPH=yes
-NOIPSEC=yes
diff --git a/release/picobsd/custom/crunch1/crunch.inc b/release/picobsd/custom/crunch1/crunch.inc
index 2a618545f578..7f407213606b 100644
--- a/release/picobsd/custom/crunch1/crunch.inc
+++ b/release/picobsd/custom/crunch1/crunch.inc
@@ -1,2 +1,13 @@
 # You can add make variables and targets for the crunch building process
-# in this file.
+# $FreeBSD$
+
+# Anything that you add to OPTS will be added to the build rules for each
+# program built.
+# i.e:
+# OPTS= -DNOPAM -DRELEASE_CRUNCH -DNOSECURE -DNOCRYPT -DNONETGRAPH -DNOIPSEC
+
+
+# Per program options can be added also by defining prog_OPTS:
+# ppp_OPTS= -DNOKLDLOAD -DNOINET6 -DNONAT -DNOATM -DNOSUID -DHAVE_DES -DNORADIUS -DNOI4B -DNONETGRAPH
+
+#end
diff --git a/release/picobsd/dial/crunch1/crunch.inc b/release/picobsd/dial/crunch1/crunch.inc
new file mode 100644
index 000000000000..91ddee87cdbc
--- /dev/null
+++ b/release/picobsd/dial/crunch1/crunch.inc
@@ -0,0 +1,12 @@
+# $FreeBSD$
+
+# Anything that you add to OPTS will be added to the build rules for each
+# program built.
+
+OPTS= -DNOPAM -DRELEASE_CRUNCH -DNOSECURE -DNOCRYPT -DNONETGRAPH -DNOIPSEC
+
+
+# Per program options can be added also...
+#ppp_OPTS= -DNOKLDLOAD -DNOINET6 -DNONAT -DNOATM -DNOSUID -DHAVE_DES -DNORADIUS -DNOI4B -DNONETGRAPH
+
+#end
diff --git a/release/picobsd/install/crunch1/crunch.inc b/release/picobsd/install/crunch1/crunch.inc
new file mode 100644
index 000000000000..91ddee87cdbc
--- /dev/null
+++ b/release/picobsd/install/crunch1/crunch.inc
@@ -0,0 +1,12 @@
+# $FreeBSD$
+
+# Anything that you add to OPTS will be added to the build rules for each
+# program built.
+
+OPTS= -DNOPAM -DRELEASE_CRUNCH -DNOSECURE -DNOCRYPT -DNONETGRAPH -DNOIPSEC
+
+
+# Per program options can be added also...
+#ppp_OPTS= -DNOKLDLOAD -DNOINET6 -DNONAT -DNOATM -DNOSUID -DHAVE_DES -DNORADIUS -DNOI4B -DNONETGRAPH
+
+#end
diff --git a/release/picobsd/isp/crunch1/crunch.inc b/release/picobsd/isp/crunch1/crunch.inc
new file mode 100644
index 000000000000..91ddee87cdbc
--- /dev/null
+++ b/release/picobsd/isp/crunch1/crunch.inc
@@ -0,0 +1,12 @@
+# $FreeBSD$
+
+# Anything that you add to OPTS will be added to the build rules for each
+# program built.
+
+OPTS= -DNOPAM -DRELEASE_CRUNCH -DNOSECURE -DNOCRYPT -DNONETGRAPH -DNOIPSEC
+
+
+# Per program options can be added also...
+#ppp_OPTS= -DNOKLDLOAD -DNOINET6 -DNONAT -DNOATM -DNOSUID -DHAVE_DES -DNORADIUS -DNOI4B -DNONETGRAPH
+
+#end
diff --git a/release/picobsd/net/crunch1/buildopts.inc b/release/picobsd/net/crunch1/buildopts.inc
deleted file mode 100644
index 8e83165b3a7e..000000000000
--- a/release/picobsd/net/crunch1/buildopts.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-# $FreeBSD$
-
-OPTS= -DNOPAM
-ppp_OPTS= -DNOKLDLOAD -DNOINET6 -DNONAT -DNOATM -DNOSUID -DHAVE_DES -DNORADIUS -DNOI4B -DNONETGRAPH
-
-#end
diff --git a/release/picobsd/net/crunch1/crunch.inc b/release/picobsd/net/crunch1/crunch.inc
new file mode 100644
index 000000000000..a8834f21ad8e
--- /dev/null
+++ b/release/picobsd/net/crunch1/crunch.inc
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+# Anything that you add to OPTS will be added to the build rules for each
+# program built.
+
+OPTS= -DNOPAM -DRELEASE_CRUNCH -DNOSECURE -DNOCRYPT -DNONETGRAPH -DNOIPSEC
+
+
+# Per program options can be added also...
+
+ppp_OPTS= -DNOKLDLOAD -DNOINET6 -DNONAT -DNOATM -DNOSUID -DHAVE_DES -DNORADIUS -DNOI4B -DNONETGRAPH
+
+#end
diff --git a/release/picobsd/router/crunch1/crunch.inc b/release/picobsd/router/crunch1/crunch.inc
new file mode 100644
index 000000000000..91ddee87cdbc
--- /dev/null
+++ b/release/picobsd/router/crunch1/crunch.inc
@@ -0,0 +1,12 @@
+# $FreeBSD$
+
+# Anything that you add to OPTS will be added to the build rules for each
+# program built.
+
+OPTS= -DNOPAM -DRELEASE_CRUNCH -DNOSECURE -DNOCRYPT -DNONETGRAPH -DNOIPSEC
+
+
+# Per program options can be added also...
+#ppp_OPTS= -DNOKLDLOAD -DNOINET6 -DNONAT -DNOATM -DNOSUID -DHAVE_DES -DNORADIUS -DNOI4B -DNONETGRAPH
+
+#end