From dd554c952a0f65a656c81c698e2702ef8239fa9a Mon Sep 17 00:00:00 2001
From: christos <christos@NetBSD.org>
Date: Fri, 11 Mar 2005 23:38:02 +0000
Subject: [PATCH] PR/29658: Joerg Sonnenberger: incorrect DST_UNIT_BITS and
 DST_INVALID in character set maps:

A number of Code Pages specify a 8bit character mapping, but use
16bit runes, ma king them inaccessible for the actual conversion.
Similiary do some Code Pages specify an invalid rune e.g. of 0x00,
which is actually used in the mapping table and makes that rune
mapping invalid.
---
 share/i18n/csmapper/CP/UCS%CP037.src  | 6 +++---
 share/i18n/csmapper/CP/UCS%CP1006.src | 6 +++---
 share/i18n/csmapper/CP/UCS%CP1026.src | 6 +++---
 share/i18n/csmapper/CP/UCS%CP1250.src | 4 ++--
 share/i18n/csmapper/CP/UCS%CP1251.src | 4 ++--
 share/i18n/csmapper/CP/UCS%CP1252.src | 4 ++--
 share/i18n/csmapper/CP/UCS%CP1253.src | 4 ++--
 share/i18n/csmapper/CP/UCS%CP1254.src | 4 ++--
 share/i18n/csmapper/CP/UCS%CP1255.src | 4 ++--
 share/i18n/csmapper/CP/UCS%CP1256.src | 6 +++---
 share/i18n/csmapper/CP/UCS%CP1257.src | 4 ++--
 share/i18n/csmapper/CP/UCS%CP1258.src | 4 ++--
 share/i18n/csmapper/CP/UCS%CP273.src  | 6 +++---
 share/i18n/csmapper/CP/UCS%CP275.src  | 4 ++--
 share/i18n/csmapper/CP/UCS%CP277.src  | 6 +++---
 share/i18n/csmapper/CP/UCS%CP278.src  | 6 +++---
 share/i18n/csmapper/CP/UCS%CP280.src  | 6 +++---
 share/i18n/csmapper/CP/UCS%CP281.src  | 4 ++--
 share/i18n/csmapper/CP/UCS%CP284.src  | 6 +++---
 share/i18n/csmapper/CP/UCS%CP285.src  | 6 +++---
 share/i18n/csmapper/CP/UCS%CP290.src  | 4 ++--
 share/i18n/csmapper/CP/UCS%CP297.src  | 6 +++---
 share/i18n/csmapper/CP/UCS%CP420.src  | 4 ++--
 share/i18n/csmapper/CP/UCS%CP423.src  | 4 ++--
 share/i18n/csmapper/CP/UCS%CP424.src  | 4 ++--
 share/i18n/csmapper/CP/UCS%CP437.src  | 6 +++---
 share/i18n/csmapper/CP/UCS%CP500.src  | 6 +++---
 share/i18n/csmapper/CP/UCS%CP737.src  | 6 +++---
 share/i18n/csmapper/CP/UCS%CP775.src  | 6 +++---
 share/i18n/csmapper/CP/UCS%CP850.src  | 6 +++---
 share/i18n/csmapper/CP/UCS%CP851.src  | 4 ++--
 share/i18n/csmapper/CP/UCS%CP852.src  | 4 ++--
 share/i18n/csmapper/CP/UCS%CP855.src  | 4 ++--
 share/i18n/csmapper/CP/UCS%CP856.src  | 4 ++--
 share/i18n/csmapper/CP/UCS%CP857.src  | 6 +++---
 share/i18n/csmapper/CP/UCS%CP860.src  | 6 +++---
 share/i18n/csmapper/CP/UCS%CP861.src  | 4 ++--
 share/i18n/csmapper/CP/UCS%CP862.src  | 4 ++--
 share/i18n/csmapper/CP/UCS%CP863.src  | 6 +++---
 share/i18n/csmapper/CP/UCS%CP864.src  | 4 ++--
 share/i18n/csmapper/CP/UCS%CP865.src  | 6 +++---
 share/i18n/csmapper/CP/UCS%CP866.src  | 6 +++---
 share/i18n/csmapper/CP/UCS%CP868.src  | 4 ++--
 share/i18n/csmapper/CP/UCS%CP869.src  | 4 ++--
 share/i18n/csmapper/CP/UCS%CP870.src  | 4 ++--
 share/i18n/csmapper/CP/UCS%CP871.src  | 6 +++---
 share/i18n/csmapper/CP/UCS%CP874.src  | 4 ++--
 share/i18n/csmapper/CP/UCS%CP875.src  | 6 +++---
 share/i18n/csmapper/CP/UCS%CP880.src  | 4 ++--
 share/i18n/csmapper/CP/UCS%CP905.src  | 4 ++--
 share/i18n/csmapper/CP/UCS%CP918.src  | 4 ++--
 51 files changed, 125 insertions(+), 125 deletions(-)

diff --git a/share/i18n/csmapper/CP/UCS%CP037.src b/share/i18n/csmapper/CP/UCS%CP037.src
index 79d884ad2a8d..80a22d1e1c41 100644
--- a/share/i18n/csmapper/CP/UCS%CP037.src
+++ b/share/i18n/csmapper/CP/UCS%CP037.src
@@ -1,11 +1,11 @@
-# $NetBSD: UCS%CP037.src,v 1.3 2003/07/14 06:03:36 tshiozak Exp $
+# $NetBSD: UCS%CP037.src,v 1.4 2005/03/11 23:38:02 christos Exp $
 
 TYPE		ROWCOL
 NAME		"UCS%CP037"
 SRC_ZONE	0x0000 - 0x203E
 OOB_MODE	INVALID
-DST_INVALID	0x3F
-DST_UNIT_BITS	8
+DST_INVALID	0xFFFF
+DST_UNIT_BITS	16
 
 BEGIN_MAP
 #
diff --git a/share/i18n/csmapper/CP/UCS%CP1006.src b/share/i18n/csmapper/CP/UCS%CP1006.src
index 310df2070424..50c68839ab50 100644
--- a/share/i18n/csmapper/CP/UCS%CP1006.src
+++ b/share/i18n/csmapper/CP/UCS%CP1006.src
@@ -1,11 +1,11 @@
-# $NetBSD: UCS%CP1006.src,v 1.3 2003/07/14 06:03:37 tshiozak Exp $
+# $NetBSD: UCS%CP1006.src,v 1.4 2005/03/11 23:38:02 christos Exp $
 
 TYPE		ROWCOL
 NAME		"UCS/CP1006"
 SRC_ZONE	0x0000 - 0xFEF3
 OOB_MODE	INVALID
