diff --git a/share/mklocale/hi_IN.ISCII-DEV.src b/share/mklocale/hi_IN.ISCII-DEV.src
index 9dee7c9f1ec4..9e8c82d4bfa1 100644
--- a/share/mklocale/hi_IN.ISCII-DEV.src
+++ b/share/mklocale/hi_IN.ISCII-DEV.src
@@ -24,6 +24,8 @@ PRINT		0x20 - 0xfa
 # SPECIAL
 # PHONEGRAM
 
+/* ?DIGIT         'ñ' - 'ú' */
+
 MAPLOWER       	<'A' - 'Z' : 'a'>
 MAPLOWER       	<'a' - 'z' : 'a'>
 MAPUPPER       	<'A' - 'Z' : 'A'>
diff --git a/share/mklocale/ja_JP.SJIS.src b/share/mklocale/ja_JP.SJIS.src
index 2358c820de29..5ddffd656575 100644
--- a/share/mklocale/ja_JP.SJIS.src
+++ b/share/mklocale/ja_JP.SJIS.src
@@ -29,6 +29,8 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
+ * $FreeBSD$
  */
 
 ENCODING	"MSKanji"
@@ -44,7 +46,7 @@ LOWER		'a'-'z'
 PUNCT		0x21-0x2f 0x3a-0x40 0x5b-0x60 0x7b-0x7e
 SPACE		0x09-0x0d 0x20
 UPPER		'A'-'Z'
-XDIGIT		'a'-'f' 'A'-'F'
+XDIGIT          '0'-'9' 'a'-'f' 'A'-'F'
 BLANK		' ' '\t'
 PRINT		0x20-0x7e
 /* SWIDTH1		0x20-0x7e */
@@ -78,8 +80,8 @@ PUNCT		0x819f-0x81ac 0x81b8-0x81bf 0x81c8-0x81ce 0x81da-0x81e8
 PUNCT		0x81f0-0x81f7 0x81fc
 
 /* 300 */
-DIGIT		0x824f-0x8258
-XDIGIT		0x8260-0x8265 0x8281-0x8286
+/* ?DIGIT           0x824f-0x8258 */
+/* ?XDIGIT          0x8260-0x8265 0x8281-0x8286 */
 ALPHA		0x8260-0x8279 0x8281-0x829a
 UPPER		0x8260-0x8279
 LOWER		0x8281-0x829a
diff --git a/share/mklocale/ja_JP.eucJP.src b/share/mklocale/ja_JP.eucJP.src
index 88fdc91ddcd5..3e6255227487 100644
--- a/share/mklocale/ja_JP.eucJP.src
+++ b/share/mklocale/ja_JP.eucJP.src
@@ -2,6 +2,8 @@
 
 /*
  * Japanese LOCALE_CTYPE definitions using EUC of JIS character sets
+ *
+ * $FreeBSD$
  */
 
 ENCODING	"EUC"
@@ -47,7 +49,7 @@ PUNCT		0xa1a2 - 0xa1f8		/* A few too many in here... */
 SPECIAL		0xa2a1 - 0xa2ae 0xa2ba - 0xa2c1 0xa2ca - 0xa2d0 0xa2dc - 0xa2ea
 SPECIAL		0xa2f2 - 0xa2f9 0xa2fe
 
-DIGIT		0xa3b0 - 0xa3b9
+/* ?DIGIT           0xa3b0 - 0xa3b9 */
 UPPER		0xa3c1 - 0xa3da				/* Romaji */
 LOWER		0xa3e1 - 0xa3fa				/* Romaji */
 MAPLOWER	< 0xa3c1 - 0xa3da : 0xa3e1 >		/* English */
@@ -55,7 +57,7 @@ MAPLOWER	< 0xa3e1 - 0xa3fa : 0xa3e1 >		/* English */
 MAPUPPER	< 0xa3c1 - 0xa3da : 0xa3c1 >
 MAPUPPER	< 0xa3e1 - 0xa3fa : 0xa3c1 >
 
-XDIGIT		0xa3c1 - 0xa3c6 0xa3e1 - 0xa3e6
+/* ?XDIGIT          0xa3c1 - 0xa3c6 0xa3e1 - 0xa3e6 */
 
 TODIGIT		< 0xa3b0 - 0xa3b9 : 0 >
 TODIGIT		< 0xa3c1 - 0xa3c6 : 10 >
