--- tools/build/mk/OptionalObsoleteFiles.inc.orig	2014-09-27 18:41:31.417428786 -0400
+++ tools/build/mk/OptionalObsoleteFiles.inc	2014-09-27 18:59:09.412360498 -0400
@@ -2044,9 +2044,11 @@
 .endif
 
 .if ${MK_KERBEROS} == no
+OLD_FILES+=usr/bin/asn1_compile
 OLD_FILES+=usr/bin/compile_et
 OLD_FILES+=usr/bin/hxtool
 OLD_FILES+=usr/bin/kadmin
+OLD_FILES+=usr/bin/kcc
 OLD_FILES+=usr/bin/kdestroy
 OLD_FILES+=usr/bin/kf
 OLD_FILES+=usr/bin/kgetcred
@@ -2056,6 +2058,8 @@
 OLD_FILES+=usr/bin/krb5-config
 OLD_FILES+=usr/bin/ksu
 OLD_FILES+=usr/bin/kswitch
+OLD_FILES+=usr/bin/make-roken
+OLD_FILES+=usr/bin/slc
 OLD_FILES+=usr/bin/string2key
 OLD_FILES+=usr/bin/verify_krb5_conf
 OLD_FILES+=usr/include/asn1-common.h
@@ -3432,18 +3436,25 @@
 #.endif
 
 .if ${MK_OPENSSH} == no
+OLD_FILES+=etc/rc.d/sshd
+OLD_FILES+=usr/bin/scp
 OLD_FILES+=usr/bin/sftp
+OLD_FILES+=usr/bin/slogin
 OLD_FILES+=usr/bin/ssh
 OLD_FILES+=usr/bin/ssh-add
 OLD_FILES+=usr/bin/ssh-agent
 OLD_FILES+=usr/bin/ssh-copy-id
 OLD_FILES+=usr/bin/ssh-keygen
 OLD_FILES+=usr/bin/ssh-keyscan
+OLD_LIBS+=usr/lib/pam_ssh.so
+OLD_LIBS+=usr/lib/pam_ssh.so.5
 OLD_FILES+=usr/lib/private/libssh.a
 OLD_FILES+=usr/lib/private/libssh.so
 OLD_LIBS+=usr/lib/private/libssh.so.5
 OLD_FILES+=usr/lib/private/libssh_p.a
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64"
+OLD_LIBS+=usr/lib32/pam_ssh.so
+OLD_LIBS+=usr/lib32/pam_ssh.so.5
 OLD_FILES+=usr/lib32/private/libssh.a
 OLD_FILES+=usr/lib32/private/libssh.so
 OLD_LIBS+=usr/lib32/private/libssh.so.5
@@ -3453,6 +3464,18 @@
 OLD_FILES+=usr/libexec/ssh-keysign
 OLD_FILES+=usr/libexec/ssh-pkcs11-helper
 OLD_FILES+=usr/sbin/sshd
+OLD_FILES+=usr/share/man/man1/ssh-add.1.gz
+OLD_FILES+=usr/share/man/man1/ssh-keygen.1.gz
+OLD_FILES+=usr/share/man/man1/ssh-agent.1.gz
+OLD_FILES+=usr/share/man/man1/ssh-copy-id.1.gz
+OLD_FILES+=usr/share/man/man1/ssh.1.gz
+OLD_FILES+=usr/share/man/man1/ssh-keyscan.1.gz
+OLD_FILES+=usr/share/man/man8/sshd.8.gz
+OLD_FILES+=usr/share/man/man8/pam_ssh.8.gz
+OLD_FILES+=usr/share/man/man8/ssh-keysign.8.gz
+OLD_FILES+=usr/share/man/man8/ssh-pkcs11-helper.8.gz
+OLD_FILES+=usr/share/man/man5/sshd_config.5.gz
+OLD_FILES+=usr/share/man/man5/ssh_config.5.gz
 .endif
 
 #.if ${MK_OPENSSL} == no