-DST_INVALID	0x00
-DST_UNIT_BITS	8
+DST_INVALID	0xFFFF
+DST_UNIT_BITS	16
 
 BEGIN_MAP
 #
diff --git a/share/i18n/csmapper/CP/UCS%CP1026.src b/share/i18n/csmapper/CP/UCS%CP1026.src
index d11cbf2b70b0..d30fdff0a2ec 100644
--- a/share/i18n/csmapper/CP/UCS%CP1026.src
+++ b/share/i18n/csmapper/CP/UCS%CP1026.src
@@ -1,11 +1,11 @@
-# $NetBSD: UCS%CP1026.src,v 1.3 2003/07/14 06:03:37 tshiozak Exp $
+# $NetBSD: UCS%CP1026.src,v 1.4 2005/03/11 23:38:02 christos Exp $
 
 TYPE		ROWCOL
 NAME		"UCS%CP1026"
 SRC_ZONE	0x0000 - 0x2014
 OOB_MODE	INVALID
-DST_INVALID	0x3F
-DST_UNIT_BITS	8
+DST_INVALID	0xFFFF
+DST_UNIT_BITS	16
 
 BEGIN_MAP
 #
diff --git a/share/i18n/csmapper/CP/UCS%CP1250.src b/share/i18n/csmapper/CP/UCS%CP1250.src
index 0ff9893e0a30..3a8aabd75f2f 100644
--- a/share/i18n/csmapper/CP/UCS%CP1250.src
+++ b/share/i18n/csmapper/CP/UCS%CP1250.src
@@ -1,11 +1,11 @@
-# $NetBSD: UCS%CP1250.src,v 1.3 2003/07/14 06:03:37 tshiozak Exp $
+# $NetBSD: UCS%CP1250.src,v 1.4 2005/03/11 23:38:02 christos Exp $
 
 TYPE		ROWCOL
 NAME		"UCS/CP1250"
 SRC_ZONE	0x0000 - 0x2122
 OOB_MODE	INVALID
 DST_INVALID	0x98
-DST_UNIT_BITS	8
+DST_UNIT_BITS	16
 
 BEGIN_MAP
 #
diff --git a/share/i18n/csmapper/CP/UCS%CP1251.src b/share/i18n/csmapper/CP/UCS%CP1251.src
index 207f611c28ef..8c5bc532a9d1 100644
--- a/share/i18n/csmapper/CP/UCS%CP1251.src
+++ b/share/i18n/csmapper/CP/UCS%CP1251.src
@@ -1,11 +1,11 @@
-# $NetBSD: UCS%CP1251.src,v 1.3 2003/07/14 06:03:37 tshiozak Exp $
+# $NetBSD: UCS%CP1251.src,v 1.4 2005/03/11 23:38:02 christos Exp $
 
 TYPE		ROWCOL
 NAME		"UCS/CP1251"
 SRC_ZONE	0x0000 - 0x2122
 OOB_MODE	INVALID
 DST_INVALID	0x98
-DST_UNIT_BITS	8
+DST_UNIT_BITS	16
 
 BEGIN_MAP
 #
diff --git a/share/i18n/csmapper/CP/UCS%CP1252.src b/share/i18n/csmapper/CP/UCS%CP1252.src
index cc2e153a81f5..e01a7f90eb28 100644
--- a/share/i18n/csmapper/CP/UCS%CP1252.src
+++ b/share/i18n/csmapper/CP/UCS%CP1252.src
@@ -1,11 +1,11 @@
-# $NetBSD: UCS%CP1252.src,v 1.3 2003/07/14 06:03:37 tshiozak Exp $
+# $NetBSD: UCS%CP1252.src,v 1.4 2005/03/11 23:38:02 christos Exp $
 
 TYPE		ROWCOL
 NAME		"UCS/CP1252"
 SRC_ZONE	0x0000 - 0x2122
 OOB_MODE	INVALID
 DST_INVALID	0x9D
-DST_UNIT_BITS	8
+DST_UNIT_BITS	16
 
 BEGIN_MAP
 #
diff --git a/share/i18n/csmapper/CP/UCS%CP1253.src b/share/i18n/csmapper/CP/UCS%CP1253.src
index 0b63ac832648..ba5e6593a6a0 100644
--- a/share/i18n/csmapper/CP/UCS%CP1253.src
+++ b/share/i18n/csmapper/CP/UCS%CP1253.src
@@ -1,11 +1,11 @@
-# $NetBSD: UCS%CP1253.src,v 1.3 2003/07/14 06:03:37 tshiozak Exp $
+# $NetBSD: UCS%CP1253.src,v 1.4 2005/03/11 23:38:02 christos Exp $
 
 TYPE		ROWCOL
 NAME		"UCS/CP1253"
 SRC_ZONE	0x0000 - 0x2122
 OOB_MODE	INVALID
 DST_INVALID	0xFF
-DST_UNIT_BITS	8
+DST_UNIT_BITS	16
 
 BEGIN_MAP
 #
diff --git a/share/i18n/csmapper/CP/UCS%CP1254.src b/share/i18n/csmapper/CP/UCS%CP1254.src
index aca2cdeb393a..a5396d8b8f32 100644
--- a/share/i18n/csmapper/CP/UCS%CP1254.src
+++ b/share/i18n/csmapper/CP/UCS%CP1254.src
@@ -1,11 +1,11 @@
-# $NetBSD: UCS%CP1254.src,v 1.3 2003/07/14 06:03:37 tshiozak Exp $
+# $NetBSD: UCS%CP1254.src,v 1.4 2005/03/11 23:38:02 christos Exp $
 
 TYPE		ROWCOL
 NAME		"UCS/CP1254"
 SRC_ZONE	0x0000 - 0x2122
 OOB_MODE	INVALID
 DST_INVALID	0x9E
-DST_UNIT_BITS	8
+DST_UNIT_BITS	16
 
 BEGIN_MAP
 #
diff --git a/share/i18n/csmapper/CP/UCS%CP1255.src b/share/i18n/csmapper/CP/UCS%CP1255.src
index 42a4e162aa09..017339781b58 100644
--- a/share/i18n/csmapper/CP/UCS%CP1255.src
+++ b/share/i18n/csmapper/CP/UCS%CP1255.src
@@ -1,11 +1,11 @@
-# $NetBSD: UCS%CP1255.src,v 1.3 2003/07/14 06:03:37 tshiozak Exp $
+# $NetBSD: UCS%CP1255.src,v 1.4 2005/03/11 23:38:02 christos Exp $
 
 TYPE		ROWCOL
 NAME		"UCS/CP1255"
 SRC_ZONE	0x0000 - 0x2122
 OOB_MODE	INVALID
 DST_INVALID	0xFF
