diff --git a/release/picobsd/floppy.tree/etc/disktab b/release/picobsd/floppy.tree/etc/disktab
index 7575ba66e088..ba97b44bd5f4 100644
--- a/release/picobsd/floppy.tree/etc/disktab
+++ b/release/picobsd/floppy.tree/etc/disktab
@@ -14,7 +14,6 @@
 #	-i 65536 - bytes of data per i-node
 #	(the default -i value will render you with a floppy wasting way
 #	too much space in i-node areas)
-#
 
 fd360:\
 	:ty=floppy:se#512:nt#2:rm#300:ns#9:nc#40:\
@@ -84,4 +83,3 @@ zip100|zip 100:\
 	:pa#196608:oa#0:ba#4096:fa#512:\
 	:pb#196608:ob#0:bb#4096:fb#512:\
 	:pc#196608:oc#0:bc#4096:fc#512:
-
diff --git a/release/picobsd/floppy.tree/etc/fstab b/release/picobsd/floppy.tree/etc/fstab
index 64d34ca9b1ae..995314735fed 100644
--- a/release/picobsd/floppy.tree/etc/fstab
+++ b/release/picobsd/floppy.tree/etc/fstab
@@ -1,4 +1,5 @@
-#proc				/proc			procfs	rw 0 0
-#/dev/fd0c			/start_floppy		ufs	rw 1 1
-#/dev/wd0s1			/dos		msdos	rw 0 0
-#/dev/wcd0c			/cdrom		cd9660	ro,noauto 0 0
+proc				/proc		procfs	rw 0 0
+/dev/fd0c			/fd	ufs	rw,noauto 0 0
+/dev/wd0s1			/dos		msdos	rw,noauto 0 0
+/dev/wd0s1a			/wd		ufs	rw,noauto 0 0
+/dev/wcd0c			/cdrom		cd9660	ro,noauto 0 0
diff --git a/release/picobsd/floppy.tree/etc/gettytab b/release/picobsd/floppy.tree/etc/gettytab
index 90562acf2505..d2e252c97d1f 100644
--- a/release/picobsd/floppy.tree/etc/gettytab
+++ b/release/picobsd/floppy.tree/etc/gettytab
@@ -6,7 +6,6 @@ default:\
 P|Pc|Pc console:\
 	:ht:np:sp#115200:
 
-#
 # Fixed speed entries
 2|std.9600|9600-baud:\
 	:np:sp#9600:
@@ -19,7 +18,6 @@ std.57600|57600-baud:\
 std.115200|115200-baud:\
 	:np:sp#115200:
 
-#
 # Entry specifying explicit device settings.  See termios(4) and
 # /usr/include/termios.h, too.  The entry forces the tty into
 # CLOCAL mode (so no DCD is required), and uses Xon/Xoff flow control.
diff --git a/release/picobsd/floppy.tree/etc/hosts b/release/picobsd/floppy.tree/etc/hosts
new file mode 100644
index 000000000000..fdcd49b4b7c4
--- /dev/null
+++ b/release/picobsd/floppy.tree/etc/hosts
@@ -0,0 +1,14 @@
+# $FreeBSD$
+# This file contains ip <-> hostname mapping.
+# It is also used for autoconfiguration based on Ethernet address
+# and other things. The initial part is just a standard /etc/hosts
+# for local hosts that share this file.
+127.0.0.1		localhost localhost.mydomain.edu
+127.0.0.1		pico.mydomain.edu
+10.0.0.1	default
+
+#ethertable	This line starts the ethernet->hostname mapping
+# main_ether		hostname
+# 00:12:34:56:78:9a	myaddress
+# default		default
+
diff --git a/release/picobsd/floppy.tree/etc/login.conf b/release/picobsd/floppy.tree/etc/login.conf
index 1f2f02777ddd..c04ea6a95769 100644
--- a/release/picobsd/floppy.tree/etc/login.conf
+++ b/release/picobsd/floppy.tree/etc/login.conf
@@ -36,8 +36,6 @@ default:\
 	:umask=022:\
 	:tc=auth-defaults:
 
