@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-#	$NetBSD: heimdal2netbsd,v 1.6 2014/04/22 14:07:31 pettai Exp $
+#	$NetBSD: heimdal2netbsd,v 1.7 2017/01/27 18:02:09 christos Exp $
 #
 # Copyright (c) 2011 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -184,15 +184,15 @@
 	echo froze NetBSD RCSID for $f
 done
 
+### Remove the $'s around RCS tags
+cleantags $d
+
 # Convert unexpanded RCSID's to the NetBSD way.
-find $d -type f -print | xargs egrep -l 'RCSID\("\$Id\$"\)' | while read f; do
-	sed -e 's/RCSID("\$\Id\$")/__RCSID("\$NetBSD\$")/' \
+find $d -type f -print | xargs egrep -l 'RCSID\("Id"\)' | while read f; do
+	sed -e 's/RCSID("Id")/__RCSID("\$NetBSD\$")/' \
 	    < $f > /tmp/heimdal1f$$ && mv /tmp/heimdal1f$$ $f && \
 	echo converted RCSID to NetBSD for $f
 done
-
-### Remove the $'s around RCS tags
-cleantags $d
 
 ### Add our NetBSD RCS Id
 find $d -type f -name '*.[chly]' -print | while read c; do