Index: tools/cldr2def.pl
===================================================================
--- tools/cldr2def.pl	(revision 292467)
+++ tools/cldr2def.pl	(working copy)
@@ -805,6 +805,14 @@
 		$MAPLOC = "MAPLOC=\t\t\${.CURDIR}/../../tools/tools/" .
 				"locale/etc/final-maps\n";
 		$SRCOUT2 = "LC_COLLATE";
+		$SRCOUT3 = "## LOCALES_MAPPED\n\n" .
+			".for f t in \${LOCALES_MAPPED}\n" .
+			"FILES+=\t\$t.LC_COLLATE\n" .
+			"\$t.LC_COLLATE: \${.CURDIR}/\$f.src\n" .
+			"\tlocaledef -D -U -i \${.ALLSRC} \\\n" .
+			"\t\t-f \${MAPLOC}/map.\${.TARGET:T:R:E} \\\n" .
+			"\t\t\${.OBJDIR}/\${.TARGET:T:R}\n" .
+			".endfor\n\n"
 	}
 	elsif ($TYPE eq "ctypedef") {
 		$SRCOUT = "localedef -D -U -c -w \${MAPLOC}/widths.txt \\\n" .
Index: tools/finalize
===================================================================
--- tools/finalize	(revision 292468)
+++ tools/finalize	(working copy)
@@ -26,6 +26,7 @@
 TEMP=/tmp/${1}.locales
 TEMP2=/tmp/${1}.hashes
 TEMP3=/tmp/${1}.symlinks
+TEMP4=/tmp/${1}.mapped
 FULLMAP=/tmp/utf8-map
 FULLEXTRACT=/tmp/extracted-names
 AWKCMD="/## PLACEHOLDER/ { \
@@ -32,6 +33,8 @@
 	  while ( getline line < \"${TEMP}\" ) {print line} } \
 	/## SYMPAIRS/ { \
 	  while ( getline line < \"${TEMP3}\" ) {print line} } \
+	/## LOCALES_MAPPED/ { \
+	  while ( getline line < \"${TEMP4}\" ) {print line} } \
 	!/## / { print \$0 }"
 
 grep '^LOCALES+' ${old}/Makefile > ${TEMP}
@@ -73,6 +76,25 @@
 		echo map ${map} converted.
 	done
 
+elif [ $1 = "colldef" ]
+then
+	awk -v tmp4=${TEMP4} '$1 == "SAME+=" && $0 !~ /legacy/ {
+		orig=$2
+		dest=$3
+		gsub(/.*\./, "", orig)
+		gsub(/.*\./, "", dest)
+		if (orig != dest )
+			print "LOCALES_MAPPED+=\t"$2 " "$3 > tmp4
+		}' ${old}/Makefile
+
+	for line in $(awk '{ print $3 }' ${TEMP4}); do
+		sed -i '' "/^SAME.*$line$/d" ${old}/Makefile
+	done
+	keep=$(cat ${TEMP} | awk '{ print $2 }')
+	for original in ${keep}
+	do
+		cp ${old}/${original}.src ${new}/
+	done
 else  # below is everything but ctypedef
 
 	keep=$(cat ${TEMP} | awk '{ print $2 }')
@@ -85,4 +107,4 @@
 
 grep -v '^LOCALES+' ${old}/Makefile | awk "${AWKCMD}" > ${new}/Makefile
 
-rm -f ${TEMP} ${TEMP3}
+rm -f ${TEMP} ${TEMP3} ${TEMP4}