-
-#
 # standard - standard user defaults
 #
 standard:\
diff --git a/release/picobsd/floppy.tree/etc/mfs.rc b/release/picobsd/floppy.tree/etc/mfs.rc
index d746cb73d7a9..79fddf5d18d0 100644
--- a/release/picobsd/floppy.tree/etc/mfs.rc
+++ b/release/picobsd/floppy.tree/etc/mfs.rc
@@ -1,11 +1,9 @@
 #!/bin/sh
 # $FreeBSD$
-### WARNING !!!!!! #####
-# We remove this file during execution (see EOF).
+# WARNING !!! We remove this file during execution (see EOF).
 # Awful things happen if its size is > 1024B
 
 stty status '^T'
-
 trap : 2
 trap : 3
 
@@ -16,19 +14,16 @@ export PATH
 trap "echo 'Reboot interrupted'; exit 1" 3
 
 ### Special setup for one floppy PICOBSD ###
-echo ""
-echo "-------------------------------------------"
-echo "  Please wait. The system is coming up..."
-echo "-------------------------------------------"
-echo ""
-echo "Reading /etc from startup floppy..."
-mount -o rdonly /dev/fd0a /start_floppy
-cd /start_floppy/etc
-cp -Rp . /etc/
+set `df /` ; dev="/dev/$8"
+echo "Reading /etc from ${dev}..."
+mount -o rdonly ${dev} /mnt
+cd /mnt/etc ; cp -Rp . /etc/
+cp -Rp /mnt/root /
 cd /etc
+gzip -d *.gz
 pwd_mkdb -p ./master.passwd
-umount /start_floppy
-echo "Ok. (Now you can remove floppy if you like)"
+umount /mnt
+echo "Ok. (Now you can remove ${dev} if you like)"
 echo ""
 . rc
 exit 0
diff --git a/release/picobsd/floppy.tree/etc/protocols b/release/picobsd/floppy.tree/etc/protocols
index c80be39f693a..9555c28018a7 100644
--- a/release/picobsd/floppy.tree/etc/protocols
+++ b/release/picobsd/floppy.tree/etc/protocols
@@ -5,3 +5,7 @@ icmp	1	ICMP		# internet control message protocol
 igmp	2	IGMP		# Internet Group Management
 tcp	6	TCP		# transmission control protocol
 udp	17	UDP		# user datagram protocol
+ipv6	41	IPV6		# ipv6
+ospf	89	OSPFIGP		# Open Shortest Path First IGP
+pim	103	PIM		# Protocol Independent Multicast
+pgm	113	PGM		# PGM
diff --git a/release/picobsd/floppy.tree/etc/rc b/release/picobsd/floppy.tree/etc/rc
index 3181121a4cec..baeade72ab5b 100644
--- a/release/picobsd/floppy.tree/etc/rc
+++ b/release/picobsd/floppy.tree/etc/rc
@@ -53,6 +53,9 @@ if [ "X${inetd_enable}" = X"YES" ]; then
 	echo "Starting inetd."; inetd ${inetd_flags}
 fi
 
+[ "X${sshd_enable}" = "XYES" ] && [ -f /stand/sshd ] && \
+	sshd -f /etc/sshd_config
+
 dev_mkdb
 
 echo ''
@@ -60,18 +63,5 @@ if [ "x$swapfile" = "xNO" ]; then
 	echo "WARNING: no swap partition!"
 	echo "Don't run too many programs at the same time..."
 fi
-echo ''
-echo ''
-echo '+----------- PicoBSD @VER@ (ISP) ---------------+'
-echo '|                                              |'
-echo '| Log in as "root" (password "setup").         |'
-echo '|                                              |'
-echo '| This version of PicoBSD is fully under       |'
-echo '| BSD license. For more details see            |'
-echo '| http://www.freebsd.org/~picobsd, or contact  |'
-echo '| the author.                                  |'
-echo '|                                              |'
-echo '|                     abial@freebsd.org        |'
-echo '|                                              |'
-echo '+----------------------------------------------+'
+cat /etc/motd
 exit 0