-DST_UNIT_BITS	8
+DST_UNIT_BITS	16
 
 BEGIN_MAP
 #
diff --git a/share/i18n/csmapper/CP/UCS%CP1256.src b/share/i18n/csmapper/CP/UCS%CP1256.src
index fd03980a0312..e62343db74e6 100644
--- a/share/i18n/csmapper/CP/UCS%CP1256.src
+++ b/share/i18n/csmapper/CP/UCS%CP1256.src
@@ -1,11 +1,11 @@
-# $NetBSD: UCS%CP1256.src,v 1.3 2003/07/14 06:03:37 tshiozak Exp $
+# $NetBSD: UCS%CP1256.src,v 1.4 2005/03/11 23:38:02 christos Exp $
 
 TYPE		ROWCOL
 NAME		"UCS/CP1256"
 SRC_ZONE	0x0000 - 0x2122
 OOB_MODE	INVALID
-DST_INVALID	0x00
-DST_UNIT_BITS	8
+DST_INVALID	0xFFFF
+DST_UNIT_BITS	16
 
 BEGIN_MAP
 #
diff --git a/share/i18n/csmapper/CP/UCS%CP1257.src b/share/i18n/csmapper/CP/UCS%CP1257.src
index 3d78eb038322..6ea23584e3c9 100644
--- a/share/i18n/csmapper/CP/UCS%CP1257.src
+++ b/share/i18n/csmapper/CP/UCS%CP1257.src
@@ -1,11 +1,11 @@
-# $NetBSD: UCS%CP1257.src,v 1.3 2003/07/14 06:03:37 tshiozak Exp $
+# $NetBSD: UCS%CP1257.src,v 1.4 2005/03/11 23:38:02 christos Exp $
 
 TYPE		ROWCOL
 NAME		"UCS/CP1257"
 SRC_ZONE	0x0000 - 0x2122
 OOB_MODE	INVALID
 DST_INVALID	0xA5
-DST_UNIT_BITS	8
+DST_UNIT_BITS	16
 
 BEGIN_MAP
 #
diff --git a/share/i18n/csmapper/CP/UCS%CP1258.src b/share/i18n/csmapper/CP/UCS%CP1258.src
index 87f3e0a45392..66231d4598bf 100644
--- a/share/i18n/csmapper/CP/UCS%CP1258.src
+++ b/share/i18n/csmapper/CP/UCS%CP1258.src
@@ -1,11 +1,11 @@
-# $NetBSD: UCS%CP1258.src,v 1.3 2003/07/14 06:03:37 tshiozak Exp $
+# $NetBSD: UCS%CP1258.src,v 1.4 2005/03/11 23:38:02 christos Exp $
 
 TYPE		ROWCOL
 NAME		"UCS/CP1258"
 SRC_ZONE	0x0000 - 0x2122
 OOB_MODE	INVALID
 DST_INVALID	0x9E
-DST_UNIT_BITS	8
+DST_UNIT_BITS	16
 
 BEGIN_MAP
 #
diff --git a/share/i18n/csmapper/CP/UCS%CP273.src b/share/i18n/csmapper/CP/UCS%CP273.src
index 4bc9b1b0a473..f2571e545f11 100644
--- a/share/i18n/csmapper/CP/UCS%CP273.src
+++ b/share/i18n/csmapper/CP/UCS%CP273.src
@@ -1,11 +1,11 @@
-# $NetBSD: UCS%CP273.src,v 1.3 2003/07/14 06:03:37 tshiozak Exp $
+# $NetBSD: UCS%CP273.src,v 1.4 2005/03/11 23:38:02 christos Exp $
 
 TYPE		ROWCOL
 NAME		"UCS%CP273"
 SRC_ZONE	0x0000 - 0x203E
 OOB_MODE	INVALID
-DST_INVALID	0x3F
-DST_UNIT_BITS	8
+DST_INVALID	0xFFFF
+DST_UNIT_BITS	16
 
 BEGIN_MAP
 #
diff --git a/share/i18n/csmapper/CP/UCS%CP275.src b/share/i18n/csmapper/CP/UCS%CP275.src
index 7cd1833e2f0c..a1519fe6ba99 100644
--- a/share/i18n/csmapper/CP/UCS%CP275.src
+++ b/share/i18n/csmapper/CP/UCS%CP275.src
@@ -1,11 +1,11 @@
-# $NetBSD: UCS%CP275.src,v 1.3 2003/07/14 06:03:37 tshiozak Exp $
+# $NetBSD: UCS%CP275.src,v 1.4 2005/03/11 23:38:02 christos Exp $
 
 TYPE		ROWCOL
 NAME		"UCS%CP275"
 SRC_ZONE	0x0000 - 0x00F5
 OOB_MODE	INVALID
 DST_INVALID	0xFE
-DST_UNIT_BITS	8
+DST_UNIT_BITS	16
 
 BEGIN_MAP
 #
diff --git a/share/i18n/csmapper/CP/UCS%CP277.src b/share/i18n/csmapper/CP/UCS%CP277.src
index c003989217b9..6b12fdf669f3 100644
--- a/share/i18n/csmapper/CP/UCS%CP277.src
+++ b/share/i18n/csmapper/CP/UCS%CP277.src
@@ -1,11 +1,11 @@
-# $NetBSD: UCS%CP277.src,v 1.3 2003/07/14 06:03:37 tshiozak Exp $
+# $NetBSD: UCS%CP277.src,v 1.4 2005/03/11 23:38:02 christos Exp $
 
 TYPE		ROWCOL
 NAME		"UCS%CP277"
 SRC_ZONE	0x0000 - 0x203E
 OOB_MODE	INVALID
-DST_INVALID	0x3F
-DST_UNIT_BITS	8
+DST_INVALID	0xFFFF
+DST_UNIT_BITS	16
 
 BEGIN_MAP
 #
diff --git a/share/i18n/csmapper/CP/UCS%CP278.src b/share/i18n/csmapper/CP/UCS%CP278.src
index 71c781941fc7..097453aeac8e 100644
--- a/share/i18n/csmapper/CP/UCS%CP278.src
+++ b/share/i18n/csmapper/CP/UCS%CP278.src
@@ -1,11 +1,11 @@
-# $NetBSD: UCS%CP278.src,v 1.3 2003/07/14 06:03:38 tshiozak Exp $
+# $NetBSD: UCS%CP278.src,v 1.4 2005/03/11 23:38:02 christos Exp $
 
 TYPE		ROWCOL
 NAME		"UCS%CP278"
 SRC_ZONE	0x0000 - 0x203E
 OOB_MODE	INVALID
