diff --git a/sys/arch/pc532/conf/BULLBOX b/sys/arch/pc532/conf/BULLBOX
index 574be1f5648b..2624579c7f2d 100644
--- a/sys/arch/pc532/conf/BULLBOX
+++ b/sys/arch/pc532/conf/BULLBOX
@@ -1,4 +1,4 @@
-#	$NetBSD: BULLBOX,v 1.4 1999/07/29 10:37:21 augustss Exp $
+#	$NetBSD: BULLBOX,v 1.5 1999/12/08 04:46:40 jonb Exp $
 #
 # BULLBOX: Kernel for Jon Buller's machine
 #
@@ -21,11 +21,10 @@ options		SYSVSHM			# System V shared memory
 options		SHMMAXPGS=1024
 
 # compatibility options
-options 	COMPAT_12		# NetBSD 1.2,
+#options 	COMPAT_12		# NetBSD 1.2,
 options		COMPAT_13		# NetBSD 1.3,
 options		COMPAT_14		# NetBSD 1.4,
 options 	COMPAT_43		# and 4.3BSD
-#options 	TCP_COMPAT_42		# TCP bug compatibility with 4.2BSD
 
 # file system options
 file-system	FFS			# Berkeley fast file system
@@ -41,11 +40,25 @@ file-system     PROCFS                  # proc file system
 options		SETUIDSCRIPTS
 options		NFSSERVER		# Network File System server
 #options	QUOTA			# file system quotas
+options		SOFTDEP			# FFS soft updates support.
+
+# Pull in config fragments for kernel crypto.  This is required for
+# options IPSEC etc. to work.
+
+prefix ../domestic/sys
+cinclude "conf/files.crypto-us"
+prefix
 
 # networking options
 options		GATEWAY			# packet forwarding
 options		INET			# IP + ICMP + TCP + UDP
-options		PPP_BSDCOMP,PPP_DEFLATE	# compression for PPP
+options		INET6			# IPV6
+options		IPSEC			# IP security
+options		IPSEC_ESP	# IP security (encryption part; define w/IPSEC)
+#options	IPSEC_DEBUG		# debug for IP security
+#options 	TCP_COMPAT_42		# TCP bug compatibility with 4.2BSD
+options		PPP_BSDCOMP		# compression for PPP
+options		PPP_DEFLATE		# more compression for PPP
 
 # pc532 specific options
 options		NS381			# FPU installed
@@ -53,19 +66,24 @@ options		NS381			# FPU installed
 
 config		netbsd	root on ? type ?
 
-sd0 at scsibus0 target 0 lun ?		# SCSI disks
-sd1 at scsibus0 target 1 lun ?		# SCSI disks
+sd0 at scsibus0 target 0 lun ?		# Seagate ST15230W
+sd1 at scsibus0 target 1 lun ?		# Micropolis 2210
+st0 at scsibus? target ? lun ?		# Archive Viper 150
+
 sd* at scsibus? target ? lun ?		# SCSI disks
 st* at scsibus? target ? lun ?		# SCSI tapes
 cd* at scsibus? target ? lun ?		# SCSI CD-ROMs
-se* at scsibus0 target ? lun ?		# Cabletron EA412/EA419
+ss* at scsibus? target ? lun ?		# SCSI scanners
+se* at scsibus0 target ? lun ?		# SCSI ethernet
 uk* at scsibus? target ? lun ?		# All the things we don't know
 
-pseudo-device	pty 16			# pseudo-terminals
-pseudo-device	loop 1			# loopback network
-pseudo-device	vnd 2			# vnode devices
-pseudo-device	bpfilter 4		# packet filter
+pseudo-device	pty		16	# pseudo-terminals
+pseudo-device	loop		1	# loopback network
+pseudo-device	vnd		2	# vnode devices
+pseudo-device	bpfilter	4	# packet filter
 pseudo-device	ipfilter
-pseudo-device	ppp 4			# Point-to-Point Protocol
-pseudo-device	tun 1			# network tunneling
+pseudo-device	ppp		4	# Point-to-Point Protocol
+pseudo-device	tun		1	# network tunneling
 pseudo-device	rnd			# kernel random number generator
+pseudo-device	gif		4	# IPv[46] over IPv[46] tunnel (RFC1933)
+pseudo-device	faith		1	# IPv[46] tcp relay translation i/f