diff --git a/admin/charsets/Makefile b/admin/charsets/Makefile
index a38c20c8ade..f3698285668 100644
--- a/admin/charsets/Makefile
+++ b/admin/charsets/Makefile
@@ -293,6 +293,10 @@ CNS-7.map: ${MISC_CHARMAPS}/cns2ucsdkw.txt mapconv compact.awk
 	# Generating $@...
 	@mapconv $< '/^C7/' KANJI-DATABASE compact.awk > $@
 
+CNS-F.map: ${GLIBC_CHARMAPS}/EUC-TW mapconv compact.awk
+	# Generating $@...
+	@mapconv $< '/^<.*\/x8e\/xaf/ s,/x8e/xaf,,' GLIBC-2-7 compact.awk > $@
+
 # General target to produce map files for mule charsets.
 MULE-%.map: mule-charsets.el
 	# Generating $@...
diff --git a/admin/charsets/mapconv b/admin/charsets/mapconv
index 905d7ba25bb..aca1008125e 100755
--- a/admin/charsets/mapconv
+++ b/admin/charsets/mapconv
@@ -38,7 +38,7 @@ BASE=`basename $1`
 
 case "$3" in
     GLIBC*)
-	SOURCE=`glibc-2.3.2/localedata/charmaps/${BASE}`;;
+	SOURCE="glibc-2.3.2/localedata/charmaps/${BASE}";;
     CZYBORRA)
 	SOURCE="http://czyborra.com/charsets/${BASE}";;
     IANA)