-DST_INVALID	0x3F
-DST_UNIT_BITS	8
+DST_INVALID	0xFFFF
+DST_UNIT_BITS	16
 
 BEGIN_MAP
 #
diff --git a/share/i18n/csmapper/CP/UCS%CP280.src b/share/i18n/csmapper/CP/UCS%CP280.src
index 8609103a44b6..7ced63fee1ac 100644
--- a/share/i18n/csmapper/CP/UCS%CP280.src
+++ b/share/i18n/csmapper/CP/UCS%CP280.src
@@ -1,11 +1,11 @@
-# $NetBSD: UCS%CP280.src,v 1.3 2003/07/14 06:03:38 tshiozak Exp $
+# $NetBSD: UCS%CP280.src,v 1.4 2005/03/11 23:38:02 christos Exp $
 
 TYPE		ROWCOL
 NAME		"UCS%CP280"
 SRC_ZONE	0x0000 - 0x203E
 OOB_MODE	INVALID
-DST_INVALID	0x3F
-DST_UNIT_BITS	8
+DST_INVALID	0xFFFF
+DST_UNIT_BITS	16
 
 BEGIN_MAP
 #
diff --git a/share/i18n/csmapper/CP/UCS%CP281.src b/share/i18n/csmapper/CP/UCS%CP281.src
index cced2e517a60..8f6b80ec2410 100644
--- a/share/i18n/csmapper/CP/UCS%CP281.src
+++ b/share/i18n/csmapper/CP/UCS%CP281.src
@@ -1,11 +1,11 @@
-# $NetBSD: UCS%CP281.src,v 1.3 2003/07/14 06:03:38 tshiozak Exp $
+# $NetBSD: UCS%CP281.src,v 1.4 2005/03/11 23:38:02 christos Exp $
 
 TYPE		ROWCOL
 NAME		"UCS%CP281"
 SRC_ZONE	0x0000 - 0x203E
 OOB_MODE	INVALID
 DST_INVALID	0xFE
-DST_UNIT_BITS	8
+DST_UNIT_BITS	16
 
 BEGIN_MAP
 #
diff --git a/share/i18n/csmapper/CP/UCS%CP284.src b/share/i18n/csmapper/CP/UCS%CP284.src
index 055eac2a37d4..0838f3201bd4 100644
--- a/share/i18n/csmapper/CP/UCS%CP284.src
+++ b/share/i18n/csmapper/CP/UCS%CP284.src
@@ -1,11 +1,11 @@
-# $NetBSD: UCS%CP284.src,v 1.3 2003/07/14 06:03:38 tshiozak Exp $
+# $NetBSD: UCS%CP284.src,v 1.4 2005/03/11 23:38:02 christos Exp $
 
 TYPE		ROWCOL
 NAME		"UCS%CP284"
 SRC_ZONE	0x0000 - 0x203E
 OOB_MODE	INVALID
-DST_INVALID	0x3F
-DST_UNIT_BITS	8
+DST_INVALID	0xFFFF
+DST_UNIT_BITS	16
 
 BEGIN_MAP
 #
diff --git a/share/i18n/csmapper/CP/UCS%CP285.src b/share/i18n/csmapper/CP/UCS%CP285.src
index 4a820127e239..57c20afc3b62 100644
--- a/share/i18n/csmapper/CP/UCS%CP285.src
+++ b/share/i18n/csmapper/CP/UCS%CP285.src
@@ -1,11 +1,11 @@
-# $NetBSD: UCS%CP285.src,v 1.3 2003/07/14 06:03:38 tshiozak Exp $
+# $NetBSD: UCS%CP285.src,v 1.4 2005/03/11 23:38:02 christos Exp $
 
 TYPE		ROWCOL
 NAME		"UCS%CP285"
 SRC_ZONE	0x0000 - 0x203E
 OOB_MODE	INVALID
-DST_INVALID	0x3F
-DST_UNIT_BITS	8
+DST_INVALID	0xFFFF
+DST_UNIT_BITS	16
 
 BEGIN_MAP
 #
diff --git a/share/i18n/csmapper/CP/UCS%CP290.src b/share/i18n/csmapper/CP/UCS%CP290.src
index 0d8e9239e21a..371b5a4f2ad4 100644
--- a/share/i18n/csmapper/CP/UCS%CP290.src
+++ b/share/i18n/csmapper/CP/UCS%CP290.src
@@ -1,11 +1,11 @@
-# $NetBSD: UCS%CP290.src,v 1.3 2003/07/14 06:03:38 tshiozak Exp $
+# $NetBSD: UCS%CP290.src,v 1.4 2005/03/11 23:38:02 christos Exp $
 
 TYPE		ROWCOL
 NAME		"UCS%CP290"
 SRC_ZONE	0x0000 - 0x30FC
 OOB_MODE	INVALID
 DST_INVALID	0xFE
-DST_UNIT_BITS	8
+DST_UNIT_BITS	16
 
 BEGIN_MAP
 #
diff --git a/share/i18n/csmapper/CP/UCS%CP297.src b/share/i18n/csmapper/CP/UCS%CP297.src
index e81ded9e69e7..42f03d96520b 100644
--- a/share/i18n/csmapper/CP/UCS%CP297.src
+++ b/share/i18n/csmapper/CP/UCS%CP297.src
@@ -1,11 +1,11 @@
-# $NetBSD: UCS%CP297.src,v 1.3 2003/07/14 06:03:38 tshiozak Exp $
+# $NetBSD: UCS%CP297.src,v 1.4 2005/03/11 23:38:02 christos Exp $
 
 TYPE		ROWCOL
 NAME		"UCS%CP297"
 SRC_ZONE	0x0000 - 0x203E
 OOB_MODE	INVALID
-DST_INVALID	0x3F
-DST_UNIT_BITS	8
+DST_INVALID	0xFFFF
+DST_UNIT_BITS	16
 
 BEGIN_MAP
 #
diff --git a/share/i18n/csmapper/CP/UCS%CP420.src b/share/i18n/csmapper/CP/UCS%CP420.src
index 14fdf79d6a28..c9da378e7edd 100644
--- a/share/i18n/csmapper/CP/UCS%CP420.src
+++ b/share/i18n/csmapper/CP/UCS%CP420.src
@@ -1,11 +1,11 @@
-# $NetBSD: UCS%CP420.src,v 1.3 2003/07/14 06:03:38 tshiozak Exp $
+# $NetBSD: UCS%CP420.src,v 1.4 2005/03/11 23:38:02 christos Exp $
 
 TYPE		ROWCOL
 NAME		"UCS%CP420"
 SRC_ZONE	0x0000 - 0xFEFC
 OOB_MODE	INVALID
 DST_INVALID	0xFA