diff --git a/share/mklocale/ko_KR.eucKR.src b/share/mklocale/ko_KR.eucKR.src
index ce54ab32c9fb..cb91eae3d819 100644
--- a/share/mklocale/ko_KR.eucKR.src
+++ b/share/mklocale/ko_KR.eucKR.src
@@ -7,7 +7,8 @@
  * Last Updated on Mar 24 1997
  *
  * It is based on manpage mklocale(1), euc(4), ja_JP.EUC.src.
- * 
+ *
+ * $FreeBSD$
  */
 
 ENCODING     "EUC"
@@ -47,12 +48,12 @@ TODIGIT	     < 'A' - 'F' : 10 > < 'a' - 'f' : 10 >
  * Code Set 2, EUC-KR
  */
 ALPHA        0xa3c1 - 0xa3da 0xa3e1 - 0xa3fa
-DIGIT        0xa3b0 - 0xa3b9
+/* ?DIGIT        0xa3b0 - 0xa3b9 */
 UPPER        0xa3c1 - 0xa3da
 LOWER        0xa3e1 - 0xa3fa
 PUNCT	     0xa3a1 - 0xa3af 0xa3ba - 0xa3c0 0xa3db - 0xa3e0 0xa3fb - 0xa3fe
 SPACE	     0xa1a1
-XDIGIT       0xa3b0 - 0xa3b9 0xa3c1 - 0xa3c6 0xa3e1 - 0xa3e6
+/* ?XDIGIT       0xa3b0 - 0xa3b9 0xa3c1 - 0xa3c6 0xa3e1 - 0xa3e6 */
 BLANK        0xa1a1
 PRINT        0xa1a1 - 0xfefe
 SPECIAL	     0xa1a2 - 0xa2e5
@@ -73,7 +74,7 @@ LOWER	     0xacd1 - 0xacf1			     /* Cyrillic */
 MAPLOWER     < 0xaca1 - 0xacc1 : 0xacd1 > < 0xacd1 - 0xacf1 : 0xacd1 >
 MAPUPPER     < 0xaca1 - 0xacc1 : 0xaca1 > < 0xacd1 - 0xacf1 : 0xaca1 >
 
-DIGIT	     0xa5a1 - 0xa5aa  0xa5b0 - 0xa5b9 /* Greek Digit */ 
+/* ?DIGIT        0xa5a1 - 0xa5aa  0xa5b0 - 0xa5b9 */ /* Greek Digit */
 SPECIAL      0xa6a1 - 0xa6e4  0xa7a1 - 0xa7ef /* Symbols */
 SPECIAL      0xa8a1 - 0xa8fe  0xa9a1 - 0xa9fe /* Circle Symbols */
 
diff --git a/share/mklocale/la_LN.ISO8859-2.src b/share/mklocale/la_LN.ISO8859-2.src
index a9fa03fc89e5..43a5e058d748 100644
--- a/share/mklocale/la_LN.ISO8859-2.src
+++ b/share/mklocale/la_LN.ISO8859-2.src
@@ -27,7 +27,7 @@ SPACE		0x09 - 0x0d 0x20 0xa0
 UPPER		'A' - 'Z' 
 		0xa1 0xa3 0xa5 0xa6 0xa9 - 0xac 0xae 0xaf 
 		0xc0 - 0xd6 0xd8 - 0xde
-XDIGIT		'a' - 'f' 'A' - 'F'
+XDIGIT          '0' - '9' 'a' - 'f' 'A' - 'F'
 BLANK		' ' '\t' 0xa0
 PRINT		0x20 - 0x7e 0xa0 - 0xff
 # IDEOGRAM
diff --git a/share/mklocale/la_LN.ISO8859-4.src b/share/mklocale/la_LN.ISO8859-4.src
index c3130a2cca59..426e15773866 100644
--- a/share/mklocale/la_LN.ISO8859-4.src
+++ b/share/mklocale/la_LN.ISO8859-4.src
@@ -26,7 +26,7 @@ SPACE		0x09 - 0x0d 0x20 0xa0
 UPPER		'A' - 'Z' 
 		0xa1 0xa3 0xa5 0xa6 0xa9 - 0xac 0xae
 		0xc0 - 0xd6 0xd8 - 0xde