diff --git a/release/picobsd/floppy.tree/etc/rc.conf b/release/picobsd/floppy.tree/etc/rc.conf
index c8548ca51b66..3756207066d2 100644
--- a/release/picobsd/floppy.tree/etc/rc.conf
+++ b/release/picobsd/floppy.tree/etc/rc.conf
@@ -7,45 +7,14 @@
 # here-document below can be used for autoconfiguration.
 # Remaining parameters are set using a switch.
 
-while read ether hostname ip mask ; do
-    if [ "$ether" = "$main_ether" -o "$ether" = "default" ] ; then
-        break
-    fi
-done <<__eof__
-# Insert here the description of the system
-# default terminates the search.
-# main_ether      hostname    ip           mask
-00:20:18:2f:f4:2e rizzo       131.114.9.26 0xffffff00
-00:c0:58:21:9e:a0 aula29      10.1.1.11    0xffffff00
-52:54:00:e0:f3:73 tlcradar    10.1.1.25    0xffffff00
-52:54:00:e3:55:2e troika      10.1.1.2     0xffffff00
-default           default     10.0.0.1     0xffffff00
-__eof__
-
-eval ifconfig_${main_if}=\"inet \$ip netmask \$mask\"
-network_interfaces=`ifconfig -l`
-
-case $hostname in 
-troika)
-    sysctl -w net.link.ether.bridge_cfg="ed4:2,ed5:1,ed6:1"
-    sysctl -w net.inet.ip.forwarding=1
-    ifconfig ed4 131.114.9.2 netmask 0xffffff00
-    ifconfig ed4 10.1.1.2 netmask 0xffffff00 alias
-    ifconfig ed5 131.114.5.129 netmask 0xffffff80
-    route add default 131.114.9.29
-    route add 131.114.5.0/26 131.114.5.130
-    route add 131.114.5.64/26 131.114.5.65
-    ;;
-esac
-
+rc_conf_set_defaults() {
 swapfile="NO"		# Set to name of swapfile if aux swapfile desired.
-###  Network configuration sub-section  ######################
-### Basic network options: ###
 firewall="NO"			# firewall type (see /etc/rc.firewall) or NO
 tcp_extensions="NO"		# Allow RFC1323 & RFC1644 extensions (or NO).
 ifconfig_lo0="inet 127.0.0.1"	# default loopback device configuration.
 #ifconfig_lo0_alias0="inet 127.0.0.254 netmask 0xffffffff" # Sample alias entry.
 ### Network daemons options: ###
+sshd_enable="YES"		# if present...
 inetd_enable="YES"		# Run the network daemon dispatcher (or NO)
 inetd_flags=""			# Optional flags to inetd
 snmpd_enable="NO"		# Run the SNMP daemon (or NO)
@@ -55,7 +24,30 @@ defaultrouter="NO"		# Set to default gateway (or NO).
 static_routes=""		# Set to static route list (or leave empty).
 gateway_enable="NO"		# Set to YES if this host will be a gateway.
 arpproxy_all=""			# replaces obsolete kernel option ARP_PROXYALL.
+mask="0xffffff00"
+}
+
+rc_conf_set_defaults
+
+hostname=""
+while read a b c ; do
+    if [ "$a" = "#ethertable" ] ; then
+        hostname="."
+    elif [ "X$hostname" = "X." -a "X$a" = "X#" -a "X$b" = "X$main_ether" ]
+    then
+	hostname=$c
+	break
+    fi
+done < /etc/hosts
+if [ "X$hostname" = "X" -o "X$hostname" = "X." ] ; then
+    hostname=default
+fi
+
+eval ifconfig_${main_if}=\" \$hostname netmask \$mask\"
+network_interfaces=`ifconfig -l`
+
 ### Allow local configuration override at the very end here ##
+### can make use of a case statement to set per-host things.
 if [ -f /etc/rc.conf.local ]; then
 	. /etc/rc.conf.local
 fi