-DST_UNIT_BITS	8
+DST_UNIT_BITS	16
 
 BEGIN_MAP
 #
diff --git a/share/i18n/csmapper/CP/UCS%CP423.src b/share/i18n/csmapper/CP/UCS%CP423.src
index bfe0acc8fafc..c3e13bb6e8a0 100644
--- a/share/i18n/csmapper/CP/UCS%CP423.src
+++ b/share/i18n/csmapper/CP/UCS%CP423.src
@@ -1,11 +1,11 @@
-# $NetBSD: UCS%CP423.src,v 1.3 2003/07/14 06:03:38 tshiozak Exp $
+# $NetBSD: UCS%CP423.src,v 1.4 2005/03/11 23:38:02 christos Exp $
 
 TYPE		ROWCOL
 NAME		"UCS%CP423"
 SRC_ZONE	0x0000 - 0x044D
 OOB_MODE	INVALID
 DST_INVALID	0xF1
-DST_UNIT_BITS	8
+DST_UNIT_BITS	16
 
 BEGIN_MAP
 #
diff --git a/share/i18n/csmapper/CP/UCS%CP424.src b/share/i18n/csmapper/CP/UCS%CP424.src
index c4c23c21bde9..ab2ff19f8e20 100644
--- a/share/i18n/csmapper/CP/UCS%CP424.src
+++ b/share/i18n/csmapper/CP/UCS%CP424.src
@@ -1,11 +1,11 @@
-# $NetBSD: UCS%CP424.src,v 1.3 2003/07/14 06:03:38 tshiozak Exp $
+# $NetBSD: UCS%CP424.src,v 1.4 2005/03/11 23:38:02 christos Exp $
 
 TYPE		ROWCOL
 NAME		"UCS%CP424"
 SRC_ZONE	0x0000 - 0x21D4
 OOB_MODE	INVALID
 DST_INVALID	0xFE
-DST_UNIT_BITS	8
+DST_UNIT_BITS	16
 
 BEGIN_MAP
 #
diff --git a/share/i18n/csmapper/CP/UCS%CP437.src b/share/i18n/csmapper/CP/UCS%CP437.src
index 660bbc2ebe89..8599732e16e7 100644
--- a/share/i18n/csmapper/CP/UCS%CP437.src
+++ b/share/i18n/csmapper/CP/UCS%CP437.src
@@ -1,11 +1,11 @@
-# $NetBSD: UCS%CP437.src,v 1.3 2003/07/14 06:03:38 tshiozak Exp $
+# $NetBSD: UCS%CP437.src,v 1.4 2005/03/11 23:38:02 christos Exp $
 
 TYPE		ROWCOL
 NAME		"UCS%CP437"
 SRC_ZONE	0x0000 - 0xE023
 OOB_MODE	INVALID
-DST_INVALID	0x00
-DST_UNIT_BITS	8
+DST_INVALID	0xFFFF
+DST_UNIT_BITS	16
 
 BEGIN_MAP
 #
diff --git a/share/i18n/csmapper/CP/UCS%CP500.src b/share/i18n/csmapper/CP/UCS%CP500.src
index 61d4d90cbadf..8cd653837e38 100644
--- a/share/i18n/csmapper/CP/UCS%CP500.src
+++ b/share/i18n/csmapper/CP/UCS%CP500.src
@@ -1,11 +1,11 @@
-# $NetBSD: UCS%CP500.src,v 1.3 2003/07/14 06:03:38 tshiozak Exp $
+# $NetBSD: UCS%CP500.src,v 1.4 2005/03/11 23:38:02 christos Exp $
 
 TYPE		ROWCOL
 NAME		"UCS%CP500"
 SRC_ZONE	0x0000 - 0x203E
 OOB_MODE	INVALID
-DST_INVALID	0x3F
-DST_UNIT_BITS	8
+DST_INVALID	0xFFFF
+DST_UNIT_BITS	16
 
 BEGIN_MAP
 #
diff --git a/share/i18n/csmapper/CP/UCS%CP737.src b/share/i18n/csmapper/CP/UCS%CP737.src
index 9820969aff01..89f43555cc87 100644
--- a/share/i18n/csmapper/CP/UCS%CP737.src
+++ b/share/i18n/csmapper/CP/UCS%CP737.src
@@ -1,11 +1,11 @@
-# $NetBSD: UCS%CP737.src,v 1.3 2003/07/14 06:03:38 tshiozak Exp $
+# $NetBSD: UCS%CP737.src,v 1.4 2005/03/11 23:38:02 christos Exp $
 
 TYPE		ROWCOL
 NAME		"UCS/CP737"
 SRC_ZONE	0x0000 - 0x25A0
 OOB_MODE	INVALID
-DST_INVALID	0x00
-DST_UNIT_BITS	8
+DST_INVALID	0xFFFF
+DST_UNIT_BITS	16
 
 BEGIN_MAP
 #
diff --git a/share/i18n/csmapper/CP/UCS%CP775.src b/share/i18n/csmapper/CP/UCS%CP775.src
index 5c879f2c6531..0330b8f16008 100644
--- a/share/i18n/csmapper/CP/UCS%CP775.src
+++ b/share/i18n/csmapper/CP/UCS%CP775.src
@@ -1,11 +1,11 @@
-# $NetBSD: UCS%CP775.src,v 1.3 2003/07/14 06:03:38 tshiozak Exp $
+# $NetBSD: UCS%CP775.src,v 1.4 2005/03/11 23:38:02 christos Exp $
 
 TYPE		ROWCOL
 NAME		"UCS/CP775"
 SRC_ZONE	0x0000 - 0x25A0
 OOB_MODE	INVALID
-DST_INVALID	0x00
-DST_UNIT_BITS	8
+DST_INVALID	0xFFFF
+DST_UNIT_BITS	16
 
 BEGIN_MAP
 #
diff --git a/share/i18n/csmapper/CP/UCS%CP850.src b/share/i18n/csmapper/CP/UCS%CP850.src
index 5809353211ed..972aa74d28f6 100644
--- a/share/i18n/csmapper/CP/UCS%CP850.src
+++ b/share/i18n/csmapper/CP/UCS%CP850.src
@@ -1,11 +1,11 @@
-# $NetBSD: UCS%CP850.src,v 1.3 2003/07/14 06:03:38 tshiozak Exp $
+# $NetBSD: UCS%CP850.src,v 1.4 2005/03/11 23:38:02 christos Exp $
 
 TYPE		ROWCOL
 NAME		"UCS/CP850"
 SRC_ZONE	0x0000 - 0x25A0
 OOB_MODE	INVALID
