diff --git a/release/picobsd/bridge/PICOBSD b/release/picobsd/bridge/PICOBSD
index 3d206efb2a0..47f88963265 100644
--- a/release/picobsd/bridge/PICOBSD
+++ b/release/picobsd/bridge/PICOBSD
@@ -16,8 +16,8 @@ cpu		I586_CPU
 cpu		I686_CPU
 ident		PICOBSD
 
-options                SMP
-device apic
+options		SMP
+device	apic
 
 options		SCHED_4BSD		# mandatory to have one scheduler
 #options	MATH_EMULATE		#Support for x87 emulation
@@ -48,7 +48,7 @@ options		DUMMYNET
 device		if_bridge
 # Running with less than 1000 seems to give poor timing on
 # qemu, so we set HZ explicitly.
-options         HZ=1000
+options		HZ=1000
 
 device		random			# used by ssh
 device		pci
diff --git a/release/picobsd/bridge/crunch.conf b/release/picobsd/bridge/crunch.conf
index c81d00f7877..2a64021fad9 100644
--- a/release/picobsd/bridge/crunch.conf
+++ b/release/picobsd/bridge/crunch.conf
@@ -180,4 +180,4 @@ libs_so -lkvm
 libs_so -lz
 libs_so -lbsdxml
 libs_so -lsbuf
-libs_so -ljail		# used by ifconfig
+libs_so -ljail	# used by ifconfig
diff --git a/release/picobsd/build/mfs.mtree b/release/picobsd/build/mfs.mtree
index 5c8e70ce6b2..28c0d39ec77 100644
--- a/release/picobsd/build/mfs.mtree
+++ b/release/picobsd/build/mfs.mtree
@@ -58,6 +58,8 @@
     var            
         db             
         ..
+	empty
+	..
         run            
         ..
         spool          
diff --git a/release/picobsd/floppy.tree/etc/master.passwd b/release/picobsd/floppy.tree/etc/master.passwd
index e9bb1cee3bd..e649b84d847 100644
--- a/release/picobsd/floppy.tree/etc/master.passwd
+++ b/release/picobsd/floppy.tree/etc/master.passwd
@@ -1,3 +1,4 @@
+# $FreeBSD$
 root:$1$xOOaGnKU$U9QdsCI40XXcCUMBN.7Az.:0:0::0:0:Charlie &:/root:/bin/sh
 toor:*:0:0::0:0:Bourne-again Superuser:/root:
 daemon:*:1:1::0:0:Owner of many system processes:/root:/nonexistent
@@ -5,4 +6,5 @@ operator:*:2:20::0:0:System &:/usr/guest/operator:/bin/csh
 bin:*:3:7::0:0:Binaries Commands and Source,,,:/:/nonexistent
 tty:*:4:65533::0:0:Tty Sandbox:/:/nonexistent
 nobody:*:65534:65534::0:0:Unprivileged user:/nonexistent:/nonexistent
+_dhcp:*:65:65::0:0:dhcp programs:/var/empty:/usr/sbin/nologin
 user:*:1002:1002:Sample User:0:0:user:/home/user:/bin/sh