diff --git a/release/picobsd/floppy.tree/etc/resolv.conf b/release/picobsd/floppy.tree/etc/resolv.conf
deleted file mode 100644
index 4438442fb0ed..000000000000
--- a/release/picobsd/floppy.tree/etc/resolv.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-# $FreeBSD$
-domain		mydomain.edu
-nameserver	192.33.4.12
diff --git a/release/picobsd/floppy.tree/etc/sshd_config b/release/picobsd/floppy.tree/etc/sshd_config
new file mode 100644
index 000000000000..bfc5f4c7d82d
--- /dev/null
+++ b/release/picobsd/floppy.tree/etc/sshd_config
@@ -0,0 +1,29 @@
+Port 22
+ListenAddress 0.0.0.0
+HostKey  /etc/ssh_host_key
+RandomSeed /etc/ssh_random_seed
+ServerKeyBits 768
+LoginGraceTime 600
+KeyRegenerationInterval 3600
+PermitRootLogin yes
+IgnoreRhosts no
+StrictModes yes
+QuietMode no
+X11Forwarding yes
+X11DisplayOffset 10
+FascistLogging no
+PrintMotd yes
+KeepAlive yes
+SyslogFacility AUTH
+RhostsAuthentication no
+RhostsRSAAuthentication yes
+RSAAuthentication yes
+PasswordAuthentication no
+PermitEmptyPasswords no
+UseLogin no
+# CheckMail no
+# PidFile /u/zappa/.ssh/pid
+# AllowHosts *.our.com friend.other.com
+# DenyHosts lowsecurity.theirs.com *.evil.org evil.org
+# Umask 022
+# SilentDeny yes
diff --git a/release/picobsd/floppy.tree/etc/termcap b/release/picobsd/floppy.tree/etc/termcap
index 5a9316af0295..dfbccb29debd 100644
--- a/release/picobsd/floppy.tree/etc/termcap
+++ b/release/picobsd/floppy.tree/etc/termcap
@@ -2,7 +2,8 @@
 # All rights reserved.
 #	@(#)termcap.src	5.88 (Berkeley) 4/30/91
 #
-# 
+# $FreeBSD$
+#
 # for syscons
 # common entry without semigraphics
 cons25w|ansiw|ansi80x25-raw:\
@@ -45,6 +46,54 @@ dosansi|ANSI.SYS standard crt|ansi:\
 	:kh=\EG:kb=^h:ku=\EH:kd=\EP:kl=\EK:kr=\EM:\
 	:k1=\E;:k2=\E<:k3=\E=:k4=\E>:k5=\E?:\
 	:k6=\E@:k7=\EA:k8=\EB:k9=\EC:k0=\ED:
