I found a missing / in the .if that protects the addition of the ssh config files. The result is that they will never be installed. With this patch mergemaster was able to install them. John -- John Hay -- [EMAIL PROTECTED] Index: etc/Makefile =================================================================== RCS file: /home/ncvs/src/etc/Makefile,v retrieving revision 1.215 diff -u -r1.215 Makefile --- etc/Makefile 2000/02/25 05:16:44 1.215 +++ etc/Makefile 2000/02/25 09:08:51 @@ -20,7 +20,7 @@ ${.CURDIR}/../usr.bin/mail/misc/mail.rc \ ${.CURDIR}/../usr.bin/locate/locate/locate.rc -.if exists(${.CURDIR}../crypto) && !defined(NO_OPENSSH) +.if exists(${.CURDIR}/../crypto) && !defined(NO_OPENSSH) BIN1+= ${.CURDIR}/../crypto/openssh/ssh_config \ ${.CURDIR}/../crypto/openssh/sshd_config .endif To Unsubscribe: send mail to [EMAIL PROTECTED] with "unsubscribe freebsd-current" in the body of the message