-DST_INVALID	0x00
-DST_UNIT_BITS	8
+DST_INVALID	0xFFFF
+DST_UNIT_BITS	16
 
 BEGIN_MAP
 #
diff --git a/share/i18n/csmapper/CP/UCS%CP851.src b/share/i18n/csmapper/CP/UCS%CP851.src
index 7ef7a9403dfb..707e46d2fbdb 100644
--- a/share/i18n/csmapper/CP/UCS%CP851.src
+++ b/share/i18n/csmapper/CP/UCS%CP851.src
@@ -1,11 +1,11 @@
-# $NetBSD: UCS%CP851.src,v 1.3 2003/07/14 06:03:38 tshiozak Exp $
+# $NetBSD: UCS%CP851.src,v 1.4 2005/03/11 23:38:02 christos Exp $
 
 TYPE		ROWCOL
 NAME		"UCS%CP851"
 SRC_ZONE	0x0000 - 0x25A0
 OOB_MODE	INVALID
 DST_INVALID	0x91
-DST_UNIT_BITS	8
+DST_UNIT_BITS	16
 
 BEGIN_MAP
 #
diff --git a/share/i18n/csmapper/CP/UCS%CP852.src b/share/i18n/csmapper/CP/UCS%CP852.src
index ea4c72d062c5..178cdafdd414 100644
--- a/share/i18n/csmapper/CP/UCS%CP852.src
+++ b/share/i18n/csmapper/CP/UCS%CP852.src
@@ -1,11 +1,11 @@
-# $NetBSD: UCS%CP852.src,v 1.3 2003/07/14 06:03:38 tshiozak Exp $
+# $NetBSD: UCS%CP852.src,v 1.4 2005/03/11 23:38:02 christos Exp $
 
 TYPE		ROWCOL
 NAME		"UCS%CP852"
 SRC_ZONE	0x0000 - 0x25A0
 OOB_MODE	INVALID
 DST_INVALID	0xAA
-DST_UNIT_BITS	8
+DST_UNIT_BITS	16
 
 BEGIN_MAP
 #
diff --git a/share/i18n/csmapper/CP/UCS%CP855.src b/share/i18n/csmapper/CP/UCS%CP855.src
index 18e228158c8e..0c1b6dbc154f 100644
--- a/share/i18n/csmapper/CP/UCS%CP855.src
+++ b/share/i18n/csmapper/CP/UCS%CP855.src
@@ -1,11 +1,11 @@
-# $NetBSD: UCS%CP855.src,v 1.3 2003/07/14 06:03:38 tshiozak Exp $
+# $NetBSD: UCS%CP855.src,v 1.4 2005/03/11 23:38:02 christos Exp $
 
 TYPE		ROWCOL
 NAME		"UCS%CP855"
 SRC_ZONE	0x0000 - 0x25A0
 OOB_MODE	INVALID
 DST_INVALID	0xFD
-DST_UNIT_BITS	8
+DST_UNIT_BITS	16
 
 BEGIN_MAP
 #
diff --git a/share/i18n/csmapper/CP/UCS%CP856.src b/share/i18n/csmapper/CP/UCS%CP856.src
index 2c0a3027d85a..0b2d079b7c5a 100644
--- a/share/i18n/csmapper/CP/UCS%CP856.src
+++ b/share/i18n/csmapper/CP/UCS%CP856.src
@@ -1,11 +1,11 @@
-# $NetBSD: UCS%CP856.src,v 1.3 2003/07/14 06:03:38 tshiozak Exp $
+# $NetBSD: UCS%CP856.src,v 1.4 2005/03/11 23:38:02 christos Exp $
 
 TYPE		ROWCOL
 NAME		"UCS/CP856"
 SRC_ZONE	0x0000 - 0x25A0
 OOB_MODE	INVALID
 DST_INVALID	0xED
-DST_UNIT_BITS	8
+DST_UNIT_BITS	16
 
 BEGIN_MAP
 #
diff --git a/share/i18n/csmapper/CP/UCS%CP857.src b/share/i18n/csmapper/CP/UCS%CP857.src
index ac078259aecc..1b51a1483c79 100644
--- a/share/i18n/csmapper/CP/UCS%CP857.src
+++ b/share/i18n/csmapper/CP/UCS%CP857.src
@@ -1,11 +1,11 @@
-# $NetBSD: UCS%CP857.src,v 1.3 2003/07/14 06:03:38 tshiozak Exp $
+# $NetBSD: UCS%CP857.src,v 1.4 2005/03/11 23:38:02 christos Exp $
 
 TYPE		ROWCOL
 NAME		"UCS%CP857"
 SRC_ZONE	0x0000 - 0x25A0
 OOB_MODE	INVALID
-DST_INVALID	0xF2
-DST_UNIT_BITS	8
+DST_INVALID	0xFFFF
+DST_UNIT_BITS	16
 
 BEGIN_MAP
 #
diff --git a/share/i18n/csmapper/CP/UCS%CP860.src b/share/i18n/csmapper/CP/UCS%CP860.src
index 2c4966cd600f..ee3b50c6735b 100644
--- a/share/i18n/csmapper/CP/UCS%CP860.src
+++ b/share/i18n/csmapper/CP/UCS%CP860.src
@@ -1,11 +1,11 @@
-# $NetBSD: UCS%CP860.src,v 1.3 2003/07/14 06:03:38 tshiozak Exp $
+# $NetBSD: UCS%CP860.src,v 1.4 2005/03/11 23:38:02 christos Exp $
 
 TYPE		ROWCOL
 NAME		"UCS%CP860"
 SRC_ZONE	0x0000 - 0x25A0
 OOB_MODE	INVALID
-DST_INVALID	0x00
-DST_UNIT_BITS	8
+DST_INVALID	0xFFFF
+DST_UNIT_BITS	16
 
 BEGIN_MAP
 #
diff --git a/share/i18n/csmapper/CP/UCS%CP861.src b/share/i18n/csmapper/CP/UCS%CP861.src
index fe5503e923fa..9a986018aebd 100644
--- a/share/i18n/csmapper/CP/UCS%CP861.src
+++ b/share/i18n/csmapper/CP/UCS%CP861.src
@@ -1,11 +1,11 @@
-# $NetBSD: UCS%CP861.src,v 1.3 2003/07/14 06:03:39 tshiozak Exp $
+# $NetBSD: UCS%CP861.src,v 1.4 2005/03/11 23:38:02 christos Exp $
 
 TYPE		ROWCOL
 NAME		"UCS%CP861"
 SRC_ZONE	0x0000 - 0x25A0
 OOB_MODE	INVALID
 DST_INVALID	0xA9