-XDIGIT		'a' - 'f' 'A' - 'F'
+XDIGIT          '0' - '9' 'a' - 'f' 'A' - 'F'
 BLANK		' ' '\t' 0xa0
 PRINT		0x20 - 0x7e 0xa0 - 0xff
 # IDEOGRAM
diff --git a/share/mklocale/zh_CN.eucCN.src b/share/mklocale/zh_CN.eucCN.src
index b298ef5de562..99d8de54e616 100644
--- a/share/mklocale/zh_CN.eucCN.src
+++ b/share/mklocale/zh_CN.eucCN.src
@@ -56,7 +56,7 @@ SPACE		0xa1a1
 BLANK		0xa1a1
 PUNCT		0xa1a2 - 0xa1fe
 
-DIGIT		0xa2b1 - 0xa2e2 0xa2e5 - 0xa2ee 0xa2f1 - 0xa2fc
+/* ?DIGIT           0xa2b1 - 0xa2e2 0xa2e5 - 0xa2ee 0xa2f1 - 0xa2fc */
 
 TODIGIT		< 0xa2b1 - 0xa2c4 : 0 >
 TODIGIT		< 0xa2c5 - 0xa2d8 : 0 >
@@ -65,11 +65,11 @@ TODIGIT		< 0xa2e5 - 0xa2ee : 0 >
 TODIGIT		< 0xa2f1 - 0xa2fc : 0 >
 
 ALPHA		0xa3c1 - 0xa3da 0xa3e1 - 0xa3fa
-DIGIT		0xa3b0 - 0xa3b9
+/* ?DIGIT           0xa3b0 - 0xa3b9 */
 UPPER		0xa3c1 - 0xa3da
 LOWER		0xa3e1 - 0xa3fa
 PUNCT		0xa3a1 - 0xa3af 0xa3ba - 0xa3c0 0xa3db - 0xa3e0 0xa3fb - 0xa3fe
-XDIGIT		0xa3b0 - 0xa3b9 0xa3c1 - 0xa3c6 0xa3e1 - 0xa3e6
+/* ?XDIGIT          0xa3b0 - 0xa3b9 0xa3c1 - 0xa3c6 0xa3e1 - 0xa3e6 */
 
 MAPLOWER	< 0xa3c1 - 0xa3da : 0xa3e1 > < 0xa3e1 - 0xa3fa : 0xa3e1 >
 MAPUPPER	< 0xa3c1 - 0xa3da : 0xa3c1 > < 0xa3b0 - 0xa3b9 : 0xa3c1 >
diff --git a/share/mklocale/zh_TW.Big5.src b/share/mklocale/zh_TW.Big5.src
index 9e0f908b47e6..9a2d2677f1f9 100644
--- a/share/mklocale/zh_TW.Big5.src
+++ b/share/mklocale/zh_TW.Big5.src
@@ -1,6 +1,8 @@
 /*
  * big5   first byte:   A1-FE
  *        second byte:   40-7E, A1-FE
+ *
+ * $FreeBSD$
  */
 
 ENCODING        "BIG5"
@@ -38,7 +40,7 @@ PUNCT           0xa141 - 0xa17e 0xa1a1 - 0xa1ac
 SPECIAL         0xa1ad - 0xa1fe 0xa240 - 0xa27e 0xa2a1 - 0xa2ae
 
 /* full width 0 1 2 .. 9 */
-DIGIT           0xa2af - 0xa2b8
+/* ?DIGIT           0xa2af - 0xa2b8 */
 
 /* map these (SuChou Code (12) and Roman (I II etc.) number (10)) to digits */
 TODIGIT         < 0xa2b9 - 0xa2c2 : 1 >
@@ -55,7 +57,7 @@ MAPLOWER        < 0xa2e9 - 0xa2fe : 0xa2e9 > < 0xa340 - 0xa343 : 0xa340 >
 MAPUPPER        < 0xa2cf - 0xa2e4 : 0xa2cf > < 0xa2e5 - 0xa2e8 : 0xa2e5 >
 MAPUPPER        < 0xa2e9 - 0xa2fe : 0xa2cf > < 0xa340 - 0xa343 : 0xa2e5 >
 
-XDIGIT          0xa2cf - 0xa2d4 0xa2e9 - 0xa2ee
+/* ?XDIGIT          0xa2cf - 0xa2d4 0xa2e9 - 0xa2ee */
 
 SPACE           0xa3bc
 /* bopomofo symbols */