diff --git a/crypto/openssh/freebsd-pre-merge.sh b/crypto/openssh/freebsd-pre-merge.sh
index 676cabfd506c..473474c2c4da 100755
--- a/crypto/openssh/freebsd-pre-merge.sh
+++ b/crypto/openssh/freebsd-pre-merge.sh
@@ -1,17 +1,17 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 
 :>keywords
 :>rcsid
-find . -type f -name '*.[1-9ch]' | cut -c 3- | \
+svn list -R | grep -v '/$' | \
 while read f ; do
 	svn proplist -v $f | grep -q 'FreeBSD=%H' || continue
-	egrep -l '(\.\\"|/\*) \$FreeBSD[:\$]' $f >>keywords
+	egrep -l '^(#|\.\\"|/\*)[[:space:]]+\$FreeBSD[:\$]' $f >>keywords
 	egrep -l '__RCSID\("\$FreeBSD[:\$]' $f >>rcsid
 done
 sort -u keywords rcsid | xargs perl -n -i -e '
 	$strip = $ARGV if /\$(Id|OpenBSD):.*\$/;
 	print unless (($strip eq $ARGV || /__RCSID/) && /\$FreeBSD[:\$]/);
 '