-DST_UNIT_BITS	8
+DST_UNIT_BITS	16
 
 BEGIN_MAP
 #
diff --git a/share/i18n/csmapper/CP/UCS%CP862.src b/share/i18n/csmapper/CP/UCS%CP862.src
index 9989eb8a21c3..9f7c992d0002 100644
--- a/share/i18n/csmapper/CP/UCS%CP862.src
+++ b/share/i18n/csmapper/CP/UCS%CP862.src
@@ -1,11 +1,11 @@
-# $NetBSD: UCS%CP862.src,v 1.3 2003/07/14 06:03:39 tshiozak Exp $
+# $NetBSD: UCS%CP862.src,v 1.4 2005/03/11 23:38:02 christos Exp $
 
 TYPE		ROWCOL
 NAME		"UCS%CP862"
 SRC_ZONE	0x0000 - 0x25A0
 OOB_MODE	INVALID
 DST_INVALID	0xA9
-DST_UNIT_BITS	8
+DST_UNIT_BITS	16
 
 BEGIN_MAP
 #
diff --git a/share/i18n/csmapper/CP/UCS%CP863.src b/share/i18n/csmapper/CP/UCS%CP863.src
index 75822e4c883a..2ab9c030ab2a 100644
--- a/share/i18n/csmapper/CP/UCS%CP863.src
+++ b/share/i18n/csmapper/CP/UCS%CP863.src
@@ -1,11 +1,11 @@
-# $NetBSD: UCS%CP863.src,v 1.3 2003/07/14 06:03:39 tshiozak Exp $
+# $NetBSD: UCS%CP863.src,v 1.4 2005/03/11 23:38:02 christos Exp $
 
 TYPE		ROWCOL
 NAME		"UCS%CP863"
 SRC_ZONE	0x0000 - 0xE023
 OOB_MODE	INVALID
-DST_INVALID	0x00
-DST_UNIT_BITS	8
+DST_INVALID	0xFFFF
+DST_UNIT_BITS	16
 
 BEGIN_MAP
 #
diff --git a/share/i18n/csmapper/CP/UCS%CP864.src b/share/i18n/csmapper/CP/UCS%CP864.src
index 855991d3fa50..027fc23e57a8 100644
--- a/share/i18n/csmapper/CP/UCS%CP864.src
+++ b/share/i18n/csmapper/CP/UCS%CP864.src
@@ -1,11 +1,11 @@
-# $NetBSD: UCS%CP864.src,v 1.3 2003/07/14 06:03:39 tshiozak Exp $
+# $NetBSD: UCS%CP864.src,v 1.4 2005/03/11 23:38:02 christos Exp $
 
 TYPE		ROWCOL
 NAME		"UCS%CP864"
 SRC_ZONE	0x0000 - 0xFEFC
 OOB_MODE	INVALID
 DST_INVALID	0xA7
-DST_UNIT_BITS	8
+DST_UNIT_BITS	16
 
 BEGIN_MAP
 #
diff --git a/share/i18n/csmapper/CP/UCS%CP865.src b/share/i18n/csmapper/CP/UCS%CP865.src
index a1fc1131f736..6086921e3a44 100644
--- a/share/i18n/csmapper/CP/UCS%CP865.src
+++ b/share/i18n/csmapper/CP/UCS%CP865.src
@@ -1,11 +1,11 @@
-# $NetBSD: UCS%CP865.src,v 1.3 2003/07/14 06:03:39 tshiozak Exp $
+# $NetBSD: UCS%CP865.src,v 1.4 2005/03/11 23:38:02 christos Exp $
 
 TYPE		ROWCOL
 NAME		"UCS%CP865"
 SRC_ZONE	0x0000 - 0xE023
 OOB_MODE	INVALID
-DST_INVALID	0x00
-DST_UNIT_BITS	8
+DST_INVALID	0xFFFF
+DST_UNIT_BITS	16
 
 BEGIN_MAP
 #
diff --git a/share/i18n/csmapper/CP/UCS%CP866.src b/share/i18n/csmapper/CP/UCS%CP866.src
index e39344d7a673..1fc5ebf95840 100644
--- a/share/i18n/csmapper/CP/UCS%CP866.src
+++ b/share/i18n/csmapper/CP/UCS%CP866.src
@@ -1,11 +1,11 @@
-# $NetBSD: UCS%CP866.src,v 1.3 2003/07/14 06:03:39 tshiozak Exp $
+# $NetBSD: UCS%CP866.src,v 1.4 2005/03/11 23:38:02 christos Exp $
 
 TYPE		ROWCOL
 NAME		"UCS/CP866"
 SRC_ZONE	0x0000 - 0x25A0
 OOB_MODE	INVALID
-DST_INVALID	0x00
-DST_UNIT_BITS	8
+DST_INVALID	0xFFFF
+DST_UNIT_BITS	16
 
 BEGIN_MAP
 #
diff --git a/share/i18n/csmapper/CP/UCS%CP868.src b/share/i18n/csmapper/CP/UCS%CP868.src
index 6c1f996b4372..cdf88f24de37 100644
--- a/share/i18n/csmapper/CP/UCS%CP868.src
+++ b/share/i18n/csmapper/CP/UCS%CP868.src
@@ -1,11 +1,11 @@
-# $NetBSD: UCS%CP868.src,v 1.3 2003/07/14 06:03:39 tshiozak Exp $
+# $NetBSD: UCS%CP868.src,v 1.4 2005/03/11 23:38:02 christos Exp $
 
 TYPE		ROWCOL
 NAME		"UCS%CP868"
 SRC_ZONE	0x0000 - 0xFEE6
 OOB_MODE	INVALID
 DST_INVALID	0xFD
-DST_UNIT_BITS	8
+DST_UNIT_BITS	16
 
 BEGIN_MAP
 #
diff --git a/share/i18n/csmapper/CP/UCS%CP869.src b/share/i18n/csmapper/CP/UCS%CP869.src
index fcb71c400e7b..ce2aa6f13779 100644
--- a/share/i18n/csmapper/CP/UCS%CP869.src
+++ b/share/i18n/csmapper/CP/UCS%CP869.src
@@ -1,11 +1,11 @@
-# $NetBSD: UCS%CP869.src,v 1.3 2003/07/14 06:03:39 tshiozak Exp $
+# $NetBSD: UCS%CP869.src,v 1.4 2005/03/11 23:38:02 christos Exp $
 
 TYPE		ROWCOL
 NAME		"UCS%CP869"
 SRC_ZONE	0x0000 - 0x25A0
 OOB_MODE	INVALID
 DST_INVALID	0x94