+vt200|vt220|vt220am|vt200am|dec-vt220|dec-vt200|dec vt200 series with jump scroll:\
+	:@7=\E[4~:kD=\E[3~:kI=\E[2~:kN=\E[6~:kP=\E[5~:kh=\E[1~:\
+	:k6=\E[17~:k7=\E[18~:k8=\E[19~:k9=\E[20~:k;=\E[21~:\
+	:k1=\E[11~:k2=\E[12~:k3=\E[13~:k4=\E[14~:k5=\E[15~:\
+	:ve=\E[?25h:vi=\E[?25l:k0@:im@:ei@:\
+	:F1=\E[23~:F2=\E[24~:ic=\E[@:IC=\E[%d@:ec=\E[%dX:tc=vt102:
+vt100|dec-vt100|vt100-am|vt100am|dec vt100:\
+	:do=2\E[B:co#80:li#24:cl=50\E[H\E[J:sf=2*\ED:\
+	:le=^H:bs:am:cm=5\E[%i%d;%dH:nd=2\E[C:up=2\E[A:\
+	:ce=3\E[K:cd=50\E[J:so=2\E[7m:se=2\E[m:us=2\E[4m:ue=2\E[m:\
+	:md=2\E[1m:mr=2\E[7m:mb=2\E[5m:me=2\E[m:\
+	:is=\E>\E[?1;3;4;5l\E[?7;8h\E[1;24r\E[24;1H:\
+	:if=/usr/share/tabset/vt100:nw=2\EE:ho=\E[H:\
+	:as=2\E(0:ae=2\E(B:ac=llmmkkjjuuttvvwwqqxxnnpprr``aa:\
+	:rs=\E>\E[?1;3;4;5l\E[?7;8h:ks=\E[?1h\E=:ke=\E[?1l\E>:\
+	:ku=\EOA:kd=\EOB:kr=\EOC:kl=\EOD:kb=\177:\
+	:k0=\EOy:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:k5=\EOt:\
+	:k6=\EOu:k7=\EOv:k8=\EOl:k9=\EOw:k;=\EOx:@8=\EOM:\
+	:K1=\EOq:K2=\EOr:K3=\EOs:K4=\EOp:K5=\EOn:pt:sr=2*\EM:vt#3:xn:\
+	:sc=2\E7:rc=2\E8:cs=5\E[%i%d;%dr:UP=2\E[%dA:DO=2\E[%dB:RI=2\E[%dC:\
+	:LE=2\E[%dD:ct=2\E[3g:st=2\EH:ta=^I:ms:bl=^G:cr=^M:eo:it#8:ut:\
+	:RA=\E[?7l:SA=\E[?7h:
+xterm|vs100|xterm terminal emulator (X window system):\
+	:li#65:\
+	:kh=\EOH:@7=\EOF:kb=^H:kD=^?:\
+	:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:km:\
+	:is=\E>\E[?1;3;4;5l\E[?7;8h\E[1;65r\E[65;1H:\
+	:rs=\E>\E[?1;3;4;5l\E[?7;8h:\
+	:tc=vt220:
+
+
+vt100-nam|dec-vt100-nam|vt100nam|vt100 w/no am:\
+	:am@:xn@:\
+	:is=\E>\E[?1;3;4;5;7l\E[?8h\E[1;24r\E[24;1H:\
+	:rs=\E>\E[?1;3;4;5;7l\E[?8h:\
+	:tc=vt100-am:
+vt100-np|dec-vt100-np|vt100 with no padding (for psl games):\
+	:do=\E[B:cl=\E[H\E[J:sf=\ED:as=\E(0:ae=\E(B:\
+	:cm=\E[%i%d;%dH:nd=\E[C:up=\E[A:nw=\EE:\
+	:ce=\E[K:cd=\E[J:so=\E[7m:se=\E[m:us=\E[4m:ue=\E[m:\
+	:md=\E[1m:mr=\E[7m:mb=\E[5m:me=\E[m:sr=\EM:\
+	:sc=\E7:rc=\E8:cs=\E[%i%d;%dr:UP=\E[%dA:DO=\E[%dB:RI=\E[%dC:\
+	:LE=\E[%dD:ct=\E[3g:st=\EH:tc=vt100-am:
+vt100-nac|dec-vt100-nac|vt100 without pseudographics and padding:\
+	:as@:ae@:ac@:tc=vt100-np:
+vt102|dec-vt102-am|vt102am|vt100 w/adv. video:\
+	:al=\E[L:dl=\E[M:im=\E[4h:ei=\E[4l:mi:dc=\E[P:\
+	:AL=\E[%dL:DL=\E[%dM:DC=\E[%dP:tc=vt100-np:
 
 # Note: this entry describes the "native"
 # capabilities of the PC monochrome display, without ANY emulation; most
@@ -58,13 +107,8 @@ pc3mono|IBM PC 386BSD Console with monochrome monitor:\
 pc3|ibmpc3|IBM PC 386BSD Console:\
 	:Co#8:\
 	:DO=\E[%dB:\
-	:F1=\E[W:\
-	:F2=\E[X:\
-	:K1=\E[H:\
-	:K2=\E[I:\
-	:K3=\E[E:\
-	:K4=\E[F:\
-	:K5=\E[G:\
+	:F1=\E[W:F2=\E[X:\
+	:K1=\E[H:K2=\E[I:K3=\E[E:K4=\E[F:K5=\E[G:\
 	:LE=\E[%dD:\
 	:RI=\E[%dC:\
 	:Sb=\E[1;%dx:\
@@ -85,16 +129,7 @@ pc3|ibmpc3|IBM PC 386BSD Console:\
 	:ho=\E[H:\
 	:is=\E[m:\
 	:it#8:\
-	:k;=\E[V:\
-	:k1=\E[M:\
-	:k2=\E[N:\
-	:k3=\E[O:\
-	:k4=\E[P:\
-	:k5=\E[Q:\
-	:k6=\E[R:\
-	:k7=\E[S:\
-	:k8=\E[T:\
-	:k9=\E[U:\
+	:k;=\E[V:k1=\E[M:k2=\E[N:k3=\E[O:k4=\E[P:k5=\E[Q:k6=\E[R:k7=\E[S:k8=\E[T:k9=\E[U:\
 	:kD=\177:\
 	:@7=\E[F:\
 	:kN=\E[G:\
diff --git a/release/picobsd/floppy.tree/etc/ttys b/release/picobsd/floppy.tree/etc/ttys
index 8ef5e6ebb37f..33fe991b85ad 100644
--- a/release/picobsd/floppy.tree/etc/ttys
+++ b/release/picobsd/floppy.tree/etc/ttys
@@ -12,21 +12,21 @@ ttyv0	"/usr/libexec/getty Pc"		cons25	on  secure
 # Virtual terminals
 ttyv1	"/usr/libexec/getty Pc"		cons25	on  secure
 ttyv2	"/usr/libexec/getty Pc"		cons25	on  secure
-#ttyv3	"/usr/libexec/getty Pc"		cons25	on  secure
-#ttyv4	"/usr/libexec/getty Pc"		cons25	on  secure
-#ttyv5	"/usr/libexec/getty Pc"		cons25	on  secure
-#ttyv6	"/usr/libexec/getty Pc"		cons25	on  secure
-#ttyv7	"/usr/libexec/getty Pc"		cons25	on  secure
+ttyv3	"/usr/libexec/getty Pc"		cons25	on  secure
+ttyv4	"/usr/libexec/getty Pc"		cons25	on  secure
+ttyv5	"/usr/libexec/getty Pc"		cons25	on  secure
+ttyv6	"/usr/libexec/getty Pc"		cons25	on  secure
+ttyv7	"/usr/libexec/getty Pc"		cons25	on  secure
 #ttyv8	"/usr/libexec/getty Pc"		cons25	on  secure
 #ttyv9	"/usr/libexec/getty Pc"		cons25	on  secure
 # Pseudo terminals
 ttyp0	none			network secure
 ttyp1	none			network secure
 ttyp2	none			network secure
-ttyp3	none			network
-ttyp4	none			network
-ttyp5	none			network
-ttyp6	none			network
-ttyp7	none			network
-ttyp8	none			network
-ttyp9	none			network
+ttyp3	none			network secure
+ttyp4	none			network secure
+ttyp5	none			network secure
+ttyp6	none			network secure
+ttyp7	none			network secure
+ttyp8	none			network secure
+ttyp9	none			network secure
diff --git a/release/picobsd/floppy.tree/etc/update b/release/picobsd/floppy.tree/etc/update
new file mode 100755
index 000000000000..b5aae37508b6
--- /dev/null
+++ b/release/picobsd/floppy.tree/etc/update
@@ -0,0 +1,22 @@
+#!/bin/sh
+# $FreeBSD$
+pwd=`pwd`
+set `df /` ; dev="/dev/$8"
+echo -n "Updating /etc contents on ${dev}... "
+mount ${dev} /mnt
+if [ "X$?" != "X0" ] ; then
+	echo ""
+	echo "Cannot mount ${dev} read-write!"
+	exit 1
+fi
+cd /etc
+rm *.db
+rm passwd
+cp -Rp . /mnt/etc/
+pwd_mkdb master.passwd
+echo " Done."
+echo -n "Updating kernel parameters...  "
+kget /mnt/boot/kernel.conf
+umount /mnt
+cd ${pwd}
+echo " Done."