--- rescue/rescue/Makefile.orig	2009-05-23 11:30:38.830094000 +0900
+++ rescue/rescue/Makefile	2009-05-24 15:45:10.351672110 +0900
@@ -72,7 +72,7 @@
 CRUNCH_PROGS_bin= cat chflags chio chmod cp date dd df echo 	\
 	 ed expr getfacl hostname kenv kill ln ls mkdir mv	\
 	 pkill ps pwd realpath rm rmdir setfacl sh stty sync test
-CRUNCH_LIBS+= -lcrypt -ledit -lkvm -ll -ltermcap -lutil
+CRUNCH_LIBS+= -lcrypt -ledit -lkvm -ll -ltermcap
 
 # Additional options for specific programs
 CRUNCH_ALIAS_test= [
@@ -143,7 +143,7 @@
 .if ${MK_ZFS} != "no"
 CRUNCH_LIBS+= -lzfs -lnvpair -luutil -lavl
 .endif
-CRUNCH_LIBS+= -lgeom -lbsdxml -lkiconv -lmd -lreadline -lsbuf -lufs -lz
+CRUNCH_LIBS+= -lgeom -lbsdxml -lkiconv -lreadline -lsbuf -lufs
 
 .if ${MACHINE_ARCH} == "i386"
 CRUNCH_PROGS_sbin+= bsdlabel sconfig fdisk
@@ -209,10 +209,7 @@
 CRUNCH_LIBS+= -lbz2
 
 CRUNCH_PROGS_usr.bin+= tar
-CRUNCH_LIBS+= -larchive -lmd
-.if ${MK_OPENSSL} != "no"
-CRUNCH_LIBS+= -lcrypto
-.endif
+CRUNCH_LIBS+= -larchive
 
 CRUNCH_PROGS_usr.bin+= vi
 CRUNCH_ALIAS_vi= ex
@@ -220,6 +217,23 @@
 CRUNCH_PROGS_usr.bin+= id
 CRUNCH_ALIAS_id= groups whoami
 
+CRUNCH_PROGS_usr.bin+= ssh
+CRUNCH_PROGS_usr.bin+= scp
+CRUNCH_BUILDOPTS_scp= BINDIR=${BINDIR}
+CRUNCH_PROGS_usr.bin+= ssh-add
+CRUNCH_PROGS_usr.bin+= ssh-agent
+CRUNCH_PROGS_usr.bin+= ssh-keygen
+CRUNCH_LIBS+= -lssh
+.if ${MK_KERBEROS_SUPPORT} != "no"
+CRUNCH_LIBS+= -lgssapi
+.endif
+
+CRUNCH_SRCDIR_ssh= ${.CURDIR}/../../secure/usr.bin/ssh
+CRUNCH_SRCDIR_scp= ${.CURDIR}/../../secure/usr.bin/scp
+CRUNCH_SRCDIR_ssh-add= ${.CURDIR}/../../secure/usr.bin/ssh-add
+CRUNCH_SRCDIR_ssh-agent= ${.CURDIR}/../../secure/usr.bin/ssh-agent
+CRUNCH_SRCDIR_ssh-keygen= ${.CURDIR}/../../secure/usr.bin/ssh-keygen
+
 ##################################################################
 # Programs from stock /usr/sbin
 #
@@ -230,7 +244,10 @@
 CRUNCH_PROGS_usr.sbin+= chown
 CRUNCH_ALIAS_chown= chgrp
 ##################################################################
-CRUNCH_LIBS+= -lm
+.if ${MK_OPENSSL} != "no"
+CRUNCH_LIBS+= -lcrypto
+.endif
+CRUNCH_LIBS+= -lmd -lutil -lz -lm
 
 ##################################################################
 #  The following is pretty nearly a generic crunchgen-handling makefile