-DST_UNIT_BITS	8
+DST_UNIT_BITS	16
 
 BEGIN_MAP
 #
diff --git a/share/i18n/csmapper/CP/UCS%CP870.src b/share/i18n/csmapper/CP/UCS%CP870.src
index 06222d8f1aab..eb7e8157f28b 100644
--- a/share/i18n/csmapper/CP/UCS%CP870.src
+++ b/share/i18n/csmapper/CP/UCS%CP870.src
@@ -1,11 +1,11 @@
-# $NetBSD: UCS%CP870.src,v 1.3 2003/07/14 06:03:39 tshiozak Exp $
+# $NetBSD: UCS%CP870.src,v 1.4 2005/03/11 23:38:02 christos Exp $
 
 TYPE		ROWCOL
 NAME		"UCS%CP870"
 SRC_ZONE	0x0000 - 0x02DD
 OOB_MODE	INVALID
 DST_INVALID	0xB3
-DST_UNIT_BITS	8
+DST_UNIT_BITS	16
 
 BEGIN_MAP
 #
diff --git a/share/i18n/csmapper/CP/UCS%CP871.src b/share/i18n/csmapper/CP/UCS%CP871.src
index a4b723d8820c..5b500a6e227c 100644
--- a/share/i18n/csmapper/CP/UCS%CP871.src
+++ b/share/i18n/csmapper/CP/UCS%CP871.src
@@ -1,11 +1,11 @@
-# $NetBSD: UCS%CP871.src,v 1.3 2003/07/14 06:03:39 tshiozak Exp $
+# $NetBSD: UCS%CP871.src,v 1.4 2005/03/11 23:38:02 christos Exp $
 
 TYPE		ROWCOL
 NAME		"UCS%CP871"
 SRC_ZONE	0x0000 - 0x203E
 OOB_MODE	INVALID
-DST_INVALID	0x3F
-DST_UNIT_BITS	8
+DST_INVALID	0xFFFF
+DST_UNIT_BITS	16
 
 BEGIN_MAP
 #
diff --git a/share/i18n/csmapper/CP/UCS%CP874.src b/share/i18n/csmapper/CP/UCS%CP874.src
index 3a191c66b0f7..f5f57100f105 100644
--- a/share/i18n/csmapper/CP/UCS%CP874.src
+++ b/share/i18n/csmapper/CP/UCS%CP874.src
@@ -1,11 +1,11 @@
-# $NetBSD: UCS%CP874.src,v 1.3 2003/07/14 06:03:39 tshiozak Exp $
+# $NetBSD: UCS%CP874.src,v 1.4 2005/03/11 23:38:02 christos Exp $
 
 TYPE		ROWCOL
 NAME		"UCS/CP874"
 SRC_ZONE	0x0000 - 0x20AC
 OOB_MODE	INVALID
 DST_INVALID	0xFF
-DST_UNIT_BITS	8
+DST_UNIT_BITS	16
 
 BEGIN_MAP
 #
diff --git a/share/i18n/csmapper/CP/UCS%CP875.src b/share/i18n/csmapper/CP/UCS%CP875.src
index 56728334c246..74c92a80232f 100644
--- a/share/i18n/csmapper/CP/UCS%CP875.src
+++ b/share/i18n/csmapper/CP/UCS%CP875.src
@@ -1,11 +1,11 @@
-# $NetBSD: UCS%CP875.src,v 1.3 2003/07/14 06:03:39 tshiozak Exp $
+# $NetBSD: UCS%CP875.src,v 1.4 2005/03/11 23:38:02 christos Exp $
 
 TYPE		ROWCOL
 NAME		"UCS/CP875"
 SRC_ZONE	0x0000 - 0x2019
 OOB_MODE	INVALID
-DST_INVALID	0x00
-DST_UNIT_BITS	8
+DST_INVALID	0xFFFF
+DST_UNIT_BITS	16
 
 BEGIN_MAP
 #
diff --git a/share/i18n/csmapper/CP/UCS%CP880.src b/share/i18n/csmapper/CP/UCS%CP880.src
index d1fbdcb8dbda..dca8d2ae3cde 100644
--- a/share/i18n/csmapper/CP/UCS%CP880.src
+++ b/share/i18n/csmapper/CP/UCS%CP880.src
@@ -1,11 +1,11 @@
-# $NetBSD: UCS%CP880.src,v 1.3 2003/07/14 06:03:39 tshiozak Exp $
+# $NetBSD: UCS%CP880.src,v 1.4 2005/03/11 23:38:02 christos Exp $
 
 TYPE		ROWCOL
 NAME		"UCS%CP880"
 SRC_ZONE	0x0000 - 0x2116
 OOB_MODE	INVALID
 DST_INVALID	0xD0
-DST_UNIT_BITS	8
+DST_UNIT_BITS	16
 
 BEGIN_MAP
 #
diff --git a/share/i18n/csmapper/CP/UCS%CP905.src b/share/i18n/csmapper/CP/UCS%CP905.src
index f63aad51d20d..be49fa12994a 100644
--- a/share/i18n/csmapper/CP/UCS%CP905.src
+++ b/share/i18n/csmapper/CP/UCS%CP905.src
@@ -1,11 +1,11 @@
-# $NetBSD: UCS%CP905.src,v 1.3 2003/07/14 06:03:39 tshiozak Exp $
+# $NetBSD: UCS%CP905.src,v 1.4 2005/03/11 23:38:02 christos Exp $
 
 TYPE		ROWCOL
 NAME		"UCS%CP905"
 SRC_ZONE	0x0000 - 0x02DB
 OOB_MODE	INVALID
 DST_INVALID	0xDF
-DST_UNIT_BITS	8
+DST_UNIT_BITS	16
 
 BEGIN_MAP
 #
diff --git a/share/i18n/csmapper/CP/UCS%CP918.src b/share/i18n/csmapper/CP/UCS%CP918.src
index 117b6a929b06..fb5873850ca9 100644
--- a/share/i18n/csmapper/CP/UCS%CP918.src
+++ b/share/i18n/csmapper/CP/UCS%CP918.src
@@ -1,11 +1,11 @@
-# $NetBSD: UCS%CP918.src,v 1.3 2003/07/14 06:03:40 tshiozak Exp $
+# $NetBSD: UCS%CP918.src,v 1.4 2005/03/11 23:38:02 christos Exp $
 
 TYPE		ROWCOL
 NAME		"UCS%CP918"
 SRC_ZONE	0x0000 - 0xFEE6
 OOB_MODE	INVALID
 DST_INVALID	0xFC
-DST_UNIT_BITS	8
+DST_UNIT_BITS	16
 
 BEGIN_MAP
 #