* iconvdata/Makefile (modules): Add IBM803, IBM901, IBM902, IBM921,

	IBM1008, IBM1008_420, IBM1097, IBM1112, IBM1123, IBM1130, IBM1140,
	IBM1141, IBM1142, IBM1143, IBM1144, IBM1145, IBM1146, IBM1147, IBM1148,
	IBM1149, IBM1166, IBM1167, IBM4517, IBM4899, IBM4909, IBM4971,
	IBM5347, IBM9030, IBM9066, IBM9448, IBM12712, IBM16804.
	(distribute): Add ibm803.c, ibm803.h, ibm901.c, ibm901.h, ibm902.c,
	ibm902.h, ibm921.c, ibm921.h, ibm1008.c, ibm1008.h, ibm1008_420.c,
	ibm1097.c, ibm1097.h, ibm1112.c, ibm1112.h, ibm1123.c, ibm1123.h,
	ibm1130.c, ibm1130.h, ibm1140.c, ibm1140.h, ibm1141.c, ibm1141.h,
	ibm1142.c, ibm1142.h, ibm1143.c, ibm1143.h, ibm1144.c, ibm1144.h,
	ibm1145.c, ibm1145.h, ibm1146.c, ibm1146.h, ibm1147.c, ibm1147.h,
	ibm1148.c, ibm1148.h, ibm1149.c, ibm1149.h, ibm1166.c, ibm1166.h,
	ibm1167.c, ibm1167.h, ibm4517.c, ibm4517.h, ibm4899.c, ibm4899.h,
	ibm4909.c, ibm4909.h, ibm4971.c, ibm4971.h, ibm5347.c, ibm5347.h,
	ibm9030.c, ibm9030.h, ibm9066.c, ibm9066.h, ibm9448.c, ibm9448.h,
	ibm12712.c, ibm12712.h, ibm16804.c, ibm16804.h.
	* iconvdata/TESTS: Add entries for new modules.
	* iconvdata/gconv-modules: Likewise.
	* iconvdata/ibm803.c: New file.
	* iconvdata/ibm803.h: New file.
	* iconvdata/ibm901.c: New file.
	* iconvdata/ibm901.h: New file.
	* iconvdata/ibm902.c: New file.
	* iconvdata/ibm902.h: New file.
	* iconvdata/ibm921.c: New file.
	* iconvdata/ibm921.h: New file.
	* iconvdata/ibm1008.c: New file.
	* iconvdata/ibm1008.h: New file.
	* iconvdata/ibm1008_420.c: New file.
	* iconvdata/ibm1097.c: New file.
	* iconvdata/ibm1097.h: New file.
	* iconvdata/ibm1112.c: New file.
	* iconvdata/ibm1112.h: New file.
	* iconvdata/ibm1123.c: New file.
	* iconvdata/ibm1123.h: New file.
	* iconvdata/ibm1130.c: New file.
	* iconvdata/ibm1130.h: New file.
	* iconvdata/ibm1140.c: New file.
	* iconvdata/ibm1140.h: New file.
	* iconvdata/ibm1141.c: New file.
	* iconvdata/ibm1141.h: New file.
	* iconvdata/ibm1142.c: New file.
	* iconvdata/ibm1142.h: New file.
	* iconvdata/ibm1143.c: New file.
	* iconvdata/ibm1143.h: New file.
	* iconvdata/ibm1144.c: New file.
	* iconvdata/ibm1144.h: New file.
	* iconvdata/ibm1145.c: New file.
	* iconvdata/ibm1145.h: New file.
	* iconvdata/ibm1146.c: New file.
	* iconvdata/ibm1146.h: New file.
	* iconvdata/ibm1147.c: New file.
	* iconvdata/ibm1147.h: New file.
	* iconvdata/ibm1148.c: New file.
	* iconvdata/ibm1148.h: New file.
	* iconvdata/ibm1149.c: New file.
	* iconvdata/ibm1149.h: New file.
	* iconvdata/ibm1166.c: New file.
	* iconvdata/ibm1166.h: New file.
	* iconvdata/ibm1167.c: New file.
	* iconvdata/ibm1167.h: New file.
	* iconvdata/ibm4517.c: New file.
	* iconvdata/ibm4517.h: New file.
	* iconvdata/ibm4899.c: New file.
	* iconvdata/ibm4899.h: New file.
	* iconvdata/ibm4909.c: New file.
	* iconvdata/ibm4909.h: New file.
	* iconvdata/ibm4971.c: New file.
	* iconvdata/ibm4971.h: New file.
	* iconvdata/ibm5347.c: New file.
	* iconvdata/ibm5347.h: New file.
	* iconvdata/ibm9030.c: New file.
	* iconvdata/ibm9030.h: New file.
	* iconvdata/ibm9066.c: New file.
	* iconvdata/ibm9066.h: New file.
	* iconvdata/ibm9448.c: New file.
	* iconvdata/ibm9448.h: New file.
	* iconvdata/ibm12712.c: New file.
	* iconvdata/ibm12712.h: New file.
	* iconvdata/ibm16804.c: New file.
	* iconvdata/ibm16804.h: New file.
	* iconvdata/testdata/IBM803: New file.
	* iconvdata/testdata/IBM803..UTF8: New file.
	* iconvdata/testdata/IBM901: New file.
	* iconvdata/testdata/IBM901..UTF8: New file.
	* iconvdata/testdata/IBM902: New file.
	* iconvdata/testdata/IBM902..UTF8: New file.
	* iconvdata/testdata/IBM921: New file.
	* iconvdata/testdata/IBM921..UTF8: New file.
	* iconvdata/testdata/IBM1008: New file.
	* iconvdata/testdata/IBM1008..UTF8: New file.
	* iconvdata/testdata/IBM1097: New file.
	* iconvdata/testdata/IBM1097..UTF8: New file.
	* iconvdata/testdata/IBM1112: New file.
	* iconvdata/testdata/IBM1112..UTF8: New file.
	* iconvdata/testdata/IBM1123: New file.
	* iconvdata/testdata/IBM1123..UTF8: New file.
	* iconvdata/testdata/IBM1130: New file.
	* iconvdata/testdata/IBM1130..UTF8: New file.
	* iconvdata/testdata/IBM1140: New file.
	* iconvdata/testdata/IBM1140..UTF8: New file.
	* iconvdata/testdata/IBM1141: New file.
	* iconvdata/testdata/IBM1141..UTF8: New file.
	* iconvdata/testdata/IBM1142: New file.
	* iconvdata/testdata/IBM1142..UTF8: New file.
	* iconvdata/testdata/IBM1143: New file.
	* iconvdata/testdata/IBM1143..UTF8: New file.
	* iconvdata/testdata/IBM1144: New file.
	* iconvdata/testdata/IBM1144..UTF8: New file.
	* iconvdata/testdata/IBM1145: New file.
	* iconvdata/testdata/IBM1145..UTF8: New file.
	* iconvdata/testdata/IBM1146: New file.
	* iconvdata/testdata/IBM1146..UTF8: New file.
	* iconvdata/testdata/IBM1147: New file.
	* iconvdata/testdata/IBM1147..UTF8: New file.
	* iconvdata/testdata/IBM1148: New file.
	* iconvdata/testdata/IBM1148..UTF8: New file.
	* iconvdata/testdata/IBM1149: New file.
	* iconvdata/testdata/IBM1149..UTF8: New file.
	* iconvdata/testdata/IBM1166: New file.
	* iconvdata/testdata/IBM1166..UTF8: New file.
	* iconvdata/testdata/IBM1167: New file.
	* iconvdata/testdata/IBM1167..UTF8: New file.
	* iconvdata/testdata/IBM4517: New file.
	* iconvdata/testdata/IBM4517..UTF8: New file.
	* iconvdata/testdata/IBM4899: New file.
	* iconvdata/testdata/IBM4899..UTF8: New file.
	* iconvdata/testdata/IBM4909: New file.
	* iconvdata/testdata/IBM4909..UTF8: New file.
	* iconvdata/testdata/IBM4971: New file.
	* iconvdata/testdata/IBM4971..UTF8: New file.
	* iconvdata/testdata/IBM5347: New file.
	* iconvdata/testdata/IBM5347..UTF8: New file.
	* iconvdata/testdata/IBM9030: New file.
	* iconvdata/testdata/IBM9030..UTF8: New file.
	* iconvdata/testdata/IBM9066: New file.
	* iconvdata/testdata/IBM9066..UTF8: New file.
	* iconvdata/testdata/IBM9448: New file.
	* iconvdata/testdata/IBM9448..UTF8: New file.
	* iconvdata/testdata/IBM12712: New file.
	* iconvdata/testdata/IBM12712..UTF8: New file.
	* iconvdata/testdata/IBM16804: New file.
	* iconvdata/testdata/IBM16804..UTF8: New file.

	* iconvdata/run-iconv-test.sh: Run ASCII->encoding->ASCII suntzus
	test only if $subset is N.

118 files changed, 4813 insertions, 2 deletions

diff --git a/iconvdata/Makefile b/iconvdata/Makefile
index a45c7a9b3d..2ea0fcfcce 100644
--- a/iconvdata/Makefile
+++ b/iconvdata/Makefile
@@ -53,7 +53,11 @@ modules	:= ISO8859-1 ISO8859-2 ISO8859-3 ISO8859-4 ISO8859-5		 \
 	   TCVN5712-1 libJISX0213 EUC-JISX0213 SHIFT_JISX0213		 \
 	   ISO-2022-JP-3 TSCII IBM866NAV CP932 EUC-JP-MS PT154 RK1048	 \
 	   IBM1025 IBM1122 IBM1137 IBM1153 IBM1154 IBM1155 IBM1156	 \
-	   IBM1157 IBM1158
+	   IBM1157 IBM1158 IBM803 IBM901 IBM902 IBM921 IBM1008 		 \
+	   IBM1008_420 IBM1097 IBM1112 IBM1123 IBM1130 IBM1140 IBM1141 	 \
+	   IBM1142 IBM1143 IBM1144 IBM1145 IBM1146 IBM1147 IBM1148 	 \
+	   IBM1149 IBM1166 IBM1167 IBM4517 IBM4899 IBM4909 IBM4971 	 \
+	   IBM5347 IBM9030 IBM9066 IBM9448 IBM12712 IBM16804
 
 modules.so := $(addsuffix .so, $(modules))
 
@@ -177,7 +181,18 @@ distribute := gconv-modules extra-module.mk gap.awk gaptab.awk gconv.map    \
 	      tcvn5712-1.c armscii-8.c tscii.c ibm866nav.c pt154.c rk1048.c \
 	      ibm1025.c ibm1025.h ibm1122.c ibm1122.h ibm1137.c ibm1137.h   \
 	      ibm1153.c ibm1153.h ibm1154.c ibm1154.h ibm1155.c ibm1155.h   \
-	      ibm1156.c ibm1156.h ibm1157.c ibm1157.h ibm1158.c ibm1158.h
+	      ibm1156.c ibm1156.h ibm1157.c ibm1157.h ibm1158.c ibm1158.h   \
+	      ibm803.c ibm803.h ibm901.c ibm901.h ibm902.c ibm902.h	    \
+	      ibm921.c ibm921.h ibm1008.c ibm1008.h ibm1008_420.c	    \
+	      ibm1097.c ibm1097.h ibm1112.c ibm1112.h ibm1123.c ibm1123.h   \
+	      ibm1130.c ibm1130.h ibm1140.c ibm1140.h ibm1141.c ibm1141.h   \
+	      ibm1142.c ibm1142.h ibm1143.c ibm1143.h ibm1144.c ibm1144.h   \
+	      ibm1145.c ibm1145.h ibm1146.c ibm1146.h ibm1147.c ibm1147.h   \
+	      ibm1148.c ibm1148.h ibm1149.c ibm1149.h ibm1166.c ibm1166.h   \
+	      ibm1167.c ibm1167.h ibm4517.c ibm4517.h ibm4899.c ibm4899.h   \
+	      ibm4909.c ibm4909.h ibm4971.c ibm4971.h ibm5347.c ibm5347.h   \
+	      ibm9030.c ibm9030.h ibm9066.c ibm9066.h ibm9448.c ibm9448.h   \
+	      ibm12712.c ibm12712.h ibm16804.c ibm16804.h
 
 # We build the transformation modules only when we build shared libs.
 ifeq (yes,$(build-shared))
diff --git a/iconvdata/TESTS b/iconvdata/TESTS
index 8ff19125c3..05b0837558 100644
--- a/iconvdata/TESTS
+++ b/iconvdata/TESTS
@@ -128,3 +128,34 @@ IBM1155			IBM1155			N	UTF8
 IBM1156			IBM1156			N	UTF8
 IBM1157			IBM1157			N	UTF8
 IBM1158			IBM1158			N	UTF8
+IBM803			IBM803			-	UTF8
+IBM901			IBM901			N	UTF8
+IBM902			IBM902			N	UTF8
+IBM921			IBM921			N	UTF8
+IBM1008			IBM1008			N	UTF8
+IBM1097			IBM1097			Y	UTF8
+IBM1112			IBM1112			N	UTF8
+IBM1123			IBM1123			N	UTF8
+IBM1130			IBM1130			N	UTF8
+IBM1140			IBM1140			N	UTF8
+IBM1141			IBM1141			N	UTF8
+IBM1142			IBM1142			N	UTF8
+IBM1143			IBM1143			N	UTF8
+IBM1144			IBM1144			N	UTF8
+IBM1145			IBM1145			N	UTF8
+IBM1146			IBM1146			N	UTF8
+IBM1147			IBM1147			N	UTF8
+IBM1148			IBM1148			N	UTF8
+IBM1149			IBM1149			N	UTF8
+IBM1166			IBM1166			N	UTF8
+IBM1167			IBM1167			N	UTF8
+IBM4517			IBM4517			-	UTF8
+IBM4899			IBM4899			-	UTF8
+IBM4909			IBM4909			N	UTF8
+IBM4971			IBM4971			N	UTF8
+IBM5347			IBM5347			N	UTF8
+IBM9030			IBM9030			N	UTF8
+IBM9066			IBM9066			N	UTF8
+IBM9448			IBM9448			N	UTF8
+IBM12712		IBM12712		N	UTF8
+IBM16804		IBM16804		-	UTF8
diff --git a/iconvdata/gconv-modules b/iconvdata/gconv-modules
index 75d4228497..e03795f529 100644
--- a/iconvdata/gconv-modules
+++ b/iconvdata/gconv-modules
@@ -1641,3 +1641,224 @@ alias	CP1158//		IBM1158//
 alias	CSIBM1158//		IBM1158//
 module	IBM1158//		INTERNAL		IBM1158		1
 module	INTERNAL		IBM1158//		IBM1158		1
+
+#	from			to			module		cost
+alias	IBM-803//		IBM803//
+alias	CP803//		IBM803//
+alias	CSIBM803//		IBM803//
+module	IBM803//		INTERNAL		IBM803		1
+module	INTERNAL		IBM803//		IBM803		1
+
+#	from			to			module		cost
+alias	IBM-901//		IBM901//
+alias	CP901//		IBM901//
+alias	CSIBM901//		IBM901//
+module	IBM901//		INTERNAL		IBM901		1
+module	INTERNAL		IBM901//		IBM901		1
+
+#	from			to			module		cost
+alias	IBM-902//		IBM902//
+alias	CP902//		IBM902//
+alias	CSIBM902//		IBM902//
+module	IBM902//		INTERNAL		IBM902		1
+module	INTERNAL		IBM902//		IBM902		1
+
+#	from			to			module		cost
+alias	IBM-921//		IBM921//
+alias	CP921//		IBM921//
+alias	CSIBM921//		IBM921//
+module	IBM921//		INTERNAL		IBM921		1
+module	INTERNAL		IBM921//		IBM921		1
+
+#	from			to			module		cost
+alias	IBM-1008//		IBM1008//
+alias	CP1008//		IBM1008//
+alias	CSIBM1008//		IBM1008//
+module	IBM1008//		INTERNAL		IBM1008		1
+module	INTERNAL		IBM1008//		IBM1008		1
+
+#	from			to			module		cost
+module	IBM1008//		IBM420//		IBM1008_420	1
+module	IBM420//		IBM1008//		IBM1008_420	1
+
+#	from			to			module		cost
+alias	IBM-1097//		IBM1097//
+alias	CP1097//		IBM1097//
+alias	CSIBM1097//		IBM1097//
+module	IBM1097//		INTERNAL		IBM1097		1
+module	INTERNAL		IBM1097//		IBM1097		1
+
+#	from			to			module		cost
+alias	IBM-1112//		IBM1112//
+alias	CP1112//		IBM1112//
+alias	CSIBM1112//		IBM1112//
+module	IBM1112//		INTERNAL		IBM1112		1
+module	INTERNAL		IBM1112//		IBM1112		1
+
+#	from			to			module		cost
+alias	IBM-1123//		IBM1123//
+alias	CP1123//		IBM1123//
+alias	CSIBM1123//		IBM1123//
+module	IBM1123//		INTERNAL		IBM1123		1
+module	INTERNAL		IBM1123//		IBM1123		1
+
+#	from			to			module		cost
+alias	IBM-1130//		IBM1130//
+alias	CP1130//		IBM1130//
+alias	CSIBM1130//		IBM1130//
+module	IBM1130//		INTERNAL		IBM1130		1
+module	INTERNAL		IBM1130//		IBM1130		1
+
+#	from			to			module		cost
+alias	IBM-1140//		IBM1140//
+alias	CP1140//		IBM1140//
+alias	CSIBM1140//		IBM1140//
+module	IBM1140//		INTERNAL		IBM1140		1
+module	INTERNAL		IBM1140//		IBM1140		1
+
+#	from			to			module		cost
+alias	IBM-1141//		IBM1141//
+alias	CP1141//		IBM1141//
+alias	CSIBM1141//		IBM1141//
+module	IBM1141//		INTERNAL		IBM1141		1
+module	INTERNAL		IBM1141//		IBM1141		1
+
+#	from			to			module		cost
+alias	IBM-1142//		IBM1142//
+alias	CP1142//		IBM1142//
+alias	CSIBM1142//		IBM1142//
+module	IBM1142//		INTERNAL		IBM1142		1
+module	INTERNAL		IBM1142//		IBM1142		1
+
+#	from			to			module		cost
+alias	IBM-1143//		IBM1143//
+alias	CP1143//		IBM1143//
+alias	CSIBM1143//		IBM1143//
+module	IBM1143//		INTERNAL		IBM1143		1
+module	INTERNAL		IBM1143//		IBM1143		1
+
+#	from			to			module		cost
+alias	IBM-1144//		IBM1144//
+alias	CP1144//		IBM1144//
+alias	CSIBM1144//		IBM1144//
+module	IBM1144//		INTERNAL		IBM1144		1
+module	INTERNAL		IBM1144//		IBM1144		1
+
+#	from			to			module		cost
+alias	IBM-1145//		IBM1145//
+alias	CP1145//		IBM1145//
+alias	CSIBM1145//		IBM1145//
+module	IBM1145//		INTERNAL		IBM1145		1
+module	INTERNAL		IBM1145//		IBM1145		1
+
+#	from			to			module		cost
+alias	IBM-1146//		IBM1146//
+alias	CP1146//		IBM1146//
+alias	CSIBM1146//		IBM1146//
+module	IBM1146//		INTERNAL		IBM1146		1
+module	INTERNAL		IBM1146//		IBM1146		1
+
+#	from			to			module		cost
+alias	IBM-1147//		IBM1147//
+alias	CP1147//		IBM1147//
+alias	CSIBM1147//		IBM1147//
+module	IBM1147//		INTERNAL		IBM1147		1
+module	INTERNAL		IBM1147//		IBM1147		1
+
+#	from			to			module		cost
+alias	IBM-1148//		IBM1148//
+alias	CP1148//		IBM1148//
+alias	CSIBM1148//		IBM1148//
+module	IBM1148//		INTERNAL		IBM1148		1
+module	INTERNAL		IBM1148//		IBM1148		1
+
+#	from			to			module		cost
+alias	IBM-1149//		IBM1149//
+alias	CP1149//		IBM1149//
+alias	CSIBM1149//		IBM1149//
+module	IBM1149//		INTERNAL		IBM1149		1
+module	INTERNAL		IBM1149//		IBM1149		1
+
+#	from			to			module		cost
+alias	IBM-1166//		IBM1166//
+alias	CP1166//		IBM1166//
+alias	CSIBM1166//		IBM1166//
+module	IBM1166//		INTERNAL		IBM1166		1
+module	INTERNAL		IBM1166//		IBM1166		1
+
+#	from			to			module		cost
+alias	IBM-1167//		IBM1167//
+alias	CP1167//		IBM1167//
+alias	CSIBM1167//		IBM1167//
+module	IBM1167//		INTERNAL		IBM1167		1
+module	INTERNAL		IBM1167//		IBM1167		1
+
+#	from			to			module		cost
+alias	IBM-4517//		IBM4517//
+alias	CP4517//		IBM4517//
+alias	CSIBM4517//		IBM4517//
+module	IBM4517//		INTERNAL		IBM4517		1
+module	INTERNAL		IBM4517//		IBM4517		1
+
+#	from			to			module		cost
+alias	IBM-4899//		IBM4899//
+alias	CP4899//		IBM4899//
+alias	CSIBM4899//		IBM4899//
+module	IBM4899//		INTERNAL		IBM4899		1
+module	INTERNAL		IBM4899//		IBM4899		1
+
+#	from			to			module		cost
+alias	IBM-4909//		IBM4909//
+alias	CP4909//		IBM4909//
+alias	CSIBM4909//		IBM4909//
+module	IBM4909//		INTERNAL		IBM4909		1
+module	INTERNAL		IBM4909//		IBM4909		1
+
+#	from			to			module		cost
+alias	IBM-4971//		IBM4971//
+alias	CP4971//		IBM4971//
+alias	CSIBM4971//		IBM4971//
+module	IBM4971//		INTERNAL		IBM4971		1
+module	INTERNAL		IBM4971//		IBM4971		1
+
+#	from			to			module		cost
+alias	IBM-5347//		IBM5347//
+alias	CP5347//		IBM5347//
+alias	CSIBM5347//		IBM5347//
+module	IBM5347//		INTERNAL		IBM5347		1
+module	INTERNAL		IBM5347//		IBM5347		1
+
+#	from			to			module		cost
+alias	IBM-9030//		IBM9030//
+alias	CP9030//		IBM9030//
+alias	CSIBM9030//		IBM9030//
+module	IBM9030//		INTERNAL		IBM9030		1
+module	INTERNAL		IBM9030//		IBM9030		1
+
+#	from			to			module		cost
+alias	IBM-9066//		IBM9066//
+alias	CP9066//		IBM9066//
+alias	CSIBM9066//		IBM9066//
+module	IBM9066//		INTERNAL		IBM9066		1
+module	INTERNAL		IBM9066//		IBM9066		1
+
+#	from			to			module		cost
+alias	IBM-9448//		IBM9448//
+alias	CP9448//		IBM9448//
+alias	CSIBM9448//		IBM9448//
+module	IBM9448//		INTERNAL		IBM9448		1
+module	INTERNAL		IBM9448//		IBM9448		1
+
+#	from			to			module		cost
+alias	IBM-12712//		IBM12712//
+alias	CP12712//		IBM12712//
+alias	CSIBM12712//		IBM12712//
+module	IBM12712//		INTERNAL		IBM12712		1
+module	INTERNAL		IBM12712//		IBM12712		1
+
+#	from			to			module		cost
+alias	IBM-16804//		IBM16804//
+alias	CP16804//		IBM16804//
+alias	CSIBM16804//		IBM16804//
+module	IBM16804//		INTERNAL		IBM16804		1
+module	INTERNAL		IBM16804//		IBM16804		1
diff --git a/iconvdata/ibm1008_420.c b/iconvdata/ibm1008_420.c
new file mode 100644
index 0000000000..7dd964ab7f
--- /dev/null
+++ b/iconvdata/ibm1008_420.c
@@ -0,0 +1,197 @@
+/* Mapping tables from IBM1008 to IBM420 and vice versa.
+   Copyright (C) 2005 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#include <dlfcn.h>
+#include <gconv.h>
+#include <stdint.h>
+
+static const char __from_ibm1008_to_ibm420[256] =
+{
+  [0x00] = 0x00, [0x01] = 0x01, [0x02] = 0x02, [0x03] = 0x03, 
+  [0x04] = 0x37, [0x05] = 0x2D, [0x06] = 0x2E, [0x07] = 0x2F, 
+  [0x08] = 0x16, [0x09] = 0x05, [0x0A] = 0x25, [0x0B] = 0x0B, 
+  [0x0C] = 0x0C, [0x0D] = 0x0D, [0x0E] = 0x0E, [0x0F] = 0x0F, 
+  [0x10] = 0x10, [0x11] = 0x11, [0x12] = 0x12, [0x13] = 0x13, 
+  [0x14] = 0x3C, [0x15] = 0x3D, [0x16] = 0x32, [0x17] = 0x26, 
+  [0x18] = 0x18, [0x19] = 0x19, [0x1A] = 0x3F, [0x1B] = 0x27, 
+  [0x1C] = 0x1C, [0x1D] = 0x1D, [0x1E] = 0x1E, [0x1F] = 0x1F, 
+  [0x20] = 0x40, [0x21] = 0x5A, [0x22] = 0x7F, [0x23] = 0x7B, 
+  [0x24] = 0x5B, [0x25] = 0x6C, [0x26] = 0x50, [0x27] = 0x7D, 
+  [0x28] = 0x4D, [0x29] = 0x5D, [0x2A] = 0x5C, [0x2B] = 0x4E, 
+  [0x2C] = 0x6B, [0x2D] = 0x60, [0x2E] = 0x4B, [0x2F] = 0x61, 
+  [0x30] = 0xF0, [0x31] = 0xF1, [0x32] = 0xF2, [0x33] = 0xF3, 
+  [0x34] = 0xF4, [0x35] = 0xF5, [0x36] = 0xF6, [0x37] = 0xF7, 
+  [0x38] = 0xF8, [0x39] = 0xF9, [0x3A] = 0x7A, [0x3B] = 0x5E, 
+  [0x3C] = 0x4C, [0x3D] = 0x7E, [0x3E] = 0x6E, [0x3F] = 0x6F, 
+  [0x40] = 0x7C, [0x41] = 0xC1, [0x42] = 0xC2, [0x43] = 0xC3, 
+  [0x44] = 0xC4, [0x45] = 0xC5, [0x46] = 0xC6, [0x47] = 0xC7, 
+  [0x48] = 0xC8, [0x49] = 0xC9, [0x4A] = 0xD1, [0x4B] = 0xD2, 
+  [0x4C] = 0xD3, [0x4D] = 0xD4, [0x4E] = 0xD5, [0x4F] = 0xD6, 
+  [0x50] = 0xD7, [0x51] = 0xD8, [0x52] = 0xD9, [0x53] = 0xE2, 
+  [0x54] = 0xE3, [0x55] = 0xE4, [0x56] = 0xE5, [0x57] = 0xE6, 
+  [0x58] = 0xE7, [0x59] = 0xE8, [0x5A] = 0xE9, [0x5B] = 0x53, 
+  [0x5C] = 0x54, [0x5D] = 0xB6, [0x5E] = 0xB7, [0x5F] = 0x6D, 
+  [0x60] = 0xCC, [0x61] = 0x81, [0x62] = 0x82, [0x63] = 0x83, 
+  [0x64] = 0x84, [0x65] = 0x85, [0x66] = 0x86, [0x67] = 0x87, 
+  [0x68] = 0x88, [0x69] = 0x89, [0x6A] = 0x91, [0x6B] = 0x92, 
+  [0x6C] = 0x93, [0x6D] = 0x94, [0x6E] = 0x95, [0x6F] = 0x96, 
+  [0x70] = 0x97, [0x71] = 0x98, [0x72] = 0x99, [0x73] = 0xA2, 
+  [0x74] = 0xA3, [0x75] = 0xA4, [0x76] = 0xA5, [0x77] = 0xA6, 
+  [0x78] = 0xA7, [0x79] = 0xA8, [0x7A] = 0xA9, [0x7B] = 0xCE, 
+  [0x7C] = 0x4F, [0x7D] = 0xE1, [0x7E] = 0xEC, [0x7F] = 0x07, 
+  [0x80] = 0x20, [0x81] = 0x21, [0x82] = 0x22, [0x83] = 0x23, 
+  [0x84] = 0x24, [0x85] = 0x15, [0x86] = 0x06, [0x87] = 0x17, 
+  [0x88] = 0x28, [0x89] = 0x29, [0x8A] = 0x2A, [0x8B] = 0x2B, 
+  [0x8C] = 0x2C, [0x8D] = 0x09, [0x8E] = 0x0A, [0x8F] = 0x1B, 
+  [0x90] = 0x30, [0x91] = 0x31, [0x92] = 0x1A, [0x93] = 0x33, 
+  [0x94] = 0x34, [0x95] = 0x35, [0x96] = 0x36, [0x97] = 0x08, 
+  [0x98] = 0x38, [0x99] = 0x39, [0x9A] = 0x3A, [0x9B] = 0x3B, 
+  [0x9C] = 0x04, [0x9D] = 0x14, [0x9E] = 0x3E, [0x9F] = 0xFF, 
+  [0xA0] = 0x41, [0xA1] = 0x79, [0xA2] = 0x4A, [0xA3] = 0xC0, 
+  [0xA4] = 0xD0, [0xA5] = 0x42, [0xA6] = 0x6A, [0xA7] = 0x43, 
+  [0xA8] = 0x44, [0xA9] = 0x45, [0xAA] = 0x46, [0xAB] = 0x47, 
+  [0xAC] = 0x5F, [0xAD] = 0xCA, [0xAE] = 0x48, [0xAF] = 0x49, 
+  [0xB0] = 0xDF, [0xB1] = 0xEA, [0xB2] = 0xEB, [0xB3] = 0xED, 
+  [0xB4] = 0xEE, [0xB5] = 0xEF, [0xB6] = 0xFB, [0xB7] = 0xFC, 
+  [0xB8] = 0xFD, [0xB9] = 0xFE, [0xBA] = 0x51, [0xBB] = 0x52, 
+  [0xBC] = 0x55, [0xBD] = 0x56, [0xBE] = 0x57, [0xBF] = 0x58, 
+  [0xC0] = 0x59, [0xC1] = 0x62, [0xC2] = 0x63, [0xC3] = 0x64, 
+  [0xC4] = 0x65, [0xC5] = 0x66, [0xC6] = 0x67, [0xC7] = 0x68, 
+  [0xC8] = 0x69, [0xC9] = 0x70, [0xCA] = 0x71, [0xCB] = 0x72, 
+  [0xCC] = 0x73, [0xCD] = 0x74, [0xCE] = 0x75, [0xCF] = 0x76, 
+  [0xD0] = 0x77, [0xD1] = 0x78, [0xD2] = 0x80, [0xD3] = 0x8A, 
+  [0xD4] = 0x8B, [0xD5] = 0x8C, [0xD6] = 0x8D, [0xD7] = 0xE0, 
+  [0xD8] = 0x8E, [0xD9] = 0x8F, [0xDA] = 0x90, [0xDB] = 0x9A, 
+  [0xDC] = 0x9B, [0xDD] = 0x9C, [0xDE] = 0x9D, [0xDF] = 0x9E, 
+  [0xE0] = 0x9F, [0xE1] = 0xA0, [0xE2] = 0xAA, [0xE3] = 0xAB, 
+  [0xE4] = 0xAC, [0xE5] = 0xAD, [0xE6] = 0xAE, [0xE7] = 0xAF, 
+  [0xE8] = 0xB0, [0xE9] = 0xB1, [0xEA] = 0xB2, [0xEB] = 0xB3, 
+  [0xEC] = 0xB4, [0xED] = 0xB5, [0xEE] = 0xB8, [0xEF] = 0xB9, 
+  [0xF0] = 0xBA, [0xF1] = 0xBB, [0xF2] = 0xBC, [0xF3] = 0xBD, 
+  [0xF4] = 0xBE, [0xF5] = 0xBF, [0xF6] = 0xCB, [0xF7] = 0xA1, 
+  [0xF8] = 0xCD, [0xF9] = 0xCF, [0xFA] = 0xDA, [0xFB] = 0xDB, 
+  [0xFC] = 0xDC, [0xFD] = 0xDD, [0xFE] = 0xDE, [0xFF] = 0xFA, 
+};
+
+static const char __from_ibm420_to_ibm1008[256] =
+{
+  [0x00] = 0x00, [0x01] = 0x01, [0x02] = 0x02, [0x03] = 0x03, 
+  [0x04] = 0x9C, [0x05] = 0x09, [0x06] = 0x86, [0x07] = 0x7F, 
+  [0x08] = 0x97, [0x09] = 0x8D, [0x0A] = 0x8E, [0x0B] = 0x0B, 
+  [0x0C] = 0x0C, [0x0D] = 0x0D, [0x0E] = 0x0E, [0x0F] = 0x0F, 
+  [0x10] = 0x10, [0x11] = 0x11, [0x12] = 0x12, [0x13] = 0x13, 
+  [0x14] = 0x9D, [0x15] = 0x85, [0x16] = 0x08, [0x17] = 0x87, 
+  [0x18] = 0x18, [0x19] = 0x19, [0x1A] = 0x92, [0x1B] = 0x8F, 
+  [0x1C] = 0x1C, [0x1D] = 0x1D, [0x1E] = 0x1E, [0x1F] = 0x1F, 
+  [0x20] = 0x80, [0x21] = 0x81, [0x22] = 0x82, [0x23] = 0x83, 
+  [0x24] = 0x84, [0x25] = 0x0A, [0x26] = 0x17, [0x27] = 0x1B, 
+  [0x28] = 0x88, [0x29] = 0x89, [0x2A] = 0x8A, [0x2B] = 0x8B, 
+  [0x2C] = 0x8C, [0x2D] = 0x05, [0x2E] = 0x06, [0x2F] = 0x07, 
+  [0x30] = 0x90, [0x31] = 0x91, [0x32] = 0x16, [0x33] = 0x93, 
+  [0x34] = 0x94, [0x35] = 0x95, [0x36] = 0x96, [0x37] = 0x04, 
+  [0x38] = 0x98, [0x39] = 0x99, [0x3A] = 0x9A, [0x3B] = 0x9B, 
+  [0x3C] = 0x14, [0x3D] = 0x15, [0x3E] = 0x9E, [0x3F] = 0x1A, 
+  [0x40] = 0x20, [0x41] = 0xA0, [0x42] = 0xA5, [0x43] = 0xA7, 
+  [0x44] = 0xA8, [0x45] = 0xA9, [0x46] = 0xAA, [0x47] = 0xAB, 
+  [0x48] = 0xAE, [0x49] = 0xAF, [0x4A] = 0xA2, [0x4B] = 0x2E, 
+  [0x4C] = 0x3C, [0x4D] = 0x28, [0x4E] = 0x2B, [0x4F] = 0x7C, 
+  [0x50] = 0x26, [0x51] = 0xBA, [0x52] = 0xBB, [0x53] = 0x5B, 
+  [0x54] = 0x5C, [0x55] = 0xBC, [0x56] = 0xBD, [0x57] = 0xBE, 
+  [0x58] = 0xBF, [0x59] = 0xC0, [0x5A] = 0x21, [0x5B] = 0x24, 
+  [0x5C] = 0x2A, [0x5D] = 0x29, [0x5E] = 0x3B, [0x5F] = 0xAC, 
+  [0x60] = 0x2D, [0x61] = 0x2F, [0x62] = 0xC1, [0x63] = 0xC2, 
+  [0x64] = 0xC3, [0x65] = 0xC4, [0x66] = 0xC5, [0x67] = 0xC6, 
+  [0x68] = 0xC7, [0x69] = 0xC8, [0x6A] = 0xA6, [0x6B] = 0x2C, 
+  [0x6C] = 0x25, [0x6D] = 0x5F, [0x6E] = 0x3E, [0x6F] = 0x3F, 
+  [0x70] = 0xC9, [0x71] = 0xCA, [0x72] = 0xCB, [0x73] = 0xCC, 
+  [0x74] = 0xCD, [0x75] = 0xCE, [0x76] = 0xCF, [0x77] = 0xD0, 
+  [0x78] = 0xD1, [0x79] = 0xA1, [0x7A] = 0x3A, [0x7B] = 0x23, 
+  [0x7C] = 0x40, [0x7D] = 0x27, [0x7E] = 0x3D, [0x7F] = 0x22, 
+  [0x80] = 0xD2, [0x81] = 0x61, [0x82] = 0x62, [0x83] = 0x63, 
+  [0x84] = 0x64, [0x85] = 0x65, [0x86] = 0x66, [0x87] = 0x67, 
+  [0x88] = 0x68, [0x89] = 0x69, [0x8A] = 0xD3, [0x8B] = 0xD4, 
+  [0x8C] = 0xD5, [0x8D] = 0xD6, [0x8E] = 0xD8, [0x8F] = 0xD9, 
+  [0x90] = 0xDA, [0x91] = 0x6A, [0x92] = 0x6B, [0x93] = 0x6C, 
+  [0x94] = 0x6D, [0x95] = 0x6E, [0x96] = 0x6F, [0x97] = 0x70, 
+  [0x98] = 0x71, [0x99] = 0x72, [0x9A] = 0xDB, [0x9B] = 0xDC, 
+  [0x9C] = 0xDD, [0x9D] = 0xDE, [0x9E] = 0xDF, [0x9F] = 0xE0, 
+  [0xA0] = 0xE1, [0xA1] = 0xF7, [0xA2] = 0x73, [0xA3] = 0x74, 
+  [0xA4] = 0x75, [0xA5] = 0x76, [0xA6] = 0x77, [0xA7] = 0x78, 
+  [0xA8] = 0x79, [0xA9] = 0x7A, [0xAA] = 0xE2, [0xAB] = 0xE3, 
+  [0xAC] = 0xE4, [0xAD] = 0xE5, [0xAE] = 0xE6, [0xAF] = 0xE7, 
+  [0xB0] = 0xE8, [0xB1] = 0xE9, [0xB2] = 0xEA, [0xB3] = 0xEB, 
+  [0xB4] = 0xEC, [0xB5] = 0xED, [0xB6] = 0x5D, [0xB7] = 0x5E, 
+  [0xB8] = 0xEE, [0xB9] = 0xEF, [0xBA] = 0xF0, [0xBB] = 0xF1, 
+  [0xBC] = 0xF2, [0xBD] = 0xF3, [0xBE] = 0xF4, [0xBF] = 0xF5, 
+  [0xC0] = 0xA3, [0xC1] = 0x41, [0xC2] = 0x42, [0xC3] = 0x43, 
+  [0xC4] = 0x44, [0xC5] = 0x45, [0xC6] = 0x46, [0xC7] = 0x47, 
+  [0xC8] = 0x48, [0xC9] = 0x49, [0xCA] = 0xAD, [0xCB] = 0xF6, 
+  [0xCC] = 0x60, [0xCD] = 0xF8, [0xCE] = 0x7B, [0xCF] = 0xF9, 
+  [0xD0] = 0xA4, [0xD1] = 0x4A, [0xD2] = 0x4B, [0xD3] = 0x4C, 
+  [0xD4] = 0x4D, [0xD5] = 0x4E, [0xD6] = 0x4F, [0xD7] = 0x50, 
+  [0xD8] = 0x51, [0xD9] = 0x52, [0xDA] = 0xFA, [0xDB] = 0xFB, 
+  [0xDC] = 0xFC, [0xDD] = 0xFD, [0xDE] = 0xFE, [0xDF] = 0xB0, 
+  [0xE0] = 0xD7, [0xE1] = 0x7D, [0xE2] = 0x53, [0xE3] = 0x54, 
+  [0xE4] = 0x55, [0xE5] = 0x56, [0xE6] = 0x57, [0xE7] = 0x58, 
+  [0xE8] = 0x59, [0xE9] = 0x5A, [0xEA] = 0xB1, [0xEB] = 0xB2, 
+  [0xEC] = 0x7E, [0xED] = 0xB3, [0xEE] = 0xB4, [0xEF] = 0xB5, 
+  [0xF0] = 0x30, [0xF1] = 0x31, [0xF2] = 0x32, [0xF3] = 0x33, 
+  [0xF4] = 0x34, [0xF5] = 0x35, [0xF6] = 0x36, [0xF7] = 0x37, 
+  [0xF8] = 0x38, [0xF9] = 0x39, [0xFA] = 0xFF, [0xFB] = 0xB6, 
+  [0xFC] = 0xB7, [0xFD] = 0xB8, [0xFE] = 0xB9, [0xFF] = 0x9F, 
+};
+
+#define CHARSET_NAME		"IBM1008//"
+#define FROM_LOOP		from_ibm1008_to_ibm420
+#define TO_LOOP			from_ibm420_to_ibm1008
+#define DEFINE_INIT		1
+#define DEFINE_FINI		1
+#define MIN_NEEDED_FROM		1
+#define MIN_NEEDED_TO		1
+
+/* First define the conversion function from the 8bit charset to UCS4.  */
+#define MIN_NEEDED_INPUT	MIN_NEEDED_FROM
+#define MIN_NEEDED_OUTPUT	MIN_NEEDED_TO
+#define LOOPFCT			FROM_LOOP
+#define BODY \
+  {									      \
+    const char ch = __from_ibm1008_to_ibm420[*inptr];			      \
+    *outptr++ = ch;							      \
+    ++inptr;								      \
+  }
+#define LOOP_NEED_FLAGS
+#include <iconv/loop.c>
+
+
+/* Next, define the other direction.  */
+#define MIN_NEEDED_INPUT	MIN_NEEDED_TO
+#define MIN_NEEDED_OUTPUT	MIN_NEEDED_FROM
+#define LOOPFCT			TO_LOOP
+#define BODY \
+  {									      \
+    const char ch = __from_ibm420_to_ibm1008[*inptr];			      \
+    *outptr++ = ch;							      \
+    ++inptr;								      \
+  }
+#define LOOP_NEED_FLAGS
+#include <iconv/loop.c>
+
+/* Now define the toplevel functions.  */
+#include <iconv/skeleton.c>
diff --git a/iconvdata/ibm1097.c b/iconvdata/ibm1097.c
new file mode 100644
index 0000000000..20eebe7cdb
--- /dev/null
+++ b/iconvdata/ibm1097.c
@@ -0,0 +1,29 @@
+/* Conversion from and to IBM1097.
+   Copyright (C) 2005 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#include <stdint.h>
+
+/* Get the conversion table.  */
+#define TABLES <ibm1097.h>
+
+#define CHARSET_NAME	"IBM1097//"
+#define HAS_HOLES	0	/* All 256 character are defined.  */
+
+#include <8bit-gap.c>
diff --git a/iconvdata/ibm1097.h b/iconvdata/ibm1097.h
new file mode 100644
index 0000000000..4d985b6240
--- /dev/null
+++ b/iconvdata/ibm1097.h
@@ -0,0 +1,159 @@
+/* Tables for conversion from and to IBM1097.
+   Copyright (C) 2005 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+static const uint32_t to_ucs4[256] =
+{
+  [0x00] = 0x0000, [0x01] = 0x0001, [0x02] = 0x0002, [0x03] = 0x0003,
+  [0x04] = 0x009c, [0x05] = 0x0009, [0x06] = 0x0086, [0x07] = 0x007f,
+  [0x08] = 0x0097, [0x09] = 0x008d, [0x0a] = 0x008e, [0x0b] = 0x000b,
+  [0x0c] = 0x000c, [0x0d] = 0x000d, [0x0e] = 0x000e, [0x0f] = 0x000f,
+  [0x10] = 0x0010, [0x11] = 0x0011, [0x12] = 0x0012, [0x13] = 0x0013,
+  [0x14] = 0x009d, [0x15] = 0x0085, [0x16] = 0x0008, [0x17] = 0x0087,
+  [0x18] = 0x0018, [0x19] = 0x0019, [0x1a] = 0x0092, [0x1b] = 0x008f,
+  [0x1c] = 0x001c, [0x1d] = 0x001d, [0x1e] = 0x001e, [0x1f] = 0x001f,
+  [0x20] = 0x0080, [0x21] = 0x0081, [0x22] = 0x0082, [0x23] = 0x0083,
+  [0x24] = 0x0084, [0x25] = 0x000a, [0x26] = 0x0017, [0x27] = 0x001b,
+  [0x28] = 0x0088, [0x29] = 0x0089, [0x2a] = 0x008a, [0x2b] = 0x008b,
+  [0x2c] = 0x008c, [0x2d] = 0x0005, [0x2e] = 0x0006, [0x2f] = 0x0007,
+  [0x30] = 0x0090, [0x31] = 0x0091, [0x32] = 0x0016, [0x33] = 0x0093,
+  [0x34] = 0x0094, [0x35] = 0x0095, [0x36] = 0x0096, [0x37] = 0x0004,
+  [0x38] = 0x0098, [0x39] = 0x0099, [0x3a] = 0x009a, [0x3b] = 0x009b,
+  [0x3c] = 0x0014, [0x3d] = 0x0015, [0x3e] = 0x009e, [0x3f] = 0x001a,
+  [0x40] = 0x0020, [0x41] = 0x00a0, [0x42] = 0x060c, [0x43] = 0x064b,
+  [0x44] = 0xfe81, [0x45] = 0xfe82, [0x46] = 0xf8fa, [0x47] = 0xfe8d,
+  [0x48] = 0xfe8e, [0x49] = 0xf8fb, [0x4a] = 0x00a4, [0x4b] = 0x002e,
+  [0x4c] = 0x003c, [0x4d] = 0x0028, [0x4e] = 0x002b, [0x4f] = 0x007c,
+  [0x50] = 0x0026, [0x51] = 0xfe80, [0x52] = 0xfe83, [0x53] = 0xfe84,
+  [0x54] = 0xf8f9, [0x55] = 0xfe85, [0x56] = 0xfe8b, [0x57] = 0xfe8f,
+  [0x58] = 0xfe91, [0x59] = 0xfb56, [0x5a] = 0x0021, [0x5b] = 0x0024,
+  [0x5c] = 0x002a, [0x5d] = 0x0029, [0x5e] = 0x003b, [0x5f] = 0x00ac,
+  [0x60] = 0x002d, [0x61] = 0x002f, [0x62] = 0xfb58, [0x63] = 0xfe95,
+  [0x64] = 0xfe97, [0x65] = 0xfe99, [0x66] = 0xfe9b, [0x67] = 0xfe9d,
+  [0x68] = 0xfe9f, [0x69] = 0xfb7a, [0x6a] = 0x061b, [0x6b] = 0x002c,
+  [0x6c] = 0x0025, [0x6d] = 0x005f, [0x6e] = 0x003e, [0x6f] = 0x003f,
+  [0x70] = 0xfb7c, [0x71] = 0xfea1, [0x72] = 0xfea3, [0x73] = 0xfea5,
+  [0x74] = 0xfea7, [0x75] = 0xfea9, [0x76] = 0xfeab, [0x77] = 0xfead,
+  [0x78] = 0xfeaf, [0x79] = 0x0060, [0x7a] = 0x003a, [0x7b] = 0x0023,
+  [0x7c] = 0x0040, [0x7d] = 0x0027, [0x7e] = 0x003d, [0x7f] = 0x0022,
+  [0x80] = 0xfb8a, [0x81] = 0x0061, [0x82] = 0x0062, [0x83] = 0x0063,
+  [0x84] = 0x0064, [0x85] = 0x0065, [0x86] = 0x0066, [0x87] = 0x0067,
+  [0x88] = 0x0068, [0x89] = 0x0069, [0x8a] = 0x00ab, [0x8b] = 0x00bb,
+  [0x8c] = 0xfeb1, [0x8d] = 0xfeb3, [0x8e] = 0xfeb5, [0x8f] = 0xfeb7,
+  [0x90] = 0xfeb9, [0x91] = 0x006a, [0x92] = 0x006b, [0x93] = 0x006c,
+  [0x94] = 0x006d, [0x95] = 0x006e, [0x96] = 0x006f, [0x97] = 0x0070,
+  [0x98] = 0x0071, [0x99] = 0x0072, [0x9a] = 0xfebb, [0x9b] = 0xfebd,
+  [0x9c] = 0xfebf, [0x9d] = 0xfec1, [0x9e] = 0xfec3, [0x9f] = 0xfec5,
+  [0xa0] = 0xfec7, [0xa1] = 0x007e, [0xa2] = 0x0073, [0xa3] = 0x0074,
+  [0xa4] = 0x0075, [0xa5] = 0x0076, [0xa6] = 0x0077, [0xa7] = 0x0078,
+  [0xa8] = 0x0079, [0xa9] = 0x007a, [0xaa] = 0xfec9, [0xab] = 0xfeca,
+  [0xac] = 0xfecb, [0xad] = 0xfecc, [0xae] = 0xfecd, [0xaf] = 0xfece,
+  [0xb0] = 0xfecf, [0xb1] = 0xfed0, [0xb2] = 0xfed1, [0xb3] = 0xfed3,
+  [0xb4] = 0xfed5, [0xb5] = 0xfed7, [0xb6] = 0xfb8e, [0xb7] = 0xfedb,
+  [0xb8] = 0xfb92, [0xb9] = 0xfb94, [0xba] = 0x005b, [0xbb] = 0x005d,
+  [0xbc] = 0xfedd, [0xbd] = 0xfedf, [0xbe] = 0xfee1, [0xbf] = 0x00d7,
+  [0xc0] = 0x007b, [0xc1] = 0x0041, [0xc2] = 0x0042, [0xc3] = 0x0043,
+  [0xc4] = 0x0044, [0xc5] = 0x0045, [0xc6] = 0x0046, [0xc7] = 0x0047,
+  [0xc8] = 0x0048, [0xc9] = 0x0049, [0xca] = 0x00ad, [0xcb] = 0xfee3,
+  [0xcc] = 0xfee5, [0xcd] = 0xfee7, [0xce] = 0xfeed, [0xcf] = 0xfee9,
+  [0xd0] = 0x007d, [0xd1] = 0x004a, [0xd2] = 0x004b, [0xd3] = 0x004c,
+  [0xd4] = 0x004d, [0xd5] = 0x004e, [0xd6] = 0x004f, [0xd7] = 0x0050,
+  [0xd8] = 0x0051, [0xd9] = 0x0052, [0xda] = 0xfeeb, [0xdb] = 0xfeec,
+  [0xdc] = 0xfba4, [0xdd] = 0xfbfc, [0xde] = 0xfbfd, [0xdf] = 0xfbfe,
+  [0xe0] = 0x005c, [0xe1] = 0x061f, [0xe2] = 0x0053, [0xe3] = 0x0054,
+  [0xe4] = 0x0055, [0xe5] = 0x0056, [0xe6] = 0x0057, [0xe7] = 0x0058,
+  [0xe8] = 0x0059, [0xe9] = 0x005a, [0xea] = 0x0640, [0xeb] = 0x06f0,
+  [0xec] = 0x06f1, [0xed] = 0x06f2, [0xee] = 0x06f3, [0xef] = 0x06f4,
+  [0xf0] = 0x0030, [0xf1] = 0x0031, [0xf2] = 0x0032, [0xf3] = 0x0033,
+  [0xf4] = 0x0034, [0xf5] = 0x0035, [0xf6] = 0x0036, [0xf7] = 0x0037,
+  [0xf8] = 0x0038, [0xf9] = 0x0039, [0xfa] = 0x06f5, [0xfb] = 0x06f6,
+  [0xfc] = 0x06f7, [0xfd] = 0x06f8, [0xfe] = 0x06f9, [0xff] = 0x009f
+};
+
+static const struct gap from_idx[] =
+{
+  { start: 0x0000, end: 0x00a4, idx:     0 },
+  { start: 0x00ab, end: 0x00ad, idx:    -6 },
+  { start: 0x00bb, end: 0x00bb, idx:   -19 },
+  { start: 0x00d7, end: 0x00d7, idx:   -46 },
+  { start: 0x060c, end: 0x060c, idx: -1378 },
+  { start: 0x061b, end: 0x064b, idx: -1392 },
+  { start: 0x0660, end: 0x066d, idx: -1412 },
+  { start: 0x06f0, end: 0x06f9, idx: -1542 },
+  { start: 0xf8f9, end: 0xf8fb, idx: -63493 },
+  { start: 0xfb56, end: 0xfb58, idx: -64095 },
+  { start: 0xfb7a, end: 0xfb7c, idx: -64128 },
+  { start: 0xfb8a, end: 0xfb94, idx: -64141 },
+  { start: 0xfba4, end: 0xfba4, idx: -64156 },
+  { start: 0xfbfc, end: 0xfbfe, idx: -64243 },
+  { start: 0xfe80, end: 0xfeee, idx: -64884 },
+  { start: 0xffff, end: 0xffff, idx:     0 }
+};
+
+static const char from_ucs4[] =
+{
+  '\x00', '\x01', '\x02', '\x03', '\x37', '\x2d', '\x2e', '\x2f',
+  '\x16', '\x05', '\x25', '\x0b', '\x0c', '\x0d', '\x0e', '\x0f',
+  '\x10', '\x11', '\x12', '\x13', '\x3c', '\x3d', '\x32', '\x26',
+  '\x18', '\x19', '\x3f', '\x27', '\x1c', '\x1d', '\x1e', '\x1f',
+  '\x40', '\x5a', '\x7f', '\x7b', '\x5b', '\x6c', '\x50', '\x7d',
+  '\x4d', '\x5d', '\x5c', '\x4e', '\x6b', '\x60', '\x4b', '\x61',
+  '\xf0', '\xf1', '\xf2', '\xf3', '\xf4', '\xf5', '\xf6', '\xf7',
+  '\xf8', '\xf9', '\x7a', '\x5e', '\x4c', '\x7e', '\x6e', '\x6f',
+  '\x7c', '\xc1', '\xc2', '\xc3', '\xc4', '\xc5', '\xc6', '\xc7',
+  '\xc8', '\xc9', '\xd1', '\xd2', '\xd3', '\xd4', '\xd5', '\xd6',
+  '\xd7', '\xd8', '\xd9', '\xe2', '\xe3', '\xe4', '\xe5', '\xe6',
+  '\xe7', '\xe8', '\xe9', '\xba', '\xe0', '\xbb', '\x00', '\x6d',
+  '\x79', '\x81', '\x82', '\x83', '\x84', '\x85', '\x86', '\x87',
+  '\x88', '\x89', '\x91', '\x92', '\x93', '\x94', '\x95', '\x96',
+  '\x97', '\x98', '\x99', '\xa2', '\xa3', '\xa4', '\xa5', '\xa6',
+  '\xa7', '\xa8', '\xa9', '\xc0', '\x4f', '\xd0', '\xa1', '\x07',
+  '\x20', '\x21', '\x22', '\x23', '\x24', '\x15', '\x06', '\x17',
+  '\x28', '\x29', '\x2a', '\x2b', '\x2c', '\x09', '\x0a', '\x1b',
+  '\x30', '\x31', '\x1a', '\x33', '\x34', '\x35', '\x36', '\x08',
+  '\x38', '\x39', '\x3a', '\x3b', '\x04', '\x14', '\x3e', '\xff',
+  '\x41', '\x00', '\x00', '\x00', '\x4a', '\x8a', '\x5f', '\xca',
+  '\x8b', '\xbf', '\x42', '\x6a', '\x00', '\x00', '\x00', '\xe1',
+  '\x00', '\x51', '\x44', '\x52', '\x55', '\x00', '\x00', '\x47',
+  '\x57', '\x00', '\x63', '\x65', '\x67', '\x71', '\x73', '\x75',
+  '\x76', '\x77', '\x78', '\x8c', '\x8e', '\x90', '\x9b', '\x00',
+  '\x00', '\xaa', '\xae', '\x00', '\x00', '\x00', '\x00', '\x00',
+  '\xea', '\xb2', '\xb4', '\x00', '\xbc', '\xbe', '\xcc', '\xcf',
+  '\xce', '\x00', '\x00', '\x43', '\xeb', '\xec', '\xed', '\xee',
+  '\xef', '\xfa', '\xfb', '\xfc', '\xfd', '\xfe', '\x6c', '\x6b',
+  '\x4b', '\x5c', '\xeb', '\xec', '\xed', '\xee', '\xef', '\xfa',
+  '\xfb', '\xfc', '\xfd', '\xfe', '\x54', '\x46', '\x49', '\x59',
+  '\x00', '\x62', '\x69', '\x00', '\x70', '\x80', '\x00', '\x00',
+  '\x00', '\xb6', '\x00', '\x00', '\x00', '\xb8', '\x00', '\xb9',
+  '\xdc', '\xdd', '\xde', '\xdf', '\x51', '\x44', '\x45', '\x52',
+  '\x53', '\x55', '\x55', '\x00', '\x00', '\x00', '\x00', '\x56',
+  '\x56', '\x47', '\x48', '\x57', '\x57', '\x58', '\x58', '\x00',
+  '\x00', '\x63', '\x63', '\x64', '\x64', '\x65', '\x65', '\x66',
+  '\x66', '\x67', '\x67', '\x68', '\x68', '\x71', '\x71', '\x72',
+  '\x72', '\x73', '\x73', '\x74', '\x74', '\x75', '\x75', '\x76',
+  '\x76', '\x77', '\x77', '\x78', '\x78', '\x8c', '\x8c', '\x8d',
+  '\x8d', '\x8e', '\x8e', '\x8f', '\x8f', '\x90', '\x90', '\x9a',
+  '\x9a', '\x9b', '\x9b', '\x9c', '\x9c', '\x9d', '\x9d', '\x9e',
+  '\x9e', '\x9f', '\x9f', '\xa0', '\xa0', '\xaa', '\xab', '\xac',
+  '\xad', '\xae', '\xaf', '\xb0', '\xb1', '\xb2', '\xb2', '\xb3',
+  '\xb3', '\xb4', '\xb4', '\xb5', '\xb5', '\x00', '\x00', '\xb7',
+  '\xb7', '\xbc', '\xbc', '\xbd', '\xbd', '\xbe', '\xbe', '\xcb',
+  '\xcb', '\xcc', '\xcc', '\xcd', '\xcd', '\xcf', '\xcf', '\xda',
+  '\xdb', '\xce', '\xce'
+};
diff --git a/iconvdata/ibm1112.c b/iconvdata/ibm1112.c
new file mode 100644
index 0000000000..1a36423674
--- /dev/null
+++ b/iconvdata/ibm1112.c
@@ -0,0 +1,29 @@
+/* Conversion from and to IBM1112.
+   Copyright (C) 2005 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#include <stdint.h>
+
+/* Get the conversion table.  */
+#define TABLES <ibm1112.h>
+
+#define CHARSET_NAME	"IBM1112//"
+#define HAS_HOLES	0	/* All 256 character are defined.  */
+
+#include <8bit-gap.c>
diff --git a/iconvdata/ibm1112.h b/iconvdata/ibm1112.h
new file mode 100644
index 0000000000..d3776b13ee
--- /dev/null
+++ b/iconvdata/ibm1112.h
@@ -0,0 +1,148 @@
+/* Tables for conversion from and to IBM1112.
+   Copyright (C) 2005 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+static const uint32_t to_ucs4[256] =
+{
+  [0x00] = 0x0000, [0x01] = 0x0001, [0x02] = 0x0002, [0x03] = 0x0003,
+  [0x04] = 0x009c, [0x05] = 0x0009, [0x06] = 0x0086, [0x07] = 0x007f,
+  [0x08] = 0x0097, [0x09] = 0x008d, [0x0a] = 0x008e, [0x0b] = 0x000b,
+  [0x0c] = 0x000c, [0x0d] = 0x000d, [0x0e] = 0x000e, [0x0f] = 0x000f,
+  [0x10] = 0x0010, [0x11] = 0x0011, [0x12] = 0x0012, [0x13] = 0x0013,
+  [0x14] = 0x009d, [0x15] = 0x0085, [0x16] = 0x0008, [0x17] = 0x0087,
+  [0x18] = 0x0018, [0x19] = 0x0019, [0x1a] = 0x0092, [0x1b] = 0x008f,
+  [0x1c] = 0x001c, [0x1d] = 0x001d, [0x1e] = 0x001e, [0x1f] = 0x001f,
+  [0x20] = 0x0080, [0x21] = 0x0081, [0x22] = 0x0082, [0x23] = 0x0083,
+  [0x24] = 0x0084, [0x25] = 0x000a, [0x26] = 0x0017, [0x27] = 0x001b,
+  [0x28] = 0x0088, [0x29] = 0x0089, [0x2a] = 0x008a, [0x2b] = 0x008b,
+  [0x2c] = 0x008c, [0x2d] = 0x0005, [0x2e] = 0x0006, [0x2f] = 0x0007,
+  [0x30] = 0x0090, [0x31] = 0x0091, [0x32] = 0x0016, [0x33] = 0x0093,
+  [0x34] = 0x0094, [0x35] = 0x0095, [0x36] = 0x0096, [0x37] = 0x0004,
+  [0x38] = 0x0098, [0x39] = 0x0099, [0x3a] = 0x009a, [0x3b] = 0x009b,
+  [0x3c] = 0x0014, [0x3d] = 0x0015, [0x3e] = 0x009e, [0x3f] = 0x001a,
+  [0x40] = 0x0020, [0x41] = 0x00a0, [0x42] = 0x0161, [0x43] = 0x00e4,
+  [0x44] = 0x0105, [0x45] = 0x012f, [0x46] = 0x016b, [0x47] = 0x00e5,
+  [0x48] = 0x0113, [0x49] = 0x017e, [0x4a] = 0x00a2, [0x4b] = 0x002e,
+  [0x4c] = 0x003c, [0x4d] = 0x0028, [0x4e] = 0x002b, [0x4f] = 0x007c,
+  [0x50] = 0x0026, [0x51] = 0x00e9, [0x52] = 0x0119, [0x53] = 0x0117,
+  [0x54] = 0x010d, [0x55] = 0x0173, [0x56] = 0x201e, [0x57] = 0x201c,
+  [0x58] = 0x0123, [0x59] = 0x00df, [0x5a] = 0x0021, [0x5b] = 0x0024,
+  [0x5c] = 0x002a, [0x5d] = 0x0029, [0x5e] = 0x003b, [0x5f] = 0x00ac,
+  [0x60] = 0x002d, [0x61] = 0x002f, [0x62] = 0x0160, [0x63] = 0x00c4,
+  [0x64] = 0x0104, [0x65] = 0x012e, [0x66] = 0x016a, [0x67] = 0x00c5,
+  [0x68] = 0x0112, [0x69] = 0x017d, [0x6a] = 0x00a6, [0x6b] = 0x002c,
+  [0x6c] = 0x0025, [0x6d] = 0x005f, [0x6e] = 0x003e, [0x6f] = 0x003f,
+  [0x70] = 0x00f8, [0x71] = 0x00c9, [0x72] = 0x0118, [0x73] = 0x0116,
+  [0x74] = 0x010c, [0x75] = 0x0172, [0x76] = 0x012a, [0x77] = 0x013b,
+  [0x78] = 0x0122, [0x79] = 0x0060, [0x7a] = 0x003a, [0x7b] = 0x0023,
+  [0x7c] = 0x0040, [0x7d] = 0x0027, [0x7e] = 0x003d, [0x7f] = 0x0022,
+  [0x80] = 0x00d8, [0x81] = 0x0061, [0x82] = 0x0062, [0x83] = 0x0063,
+  [0x84] = 0x0064, [0x85] = 0x0065, [0x86] = 0x0066, [0x87] = 0x0067,
+  [0x88] = 0x0068, [0x89] = 0x0069, [0x8a] = 0x00ab, [0x8b] = 0x00bb,
+  [0x8c] = 0x0101, [0x8d] = 0x017c, [0x8e] = 0x0144, [0x8f] = 0x00b1,
+  [0x90] = 0x00b0, [0x91] = 0x006a, [0x92] = 0x006b, [0x93] = 0x006c,
+  [0x94] = 0x006d, [0x95] = 0x006e, [0x96] = 0x006f, [0x97] = 0x0070,
+  [0x98] = 0x0071, [0x99] = 0x0072, [0x9a] = 0x0156, [0x9b] = 0x0157,
+  [0x9c] = 0x00e6, [0x9d] = 0x0137, [0x9e] = 0x00c6, [0x9f] = 0x00a4,
+  [0xa0] = 0x00b5, [0xa1] = 0x007e, [0xa2] = 0x0073, [0xa3] = 0x0074,
+  [0xa4] = 0x0075, [0xa5] = 0x0076, [0xa6] = 0x0077, [0xa7] = 0x0078,
+  [0xa8] = 0x0079, [0xa9] = 0x007a, [0xaa] = 0x201d, [0xab] = 0x017a,
+  [0xac] = 0x0100, [0xad] = 0x017b, [0xae] = 0x0143, [0xaf] = 0x00ae,
+  [0xb0] = 0x005e, [0xb1] = 0x00a3, [0xb2] = 0x012b, [0xb3] = 0x00b7,
+  [0xb4] = 0x00a9, [0xb5] = 0x00a7, [0xb6] = 0x00b6, [0xb7] = 0x00bc,
+  [0xb8] = 0x00bd, [0xb9] = 0x00be, [0xba] = 0x005b, [0xbb] = 0x005d,
+  [0xbc] = 0x0179, [0xbd] = 0x0136, [0xbe] = 0x013c, [0xbf] = 0x00d7,
+  [0xc0] = 0x007b, [0xc1] = 0x0041, [0xc2] = 0x0042, [0xc3] = 0x0043,
+  [0xc4] = 0x0044, [0xc5] = 0x0045, [0xc6] = 0x0046, [0xc7] = 0x0047,
+  [0xc8] = 0x0048, [0xc9] = 0x0049, [0xca] = 0x00ad, [0xcb] = 0x014d,
+  [0xcc] = 0x00f6, [0xcd] = 0x0146, [0xce] = 0x00f3, [0xcf] = 0x00f5,
+  [0xd0] = 0x007d, [0xd1] = 0x004a, [0xd2] = 0x004b, [0xd3] = 0x004c,
+  [0xd4] = 0x004d, [0xd5] = 0x004e, [0xd6] = 0x004f, [0xd7] = 0x0050,
+  [0xd8] = 0x0051, [0xd9] = 0x0052, [0xda] = 0x00b9, [0xdb] = 0x0107,
+  [0xdc] = 0x00fc, [0xdd] = 0x0142, [0xde] = 0x015b, [0xdf] = 0x2019,
+  [0xe0] = 0x005c, [0xe1] = 0x00f7, [0xe2] = 0x0053, [0xe3] = 0x0054,
+  [0xe4] = 0x0055, [0xe5] = 0x0056, [0xe6] = 0x0057, [0xe7] = 0x0058,
+  [0xe8] = 0x0059, [0xe9] = 0x005a, [0xea] = 0x00b2, [0xeb] = 0x014c,
+  [0xec] = 0x00d6, [0xed] = 0x0145, [0xee] = 0x00d3, [0xef] = 0x00d5,
+  [0xf0] = 0x0030, [0xf1] = 0x0031, [0xf2] = 0x0032, [0xf3] = 0x0033,
+  [0xf4] = 0x0034, [0xf5] = 0x0035, [0xf6] = 0x0036, [0xf7] = 0x0037,
+  [0xf8] = 0x0038, [0xf9] = 0x0039, [0xfa] = 0x00b3, [0xfb] = 0x0106,
+  [0xfc] = 0x00dc, [0xfd] = 0x0141, [0xfe] = 0x015a, [0xff] = 0x009f
+};
+
+static const struct gap from_idx[] =
+{
+  { start: 0x0000, end: 0x00c9, idx:     0 },
+  { start: 0x00d3, end: 0x00e9, idx:    -9 },
+  { start: 0x00f3, end: 0x0119, idx:   -18 },
+  { start: 0x0122, end: 0x0123, idx:   -26 },
+  { start: 0x012a, end: 0x012f, idx:   -32 },
+  { start: 0x0136, end: 0x014d, idx:   -38 },
+  { start: 0x0156, end: 0x0161, idx:   -46 },
+  { start: 0x016a, end: 0x016b, idx:   -54 },
+  { start: 0x0172, end: 0x017e, idx:   -60 },
+  { start: 0x2019, end: 0x201e, idx: -7894 },
+  { start: 0xffff, end: 0xffff, idx:     0 }
+};
+
+static const char from_ucs4[] =
+{
+  '\x00', '\x01', '\x02', '\x03', '\x37', '\x2d', '\x2e', '\x2f',
+  '\x16', '\x05', '\x25', '\x0b', '\x0c', '\x0d', '\x0e', '\x0f',
+  '\x10', '\x11', '\x12', '\x13', '\x3c', '\x3d', '\x32', '\x26',
+  '\x18', '\x19', '\x3f', '\x27', '\x1c', '\x1d', '\x1e', '\x1f',
+  '\x40', '\x5a', '\x7f', '\x7b', '\x5b', '\x6c', '\x50', '\x7d',
+  '\x4d', '\x5d', '\x5c', '\x4e', '\x6b', '\x60', '\x4b', '\x61',
+  '\xf0', '\xf1', '\xf2', '\xf3', '\xf4', '\xf5', '\xf6', '\xf7',
+  '\xf8', '\xf9', '\x7a', '\x5e', '\x4c', '\x7e', '\x6e', '\x6f',
+  '\x7c', '\xc1', '\xc2', '\xc3', '\xc4', '\xc5', '\xc6', '\xc7',
+  '\xc8', '\xc9', '\xd1', '\xd2', '\xd3', '\xd4', '\xd5', '\xd6',
+  '\xd7', '\xd8', '\xd9', '\xe2', '\xe3', '\xe4', '\xe5', '\xe6',
+  '\xe7', '\xe8', '\xe9', '\xba', '\xe0', '\xbb', '\xb0', '\x6d',
+  '\x79', '\x81', '\x82', '\x83', '\x84', '\x85', '\x86', '\x87',
+  '\x88', '\x89', '\x91', '\x92', '\x93', '\x94', '\x95', '\x96',
+  '\x97', '\x98', '\x99', '\xa2', '\xa3', '\xa4', '\xa5', '\xa6',
+  '\xa7', '\xa8', '\xa9', '\xc0', '\x4f', '\xd0', '\xa1', '\x07',
+  '\x20', '\x21', '\x22', '\x23', '\x24', '\x15', '\x06', '\x17',
+  '\x28', '\x29', '\x2a', '\x2b', '\x2c', '\x09', '\x0a', '\x1b',
+  '\x30', '\x31', '\x1a', '\x33', '\x34', '\x35', '\x36', '\x08',
+  '\x38', '\x39', '\x3a', '\x3b', '\x04', '\x14', '\x3e', '\xff',
+  '\x41', '\x00', '\x4a', '\xb1', '\x9f', '\x00', '\x6a', '\xb5',
+  '\x00', '\xb4', '\x00', '\x8a', '\x5f', '\xca', '\xaf', '\x00',
+  '\x90', '\x8f', '\xea', '\xfa', '\x00', '\xa0', '\xb6', '\xb3',
+  '\x00', '\xda', '\x00', '\x8b', '\xb7', '\xb8', '\xb9', '\x00',
+  '\x00', '\x00', '\x00', '\x00', '\x63', '\x67', '\x9e', '\x00',
+  '\x00', '\x71', '\xee', '\x00', '\xef', '\xec', '\xbf', '\x80',
+  '\x00', '\x00', '\x00', '\xfc', '\x00', '\x00', '\x59', '\x00',
+  '\x00', '\x00', '\x00', '\x43', '\x47', '\x9c', '\x00', '\x00',
+  '\x51', '\xce', '\x00', '\xcf', '\xcc', '\xe1', '\x70', '\x00',
+  '\x00', '\x00', '\xdc', '\x00', '\x00', '\x00', '\xac', '\x8c',
+  '\x00', '\x00', '\x64', '\x44', '\xfb', '\xdb', '\x00', '\x00',
+  '\x00', '\x00', '\x74', '\x54', '\x00', '\x00', '\x00', '\x00',
+  '\x68', '\x48', '\x00', '\x00', '\x73', '\x53', '\x72', '\x52',
+  '\x78', '\x58', '\x76', '\xb2', '\x00', '\x00', '\x65', '\x45',
+  '\xbd', '\x9d', '\x00', '\x00', '\x00', '\x77', '\xbe', '\x00',
+  '\x00', '\x00', '\x00', '\xfd', '\xdd', '\xae', '\x8e', '\xed',
+  '\xcd', '\x00', '\x00', '\x00', '\x00', '\x00', '\xeb', '\xcb',
+  '\x9a', '\x9b', '\x00', '\x00', '\xfe', '\xde', '\x00', '\x00',
+  '\x00', '\x00', '\x62', '\x42', '\x66', '\x46', '\x75', '\x55',
+  '\x00', '\x00', '\x00', '\x00', '\x00', '\xbc', '\xab', '\xad',
+  '\x8d', '\x69', '\x49', '\xdf', '\x00', '\x00', '\x57', '\xaa',
+  '\x56'
+};
diff --git a/iconvdata/ibm1123.c b/iconvdata/ibm1123.c
new file mode 100644
index 0000000000..41110dc850
--- /dev/null
+++ b/iconvdata/ibm1123.c
@@ -0,0 +1,29 @@
+/* Conversion from and to IBM1123.
+   Copyright (C) 2005 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#include <stdint.h>
+
+/* Get the conversion table.  */
+#define TABLES <ibm1123.h>
+
+#define CHARSET_NAME	"IBM1123//"
+#define HAS_HOLES	0	/* All 256 character are defined.  */
+
+#include <8bit-gap.c>
diff --git a/iconvdata/ibm1123.h b/iconvdata/ibm1123.h
new file mode 100644
index 0000000000..846f98e2bd
--- /dev/null
+++ b/iconvdata/ibm1123.h
@@ -0,0 +1,135 @@
+/* Tables for conversion from and to IBM1123.
+   Copyright (C) 2005 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+static const uint32_t to_ucs4[256] =
+{
+  [0x00] = 0x0000, [0x01] = 0x0001, [0x02] = 0x0002, [0x03] = 0x0003,
+  [0x04] = 0x009c, [0x05] = 0x0009, [0x06] = 0x0086, [0x07] = 0x007f,
+  [0x08] = 0x0097, [0x09] = 0x008d, [0x0a] = 0x008e, [0x0b] = 0x000b,
+  [0x0c] = 0x000c, [0x0d] = 0x000d, [0x0e] = 0x000e, [0x0f] = 0x000f,
+  [0x10] = 0x0010, [0x11] = 0x0011, [0x12] = 0x0012, [0x13] = 0x0013,
+  [0x14] = 0x009d, [0x15] = 0x0085, [0x16] = 0x0008, [0x17] = 0x0087,
+  [0x18] = 0x0018, [0x19] = 0x0019, [0x1a] = 0x0092, [0x1b] = 0x008f,
+  [0x1c] = 0x001c, [0x1d] = 0x001d, [0x1e] = 0x001e, [0x1f] = 0x001f,
+  [0x20] = 0x0080, [0x21] = 0x0081, [0x22] = 0x0082, [0x23] = 0x0083,
+  [0x24] = 0x0084, [0x25] = 0x000a, [0x26] = 0x0017, [0x27] = 0x001b,
+  [0x28] = 0x0088, [0x29] = 0x0089, [0x2a] = 0x008a, [0x2b] = 0x008b,
+  [0x2c] = 0x008c, [0x2d] = 0x0005, [0x2e] = 0x0006, [0x2f] = 0x0007,
+  [0x30] = 0x0090, [0x31] = 0x0091, [0x32] = 0x0016, [0x33] = 0x0093,
+  [0x34] = 0x0094, [0x35] = 0x0095, [0x36] = 0x0096, [0x37] = 0x0004,
+  [0x38] = 0x0098, [0x39] = 0x0099, [0x3a] = 0x009a, [0x3b] = 0x009b,
+  [0x3c] = 0x0014, [0x3d] = 0x0015, [0x3e] = 0x009e, [0x3f] = 0x001a,
+  [0x40] = 0x0020, [0x41] = 0x00a0, [0x42] = 0x0452, [0x43] = 0x0491,
+  [0x44] = 0x0451, [0x45] = 0x0454, [0x46] = 0x0455, [0x47] = 0x0456,
+  [0x48] = 0x0457, [0x49] = 0x0458, [0x4a] = 0x005b, [0x4b] = 0x002e,
+  [0x4c] = 0x003c, [0x4d] = 0x0028, [0x4e] = 0x002b, [0x4f] = 0x0021,
+  [0x50] = 0x0026, [0x51] = 0x0459, [0x52] = 0x045a, [0x53] = 0x045b,
+  [0x54] = 0x045c, [0x55] = 0x045e, [0x56] = 0x045f, [0x57] = 0x042a,
+  [0x58] = 0x2116, [0x59] = 0x0402, [0x5a] = 0x005d, [0x5b] = 0x0024,
+  [0x5c] = 0x002a, [0x5d] = 0x0029, [0x5e] = 0x003b, [0x5f] = 0x005e,
+  [0x60] = 0x002d, [0x61] = 0x002f, [0x62] = 0x0490, [0x63] = 0x0401,
+  [0x64] = 0x0404, [0x65] = 0x0405, [0x66] = 0x0406, [0x67] = 0x0407,
+  [0x68] = 0x0408, [0x69] = 0x0409, [0x6a] = 0x007c, [0x6b] = 0x002c,
+  [0x6c] = 0x0025, [0x6d] = 0x005f, [0x6e] = 0x003e, [0x6f] = 0x003f,
+  [0x70] = 0x040a, [0x71] = 0x040b, [0x72] = 0x040c, [0x73] = 0x00ad,
+  [0x74] = 0x040e, [0x75] = 0x040f, [0x76] = 0x044e, [0x77] = 0x0430,
+  [0x78] = 0x0431, [0x79] = 0x0060, [0x7a] = 0x003a, [0x7b] = 0x0023,
+  [0x7c] = 0x0040, [0x7d] = 0x0027, [0x7e] = 0x003d, [0x7f] = 0x0022,
+  [0x80] = 0x0446, [0x81] = 0x0061, [0x82] = 0x0062, [0x83] = 0x0063,
+  [0x84] = 0x0064, [0x85] = 0x0065, [0x86] = 0x0066, [0x87] = 0x0067,
+  [0x88] = 0x0068, [0x89] = 0x0069, [0x8a] = 0x0434, [0x8b] = 0x0435,
+  [0x8c] = 0x0444, [0x8d] = 0x0433, [0x8e] = 0x0445, [0x8f] = 0x0438,
+  [0x90] = 0x0439, [0x91] = 0x006a, [0x92] = 0x006b, [0x93] = 0x006c,
+  [0x94] = 0x006d, [0x95] = 0x006e, [0x96] = 0x006f, [0x97] = 0x0070,
+  [0x98] = 0x0071, [0x99] = 0x0072, [0x9a] = 0x043a, [0x9b] = 0x043b,
+  [0x9c] = 0x043c, [0x9d] = 0x043d, [0x9e] = 0x043e, [0x9f] = 0x043f,
+  [0xa0] = 0x044f, [0xa1] = 0x007e, [0xa2] = 0x0073, [0xa3] = 0x0074,
+  [0xa4] = 0x0075, [0xa5] = 0x0076, [0xa6] = 0x0077, [0xa7] = 0x0078,
+  [0xa8] = 0x0079, [0xa9] = 0x007a, [0xaa] = 0x0440, [0xab] = 0x0441,
+  [0xac] = 0x0442, [0xad] = 0x0443, [0xae] = 0x0436, [0xaf] = 0x0432,
+  [0xb0] = 0x044c, [0xb1] = 0x044b, [0xb2] = 0x0437, [0xb3] = 0x0448,
+  [0xb4] = 0x044d, [0xb5] = 0x0449, [0xb6] = 0x0447, [0xb7] = 0x044a,
+  [0xb8] = 0x042e, [0xb9] = 0x0410, [0xba] = 0x0411, [0xbb] = 0x0426,
+  [0xbc] = 0x0414, [0xbd] = 0x0415, [0xbe] = 0x0424, [0xbf] = 0x0413,
+  [0xc0] = 0x007b, [0xc1] = 0x0041, [0xc2] = 0x0042, [0xc3] = 0x0043,
+  [0xc4] = 0x0044, [0xc5] = 0x0045, [0xc6] = 0x0046, [0xc7] = 0x0047,
+  [0xc8] = 0x0048, [0xc9] = 0x0049, [0xca] = 0x0425, [0xcb] = 0x0418,
+  [0xcc] = 0x0419, [0xcd] = 0x041a, [0xce] = 0x041b, [0xcf] = 0x041c,
+  [0xd0] = 0x007d, [0xd1] = 0x004a, [0xd2] = 0x004b, [0xd3] = 0x004c,
+  [0xd4] = 0x004d, [0xd5] = 0x004e, [0xd6] = 0x004f, [0xd7] = 0x0050,
+  [0xd8] = 0x0051, [0xd9] = 0x0052, [0xda] = 0x041d, [0xdb] = 0x041e,
+  [0xdc] = 0x041f, [0xdd] = 0x042f, [0xde] = 0x0420, [0xdf] = 0x0421,
+  [0xe0] = 0x005c, [0xe1] = 0x00a7, [0xe2] = 0x0053, [0xe3] = 0x0054,
+  [0xe4] = 0x0055, [0xe5] = 0x0056, [0xe6] = 0x0057, [0xe7] = 0x0058,
+  [0xe8] = 0x0059, [0xe9] = 0x005a, [0xea] = 0x0422, [0xeb] = 0x0423,
+  [0xec] = 0x0416, [0xed] = 0x0412, [0xee] = 0x042c, [0xef] = 0x042b,
+  [0xf0] = 0x0030, [0xf1] = 0x0031, [0xf2] = 0x0032, [0xf3] = 0x0033,
+  [0xf4] = 0x0034, [0xf5] = 0x0035, [0xf6] = 0x0036, [0xf7] = 0x0037,
+  [0xf8] = 0x0038, [0xf9] = 0x0039, [0xfa] = 0x0417, [0xfb] = 0x0428,
+  [0xfc] = 0x042d, [0xfd] = 0x0429, [0xfe] = 0x0427, [0xff] = 0x009f
+};
+
+static const struct gap from_idx[] =
+{
+  { start: 0x0000, end: 0x00a0, idx:     0 },
+  { start: 0x00a7, end: 0x00ad, idx:    -6 },
+  { start: 0x0401, end: 0x045f, idx:  -857 },
+  { start: 0x0490, end: 0x0491, idx:  -905 },
+  { start: 0x2116, end: 0x2116, idx: -8205 },
+  { start: 0xffff, end: 0xffff, idx:     0 }
+};
+
+static const char from_ucs4[] =
+{
+  '\x00', '\x01', '\x02', '\x03', '\x37', '\x2d', '\x2e', '\x2f',
+  '\x16', '\x05', '\x25', '\x0b', '\x0c', '\x0d', '\x0e', '\x0f',
+  '\x10', '\x11', '\x12', '\x13', '\x3c', '\x3d', '\x32', '\x26',
+  '\x18', '\x19', '\x3f', '\x27', '\x1c', '\x1d', '\x1e', '\x1f',
+  '\x40', '\x4f', '\x7f', '\x7b', '\x5b', '\x6c', '\x50', '\x7d',
+  '\x4d', '\x5d', '\x5c', '\x4e', '\x6b', '\x60', '\x4b', '\x61',
+  '\xf0', '\xf1', '\xf2', '\xf3', '\xf4', '\xf5', '\xf6', '\xf7',
+  '\xf8', '\xf9', '\x7a', '\x5e', '\x4c', '\x7e', '\x6e', '\x6f',
+  '\x7c', '\xc1', '\xc2', '\xc3', '\xc4', '\xc5', '\xc6', '\xc7',
+  '\xc8', '\xc9', '\xd1', '\xd2', '\xd3', '\xd4', '\xd5', '\xd6',
+  '\xd7', '\xd8', '\xd9', '\xe2', '\xe3', '\xe4', '\xe5', '\xe6',
+  '\xe7', '\xe8', '\xe9', '\x4a', '\xe0', '\x5a', '\x5f', '\x6d',
+  '\x79', '\x81', '\x82', '\x83', '\x84', '\x85', '\x86', '\x87',
+  '\x88', '\x89', '\x91', '\x92', '\x93', '\x94', '\x95', '\x96',
+  '\x97', '\x98', '\x99', '\xa2', '\xa3', '\xa4', '\xa5', '\xa6',
+  '\xa7', '\xa8', '\xa9', '\xc0', '\x6a', '\xd0', '\xa1', '\x07',
+  '\x20', '\x21', '\x22', '\x23', '\x24', '\x15', '\x06', '\x17',
+  '\x28', '\x29', '\x2a', '\x2b', '\x2c', '\x09', '\x0a', '\x1b',
+  '\x30', '\x31', '\x1a', '\x33', '\x34', '\x35', '\x36', '\x08',
+  '\x38', '\x39', '\x3a', '\x3b', '\x04', '\x14', '\x3e', '\xff',
+  '\x41', '\xe1', '\x00', '\x00', '\x00', '\x00', '\x00', '\x73',
+  '\x63', '\x59', '\x00', '\x64', '\x65', '\x66', '\x67', '\x68',
+  '\x69', '\x70', '\x71', '\x72', '\x00', '\x74', '\x75', '\xb9',
+  '\xba', '\xed', '\xbf', '\xbc', '\xbd', '\xec', '\xfa', '\xcb',
+  '\xcc', '\xcd', '\xce', '\xcf', '\xda', '\xdb', '\xdc', '\xde',
+  '\xdf', '\xea', '\xeb', '\xbe', '\xca', '\xbb', '\xfe', '\xfb',
+  '\xfd', '\x57', '\xef', '\xee', '\xfc', '\xb8', '\xdd', '\x77',
+  '\x78', '\xaf', '\x8d', '\x8a', '\x8b', '\xae', '\xb2', '\x8f',
+  '\x90', '\x9a', '\x9b', '\x9c', '\x9d', '\x9e', '\x9f', '\xaa',
+  '\xab', '\xac', '\xad', '\x8c', '\x8e', '\x80', '\xb6', '\xb3',
+  '\xb5', '\xb7', '\xb1', '\xb0', '\xb4', '\x76', '\xa0', '\x00',
+  '\x44', '\x42', '\x00', '\x45', '\x46', '\x47', '\x48', '\x49',
+  '\x51', '\x52', '\x53', '\x54', '\x00', '\x55', '\x56', '\x62',
+  '\x43', '\x58'
+};
diff --git a/iconvdata/ibm1130.c b/iconvdata/ibm1130.c
new file mode 100644
index 0000000000..6c0048ef0e
--- /dev/null
+++ b/iconvdata/ibm1130.c
@@ -0,0 +1,29 @@
+/* Conversion from and to IBM1130.
+   Copyright (C) 2005 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#include <stdint.h>
+
+/* Get the conversion table.  */
+#define TABLES <ibm1130.h>
+
+#define CHARSET_NAME	"IBM1130//"
+#define HAS_HOLES	0	/* All 256 character are defined.  */
+
+#include <8bit-gap.c>
diff --git a/iconvdata/ibm1130.h b/iconvdata/ibm1130.h
new file mode 100644
index 0000000000..fe536d0800
--- /dev/null
+++ b/iconvdata/ibm1130.h
@@ -0,0 +1,141 @@
+/* Tables for conversion from and to IBM1130.
+   Copyright (C) 2005 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+static const uint32_t to_ucs4[256] =
+{
+  [0x00] = 0x0000, [0x01] = 0x0001, [0x02] = 0x0002, [0x03] = 0x0003,
+  [0x04] = 0x009c, [0x05] = 0x0009, [0x06] = 0x0086, [0x07] = 0x007f,
+  [0x08] = 0x0097, [0x09] = 0x008d, [0x0a] = 0x008e, [0x0b] = 0x000b,
+  [0x0c] = 0x000c, [0x0d] = 0x000d, [0x0e] = 0x000e, [0x0f] = 0x000f,
+  [0x10] = 0x0010, [0x11] = 0x0011, [0x12] = 0x0012, [0x13] = 0x0013,
+  [0x14] = 0x009d, [0x15] = 0x0085, [0x16] = 0x0008, [0x17] = 0x0087,
+  [0x18] = 0x0018, [0x19] = 0x0019, [0x1a] = 0x0092, [0x1b] = 0x008f,
+  [0x1c] = 0x001c, [0x1d] = 0x001d, [0x1e] = 0x001e, [0x1f] = 0x001f,
+  [0x20] = 0x0080, [0x21] = 0x0081, [0x22] = 0x0082, [0x23] = 0x0083,
+  [0x24] = 0x0084, [0x25] = 0x000a, [0x26] = 0x0017, [0x27] = 0x001b,
+  [0x28] = 0x0088, [0x29] = 0x0089, [0x2a] = 0x008a, [0x2b] = 0x008b,
+  [0x2c] = 0x008c, [0x2d] = 0x0005, [0x2e] = 0x0006, [0x2f] = 0x0007,
+  [0x30] = 0x0090, [0x31] = 0x0091, [0x32] = 0x0016, [0x33] = 0x0093,
+  [0x34] = 0x0094, [0x35] = 0x0095, [0x36] = 0x0096, [0x37] = 0x0004,
+  [0x38] = 0x0098, [0x39] = 0x0099, [0x3a] = 0x009a, [0x3b] = 0x009b,
+  [0x3c] = 0x0014, [0x3d] = 0x0015, [0x3e] = 0x009e, [0x3f] = 0x001a,
+  [0x40] = 0x0020, [0x41] = 0x00a0, [0x42] = 0x00e2, [0x43] = 0x00e4,
+  [0x44] = 0x00e0, [0x45] = 0x00e1, [0x46] = 0x0103, [0x47] = 0x00e5,
+  [0x48] = 0x00e7, [0x49] = 0x00f1, [0x4a] = 0x005b, [0x4b] = 0x002e,
+  [0x4c] = 0x003c, [0x4d] = 0x0028, [0x4e] = 0x002b, [0x4f] = 0x0021,
+  [0x50] = 0x0026, [0x51] = 0x00e9, [0x52] = 0x00ea, [0x53] = 0x00eb,
+  [0x54] = 0x00e8, [0x55] = 0x00ed, [0x56] = 0x00ee, [0x57] = 0x00ef,
+  [0x58] = 0x0303, [0x59] = 0x00df, [0x5a] = 0x005d, [0x5b] = 0x0024,
+  [0x5c] = 0x002a, [0x5d] = 0x0029, [0x5e] = 0x003b, [0x5f] = 0x005e,
+  [0x60] = 0x002d, [0x61] = 0x002f, [0x62] = 0x00c2, [0x63] = 0x00c4,
+  [0x64] = 0x00c0, [0x65] = 0x00c1, [0x66] = 0x0102, [0x67] = 0x00c5,
+  [0x68] = 0x00c7, [0x69] = 0x00d1, [0x6a] = 0x00a6, [0x6b] = 0x002c,
+  [0x6c] = 0x0025, [0x6d] = 0x005f, [0x6e] = 0x003e, [0x6f] = 0x003f,
+  [0x70] = 0x00f8, [0x71] = 0x00c9, [0x72] = 0x00ca, [0x73] = 0x00cb,
+  [0x74] = 0x00c8, [0x75] = 0x00cd, [0x76] = 0x00ce, [0x77] = 0x00cf,
+  [0x78] = 0x20ab, [0x79] = 0x0060, [0x7a] = 0x003a, [0x7b] = 0x0023,
+  [0x7c] = 0x0040, [0x7d] = 0x0027, [0x7e] = 0x003d, [0x7f] = 0x0022,
+  [0x80] = 0x00d8, [0x81] = 0x0061, [0x82] = 0x0062, [0x83] = 0x0063,
+  [0x84] = 0x0064, [0x85] = 0x0065, [0x86] = 0x0066, [0x87] = 0x0067,
+  [0x88] = 0x0068, [0x89] = 0x0069, [0x8a] = 0x00ab, [0x8b] = 0x00bb,
+  [0x8c] = 0x0111, [0x8d] = 0x0309, [0x8e] = 0x0300, [0x8f] = 0x00b1,
+  [0x90] = 0x00b0, [0x91] = 0x006a, [0x92] = 0x006b, [0x93] = 0x006c,
+  [0x94] = 0x006d, [0x95] = 0x006e, [0x96] = 0x006f, [0x97] = 0x0070,
+  [0x98] = 0x0071, [0x99] = 0x0072, [0x9a] = 0x00aa, [0x9b] = 0x00ba,
+  [0x9c] = 0x00e6, [0x9d] = 0x0152, [0x9e] = 0x00c6, [0x9f] = 0x00a4,
+  [0xa0] = 0x00b5, [0xa1] = 0x007e, [0xa2] = 0x0073, [0xa3] = 0x0074,
+  [0xa4] = 0x0075, [0xa5] = 0x0076, [0xa6] = 0x0077, [0xa7] = 0x0078,
+  [0xa8] = 0x0079, [0xa9] = 0x007a, [0xaa] = 0x00a1, [0xab] = 0x00bf,
+  [0xac] = 0x0110, [0xad] = 0x0323, [0xae] = 0x0301, [0xaf] = 0x00ae,
+  [0xb0] = 0x00a2, [0xb1] = 0x00a3, [0xb2] = 0x00a5, [0xb3] = 0x00b7,
+  [0xb4] = 0x00a9, [0xb5] = 0x00a7, [0xb6] = 0x00b6, [0xb7] = 0x00bc,
+  [0xb8] = 0x00bd, [0xb9] = 0x00be, [0xba] = 0x00ac, [0xbb] = 0x007c,
+  [0xbc] = 0x00af, [0xbd] = 0x0153, [0xbe] = 0x0178, [0xbf] = 0x00d7,
+  [0xc0] = 0x007b, [0xc1] = 0x0041, [0xc2] = 0x0042, [0xc3] = 0x0043,
+  [0xc4] = 0x0044, [0xc5] = 0x0045, [0xc6] = 0x0046, [0xc7] = 0x0047,
+  [0xc8] = 0x0048, [0xc9] = 0x0049, [0xca] = 0x00ad, [0xcb] = 0x00f4,
+  [0xcc] = 0x00f6, [0xcd] = 0x01b0, [0xce] = 0x00f3, [0xcf] = 0x01a1,
+  [0xd0] = 0x007d, [0xd1] = 0x004a, [0xd2] = 0x004b, [0xd3] = 0x004c,
+  [0xd4] = 0x004d, [0xd5] = 0x004e, [0xd6] = 0x004f, [0xd7] = 0x0050,
+  [0xd8] = 0x0051, [0xd9] = 0x0052, [0xda] = 0x00b9, [0xdb] = 0x00fb,
+  [0xdc] = 0x00fc, [0xdd] = 0x00f9, [0xde] = 0x00fa, [0xdf] = 0x00ff,
+  [0xe0] = 0x005c, [0xe1] = 0x00f7, [0xe2] = 0x0053, [0xe3] = 0x0054,
+  [0xe4] = 0x0055, [0xe5] = 0x0056, [0xe6] = 0x0057, [0xe7] = 0x0058,
+  [0xe8] = 0x0059, [0xe9] = 0x005a, [0xea] = 0x00b2, [0xeb] = 0x00d4,
+  [0xec] = 0x00d6, [0xed] = 0x01af, [0xee] = 0x00d3, [0xef] = 0x01a0,
+  [0xf0] = 0x0030, [0xf1] = 0x0031, [0xf2] = 0x0032, [0xf3] = 0x0033,
+  [0xf4] = 0x0034, [0xf5] = 0x0035, [0xf6] = 0x0036, [0xf7] = 0x0037,
+  [0xf8] = 0x0038, [0xf9] = 0x0039, [0xfa] = 0x00b3, [0xfb] = 0x00db,
+  [0xfc] = 0x00dc, [0xfd] = 0x00d9, [0xfe] = 0x00da, [0xff] = 0x009f
+};
+
+static const struct gap from_idx[] =
+{
+  { start: 0x0000, end: 0x0103, idx:     0 },
+  { start: 0x0110, end: 0x0111, idx:   -12 },
+  { start: 0x0152, end: 0x0153, idx:   -76 },
+  { start: 0x0178, end: 0x0178, idx:  -112 },
+  { start: 0x01a0, end: 0x01a1, idx:  -151 },
+  { start: 0x01af, end: 0x01b0, idx:  -164 },
+  { start: 0x0300, end: 0x0309, idx:  -499 },
+  { start: 0x0323, end: 0x0323, idx:  -524 },
+  { start: 0x20ab, end: 0x20ab, idx: -8083 },
+  { start: 0xffff, end: 0xffff, idx:     0 }
+};
+
+static const char from_ucs4[] =
+{
+  '\x00', '\x01', '\x02', '\x03', '\x37', '\x2d', '\x2e', '\x2f',
+  '\x16', '\x05', '\x25', '\x0b', '\x0c', '\x0d', '\x0e', '\x0f',
+  '\x10', '\x11', '\x12', '\x13', '\x3c', '\x3d', '\x32', '\x26',
+  '\x18', '\x19', '\x3f', '\x27', '\x1c', '\x1d', '\x1e', '\x1f',
+  '\x40', '\x4f', '\x7f', '\x7b', '\x5b', '\x6c', '\x50', '\x7d',
+  '\x4d', '\x5d', '\x5c', '\x4e', '\x6b', '\x60', '\x4b', '\x61',
+  '\xf0', '\xf1', '\xf2', '\xf3', '\xf4', '\xf5', '\xf6', '\xf7',
+  '\xf8', '\xf9', '\x7a', '\x5e', '\x4c', '\x7e', '\x6e', '\x6f',
+  '\x7c', '\xc1', '\xc2', '\xc3', '\xc4', '\xc5', '\xc6', '\xc7',
+  '\xc8', '\xc9', '\xd1', '\xd2', '\xd3', '\xd4', '\xd5', '\xd6',
+  '\xd7', '\xd8', '\xd9', '\xe2', '\xe3', '\xe4', '\xe5', '\xe6',
+  '\xe7', '\xe8', '\xe9', '\x4a', '\xe0', '\x5a', '\x5f', '\x6d',
+  '\x79', '\x81', '\x82', '\x83', '\x84', '\x85', '\x86', '\x87',
+  '\x88', '\x89', '\x91', '\x92', '\x93', '\x94', '\x95', '\x96',
+  '\x97', '\x98', '\x99', '\xa2', '\xa3', '\xa4', '\xa5', '\xa6',
+  '\xa7', '\xa8', '\xa9', '\xc0', '\xbb', '\xd0', '\xa1', '\x07',
+  '\x20', '\x21', '\x22', '\x23', '\x24', '\x15', '\x06', '\x17',
+  '\x28', '\x29', '\x2a', '\x2b', '\x2c', '\x09', '\x0a', '\x1b',
+  '\x30', '\x31', '\x1a', '\x33', '\x34', '\x35', '\x36', '\x08',
+  '\x38', '\x39', '\x3a', '\x3b', '\x04', '\x14', '\x3e', '\xff',
+  '\x41', '\xaa', '\xb0', '\xb1', '\x9f', '\xb2', '\x6a', '\xb5',
+  '\x00', '\xb4', '\x9a', '\x8a', '\xba', '\xca', '\xaf', '\xbc',
+  '\x90', '\x8f', '\xea', '\xfa', '\x00', '\xa0', '\xb6', '\xb3',
+  '\x00', '\xda', '\x9b', '\x8b', '\xb7', '\xb8', '\xb9', '\xab',
+  '\x64', '\x65', '\x62', '\x00', '\x63', '\x67', '\x9e', '\x68',
+  '\x74', '\x71', '\x72', '\x73', '\x00', '\x75', '\x76', '\x77',
+  '\x00', '\x69', '\x00', '\xee', '\xeb', '\x00', '\xec', '\xbf',
+  '\x80', '\xfd', '\xfe', '\xfb', '\xfc', '\x00', '\x00', '\x59',
+  '\x44', '\x45', '\x42', '\x00', '\x43', '\x47', '\x9c', '\x48',
+  '\x54', '\x51', '\x52', '\x53', '\x00', '\x55', '\x56', '\x57',
+  '\x00', '\x49', '\x00', '\xce', '\xcb', '\x00', '\xcc', '\xe1',
+  '\x70', '\xdd', '\xde', '\xdb', '\xdc', '\x00', '\x00', '\xdf',
+  '\x00', '\x00', '\x66', '\x46', '\xac', '\x8c', '\x9d', '\xbd',
+  '\xbe', '\xef', '\xcf', '\xed', '\xcd', '\x8e', '\xae', '\x00',
+  '\x58', '\x00', '\x00', '\x00', '\x00', '\x00', '\x8d', '\xad',
+  '\x78'
+};
diff --git a/iconvdata/ibm1140.c b/iconvdata/ibm1140.c
new file mode 100644
index 0000000000..9cff5e006a
--- /dev/null
+++ b/iconvdata/ibm1140.c
@@ -0,0 +1,29 @@
+/* Conversion from and to IBM1140.
+   Copyright (C) 2005 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#include <stdint.h>
+
+/* Get the conversion table.  */
+#define TABLES <ibm1140.h>
+
+#define CHARSET_NAME	"IBM1140//"
+#define HAS_HOLES	0	/* All 256 character are defined.  */
+
+#include <8bit-gap.c>
diff --git a/iconvdata/ibm1140.h b/iconvdata/ibm1140.h
new file mode 100644
index 0000000000..3513a406b5
--- /dev/null
+++ b/iconvdata/ibm1140.h
@@ -0,0 +1,132 @@
+/* Tables for conversion from and to IBM1140.
+   Copyright (C) 2005 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+static const uint32_t to_ucs4[256] =
+{
+  [0x00] = 0x0000, [0x01] = 0x0001, [0x02] = 0x0002, [0x03] = 0x0003,
+  [0x04] = 0x009c, [0x05] = 0x0009, [0x06] = 0x0086, [0x07] = 0x007f,
+  [0x08] = 0x0097, [0x09] = 0x008d, [0x0a] = 0x008e, [0x0b] = 0x000b,
+  [0x0c] = 0x000c, [0x0d] = 0x000d, [0x0e] = 0x000e, [0x0f] = 0x000f,
+  [0x10] = 0x0010, [0x11] = 0x0011, [0x12] = 0x0012, [0x13] = 0x0013,
+  [0x14] = 0x009d, [0x15] = 0x0085, [0x16] = 0x0008, [0x17] = 0x0087,
+  [0x18] = 0x0018, [0x19] = 0x0019, [0x1a] = 0x0092, [0x1b] = 0x008f,
+  [0x1c] = 0x001c, [0x1d] = 0x001d, [0x1e] = 0x001e, [0x1f] = 0x001f,
+  [0x20] = 0x0080, [0x21] = 0x0081, [0x22] = 0x0082, [0x23] = 0x0083,
+  [0x24] = 0x0084, [0x25] = 0x000a, [0x26] = 0x0017, [0x27] = 0x001b,
+  [0x28] = 0x0088, [0x29] = 0x0089, [0x2a] = 0x008a, [0x2b] = 0x008b,
+  [0x2c] = 0x008c, [0x2d] = 0x0005, [0x2e] = 0x0006, [0x2f] = 0x0007,
+  [0x30] = 0x0090, [0x31] = 0x0091, [0x32] = 0x0016, [0x33] = 0x0093,
+  [0x34] = 0x0094, [0x35] = 0x0095, [0x36] = 0x0096, [0x37] = 0x0004,
+  [0x38] = 0x0098, [0x39] = 0x0099, [0x3a] = 0x009a, [0x3b] = 0x009b,
+  [0x3c] = 0x0014, [0x3d] = 0x0015, [0x3e] = 0x009e, [0x3f] = 0x001a,
+  [0x40] = 0x0020, [0x41] = 0x00a0, [0x42] = 0x00e2, [0x43] = 0x00e4,
+  [0x44] = 0x00e0, [0x45] = 0x00e1, [0x46] = 0x00e3, [0x47] = 0x00e5,
+  [0x48] = 0x00e7, [0x49] = 0x00f1, [0x4a] = 0x00a2, [0x4b] = 0x002e,
+  [0x4c] = 0x003c, [0x4d] = 0x0028, [0x4e] = 0x002b, [0x4f] = 0x007c,
+  [0x50] = 0x0026, [0x51] = 0x00e9, [0x52] = 0x00ea, [0x53] = 0x00eb,
+  [0x54] = 0x00e8, [0x55] = 0x00ed, [0x56] = 0x00ee, [0x57] = 0x00ef,
+  [0x58] = 0x00ec, [0x59] = 0x00df, [0x5a] = 0x0021, [0x5b] = 0x0024,
+  [0x5c] = 0x002a, [0x5d] = 0x0029, [0x5e] = 0x003b, [0x5f] = 0x00ac,
+  [0x60] = 0x002d, [0x61] = 0x002f, [0x62] = 0x00c2, [0x63] = 0x00c4,
+  [0x64] = 0x00c0, [0x65] = 0x00c1, [0x66] = 0x00c3, [0x67] = 0x00c5,
+  [0x68] = 0x00c7, [0x69] = 0x00d1, [0x6a] = 0x00a6, [0x6b] = 0x002c,
+  [0x6c] = 0x0025, [0x6d] = 0x005f, [0x6e] = 0x003e, [0x6f] = 0x003f,
+  [0x70] = 0x00f8, [0x71] = 0x00c9, [0x72] = 0x00ca, [0x73] = 0x00cb,
+  [0x74] = 0x00c8, [0x75] = 0x00cd, [0x76] = 0x00ce, [0x77] = 0x00cf,
+  [0x78] = 0x00cc, [0x79] = 0x0060, [0x7a] = 0x003a, [0x7b] = 0x0023,
+  [0x7c] = 0x0040, [0x7d] = 0x0027, [0x7e] = 0x003d, [0x7f] = 0x0022,
+  [0x80] = 0x00d8, [0x81] = 0x0061, [0x82] = 0x0062, [0x83] = 0x0063,
+  [0x84] = 0x0064, [0x85] = 0x0065, [0x86] = 0x0066, [0x87] = 0x0067,
+  [0x88] = 0x0068, [0x89] = 0x0069, [0x8a] = 0x00ab, [0x8b] = 0x00bb,
+  [0x8c] = 0x00f0, [0x8d] = 0x00fd, [0x8e] = 0x00fe, [0x8f] = 0x00b1,
+  [0x90] = 0x00b0, [0x91] = 0x006a, [0x92] = 0x006b, [0x93] = 0x006c,
+  [0x94] = 0x006d, [0x95] = 0x006e, [0x96] = 0x006f, [0x97] = 0x0070,
+  [0x98] = 0x0071, [0x99] = 0x0072, [0x9a] = 0x00aa, [0x9b] = 0x00ba,
+  [0x9c] = 0x00e6, [0x9d] = 0x00b8, [0x9e] = 0x00c6, [0x9f] = 0x20ac,
+  [0xa0] = 0x00b5, [0xa1] = 0x007e, [0xa2] = 0x0073, [0xa3] = 0x0074,
+  [0xa4] = 0x0075, [0xa5] = 0x0076, [0xa6] = 0x0077, [0xa7] = 0x0078,
+  [0xa8] = 0x0079, [0xa9] = 0x007a, [0xaa] = 0x00a1, [0xab] = 0x00bf,
+  [0xac] = 0x00d0, [0xad] = 0x00dd, [0xae] = 0x00de, [0xaf] = 0x00ae,
+  [0xb0] = 0x005e, [0xb1] = 0x00a3, [0xb2] = 0x00a5, [0xb3] = 0x00b7,
+  [0xb4] = 0x00a9, [0xb5] = 0x00a7, [0xb6] = 0x00b6, [0xb7] = 0x00bc,
+  [0xb8] = 0x00bd, [0xb9] = 0x00be, [0xba] = 0x005b, [0xbb] = 0x005d,
+  [0xbc] = 0x00af, [0xbd] = 0x00a8, [0xbe] = 0x00b4, [0xbf] = 0x00d7,
+  [0xc0] = 0x007b, [0xc1] = 0x0041, [0xc2] = 0x0042, [0xc3] = 0x0043,
+  [0xc4] = 0x0044, [0xc5] = 0x0045, [0xc6] = 0x0046, [0xc7] = 0x0047,
+  [0xc8] = 0x0048, [0xc9] = 0x0049, [0xca] = 0x00ad, [0xcb] = 0x00f4,
+  [0xcc] = 0x00f6, [0xcd] = 0x00f2, [0xce] = 0x00f3, [0xcf] = 0x00f5,
+  [0xd0] = 0x007d, [0xd1] = 0x004a, [0xd2] = 0x004b, [0xd3] = 0x004c,
+  [0xd4] = 0x004d, [0xd5] = 0x004e, [0xd6] = 0x004f, [0xd7] = 0x0050,
+  [0xd8] = 0x0051, [0xd9] = 0x0052, [0xda] = 0x00b9, [0xdb] = 0x00fb,
+  [0xdc] = 0x00fc, [0xdd] = 0x00f9, [0xde] = 0x00fa, [0xdf] = 0x00ff,
+  [0xe0] = 0x005c, [0xe1] = 0x00f7, [0xe2] = 0x0053, [0xe3] = 0x0054,
+  [0xe4] = 0x0055, [0xe5] = 0x0056, [0xe6] = 0x0057, [0xe7] = 0x0058,
+  [0xe8] = 0x0059, [0xe9] = 0x005a, [0xea] = 0x00b2, [0xeb] = 0x00d4,
+  [0xec] = 0x00d6, [0xed] = 0x00d2, [0xee] = 0x00d3, [0xef] = 0x00d5,
+  [0xf0] = 0x0030, [0xf1] = 0x0031, [0xf2] = 0x0032, [0xf3] = 0x0033,
+  [0xf4] = 0x0034, [0xf5] = 0x0035, [0xf6] = 0x0036, [0xf7] = 0x0037,
+  [0xf8] = 0x0038, [0xf9] = 0x0039, [0xfa] = 0x00b3, [0xfb] = 0x00db,
+  [0xfc] = 0x00dc, [0xfd] = 0x00d9, [0xfe] = 0x00da, [0xff] = 0x009f
+};
+
+static const struct gap from_idx[] =
+{
+  { start: 0x0000, end: 0x00ff, idx:     0 },
+  { start: 0x203e, end: 0x203e, idx: -7998 },
+  { start: 0x20ac, end: 0x20ac, idx: -8107 },
+  { start: 0xffff, end: 0xffff, idx:     0 }
+};
+
+static const char from_ucs4[] =
+{
+  '\x00', '\x01', '\x02', '\x03', '\x37', '\x2d', '\x2e', '\x2f',
+  '\x16', '\x05', '\x25', '\x0b', '\x0c', '\x0d', '\x0e', '\x0f',
+  '\x10', '\x11', '\x12', '\x13', '\x3c', '\x3d', '\x32', '\x26',
+  '\x18', '\x19', '\x3f', '\x27', '\x1c', '\x1d', '\x1e', '\x1f',
+  '\x40', '\x5a', '\x7f', '\x7b', '\x5b', '\x6c', '\x50', '\x7d',
+  '\x4d', '\x5d', '\x5c', '\x4e', '\x6b', '\x60', '\x4b', '\x61',
+  '\xf0', '\xf1', '\xf2', '\xf3', '\xf4', '\xf5', '\xf6', '\xf7',
+  '\xf8', '\xf9', '\x7a', '\x5e', '\x4c', '\x7e', '\x6e', '\x6f',
+  '\x7c', '\xc1', '\xc2', '\xc3', '\xc4', '\xc5', '\xc6', '\xc7',
+  '\xc8', '\xc9', '\xd1', '\xd2', '\xd3', '\xd4', '\xd5', '\xd6',
+  '\xd7', '\xd8', '\xd9', '\xe2', '\xe3', '\xe4', '\xe5', '\xe6',
+  '\xe7', '\xe8', '\xe9', '\xba', '\xe0', '\xbb', '\xb0', '\x6d',
+  '\x79', '\x81', '\x82', '\x83', '\x84', '\x85', '\x86', '\x87',
+  '\x88', '\x89', '\x91', '\x92', '\x93', '\x94', '\x95', '\x96',
+  '\x97', '\x98', '\x99', '\xa2', '\xa3', '\xa4', '\xa5', '\xa6',
+  '\xa7', '\xa8', '\xa9', '\xc0', '\x4f', '\xd0', '\xa1', '\x07',
+  '\x20', '\x21', '\x22', '\x23', '\x24', '\x15', '\x06', '\x17',
+  '\x28', '\x29', '\x2a', '\x2b', '\x2c', '\x09', '\x0a', '\x1b',
+  '\x30', '\x31', '\x1a', '\x33', '\x34', '\x35', '\x36', '\x08',
+  '\x38', '\x39', '\x3a', '\x3b', '\x04', '\x14', '\x3e', '\xff',
+  '\x41', '\xaa', '\x4a', '\xb1', '\x00', '\xb2', '\x6a', '\xb5',
+  '\xbd', '\xb4', '\x9a', '\x8a', '\x5f', '\xca', '\xaf', '\xbc',
+  '\x90', '\x8f', '\xea', '\xfa', '\xbe', '\xa0', '\xb6', '\xb3',
+  '\x9d', '\xda', '\x9b', '\x8b', '\xb7', '\xb8', '\xb9', '\xab',
+  '\x64', '\x65', '\x62', '\x66', '\x63', '\x67', '\x9e', '\x68',
+  '\x74', '\x71', '\x72', '\x73', '\x78', '\x75', '\x76', '\x77',
+  '\xac', '\x69', '\xed', '\xee', '\xeb', '\xef', '\xec', '\xbf',
+  '\x80', '\xfd', '\xfe', '\xfb', '\xfc', '\xad', '\xae', '\x59',
+  '\x44', '\x45', '\x42', '\x46', '\x43', '\x47', '\x9c', '\x48',
+  '\x54', '\x51', '\x52', '\x53', '\x58', '\x55', '\x56', '\x57',
+  '\x8c', '\x49', '\xcd', '\xce', '\xcb', '\xcf', '\xcc', '\xe1',
+  '\x70', '\xdd', '\xde', '\xdb', '\xdc', '\x8d', '\x8e', '\xdf',
+  '\xbc', '\x9f'
+};
diff --git a/iconvdata/ibm1141.c b/iconvdata/ibm1141.c
new file mode 100644
index 0000000000..0998060bf9
--- /dev/null
+++ b/iconvdata/ibm1141.c
@@ -0,0 +1,29 @@
+/* Conversion from and to IBM1141.
+   Copyright (C) 2005 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#include <stdint.h>
+
+/* Get the conversion table.  */
+#define TABLES <ibm1141.h>
+
+#define CHARSET_NAME	"IBM1141//"
+#define HAS_HOLES	0	/* All 256 character are defined.  */
+
+#include <8bit-gap.c>
diff --git a/iconvdata/ibm1141.h b/iconvdata/ibm1141.h
new file mode 100644
index 0000000000..1b427b6a47
--- /dev/null
+++ b/iconvdata/ibm1141.h
@@ -0,0 +1,132 @@
+/* Tables for conversion from and to IBM1141.
+   Copyright (C) 2005 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+static const uint32_t to_ucs4[256] =
+{
+  [0x00] = 0x0000, [0x01] = 0x0001, [0x02] = 0x0002, [0x03] = 0x0003,
+  [0x04] = 0x009c, [0x05] = 0x0009, [0x06] = 0x0086, [0x07] = 0x007f,
+  [0x08] = 0x0097, [0x09] = 0x008d, [0x0a] = 0x008e, [0x0b] = 0x000b,
+  [0x0c] = 0x000c, [0x0d] = 0x000d, [0x0e] = 0x000e, [0x0f] = 0x000f,
+  [0x10] = 0x0010, [0x11] = 0x0011, [0x12] = 0x0012, [0x13] = 0x0013,
+  [0x14] = 0x009d, [0x15] = 0x0085, [0x16] = 0x0008, [0x17] = 0x0087,
+  [0x18] = 0x0018, [0x19] = 0x0019, [0x1a] = 0x0092, [0x1b] = 0x008f,
+  [0x1c] = 0x001c, [0x1d] = 0x001d, [0x1e] = 0x001e, [0x1f] = 0x001f,
+  [0x20] = 0x0080, [0x21] = 0x0081, [0x22] = 0x0082, [0x23] = 0x0083,
+  [0x24] = 0x0084, [0x25] = 0x000a, [0x26] = 0x0017, [0x27] = 0x001b,
+  [0x28] = 0x0088, [0x29] = 0x0089, [0x2a] = 0x008a, [0x2b] = 0x008b,
+  [0x2c] = 0x008c, [0x2d] = 0x0005, [0x2e] = 0x0006, [0x2f] = 0x0007,
+  [0x30] = 0x0090, [0x31] = 0x0091, [0x32] = 0x0016, [0x33] = 0x0093,
+  [0x34] = 0x0094, [0x35] = 0x0095, [0x36] = 0x0096, [0x37] = 0x0004,
+  [0x38] = 0x0098, [0x39] = 0x0099, [0x3a] = 0x009a, [0x3b] = 0x009b,
+  [0x3c] = 0x0014, [0x3d] = 0x0015, [0x3e] = 0x009e, [0x3f] = 0x001a,
+  [0x40] = 0x0020, [0x41] = 0x00a0, [0x42] = 0x00e2, [0x43] = 0x007b,
+  [0x44] = 0x00e0, [0x45] = 0x00e1, [0x46] = 0x00e3, [0x47] = 0x00e5,
+  [0x48] = 0x00e7, [0x49] = 0x00f1, [0x4a] = 0x00c4, [0x4b] = 0x002e,
+  [0x4c] = 0x003c, [0x4d] = 0x0028, [0x4e] = 0x002b, [0x4f] = 0x0021,
+  [0x50] = 0x0026, [0x51] = 0x00e9, [0x52] = 0x00ea, [0x53] = 0x00eb,
+  [0x54] = 0x00e8, [0x55] = 0x00ed, [0x56] = 0x00ee, [0x57] = 0x00ef,
+  [0x58] = 0x00ec, [0x59] = 0x007e, [0x5a] = 0x00dc, [0x5b] = 0x0024,
+  [0x5c] = 0x002a, [0x5d] = 0x0029, [0x5e] = 0x003b, [0x5f] = 0x005e,
+  [0x60] = 0x002d, [0x61] = 0x002f, [0x62] = 0x00c2, [0x63] = 0x005b,
+  [0x64] = 0x00c0, [0x65] = 0x00c1, [0x66] = 0x00c3, [0x67] = 0x00c5,
+  [0x68] = 0x00c7, [0x69] = 0x00d1, [0x6a] = 0x00f6, [0x6b] = 0x002c,
+  [0x6c] = 0x0025, [0x6d] = 0x005f, [0x6e] = 0x003e, [0x6f] = 0x003f,
+  [0x70] = 0x00f8, [0x71] = 0x00c9, [0x72] = 0x00ca, [0x73] = 0x00cb,
+  [0x74] = 0x00c8, [0x75] = 0x00cd, [0x76] = 0x00ce, [0x77] = 0x00cf,
+  [0x78] = 0x00cc, [0x79] = 0x0060, [0x7a] = 0x003a, [0x7b] = 0x0023,
+  [0x7c] = 0x00a7, [0x7d] = 0x0027, [0x7e] = 0x003d, [0x7f] = 0x0022,
+  [0x80] = 0x00d8, [0x81] = 0x0061, [0x82] = 0x0062, [0x83] = 0x0063,
+  [0x84] = 0x0064, [0x85] = 0x0065, [0x86] = 0x0066, [0x87] = 0x0067,
+  [0x88] = 0x0068, [0x89] = 0x0069, [0x8a] = 0x00ab, [0x8b] = 0x00bb,
+  [0x8c] = 0x00f0, [0x8d] = 0x00fd, [0x8e] = 0x00fe, [0x8f] = 0x00b1,
+  [0x90] = 0x00b0, [0x91] = 0x006a, [0x92] = 0x006b, [0x93] = 0x006c,
+  [0x94] = 0x006d, [0x95] = 0x006e, [0x96] = 0x006f, [0x97] = 0x0070,
+  [0x98] = 0x0071, [0x99] = 0x0072, [0x9a] = 0x00aa, [0x9b] = 0x00ba,
+  [0x9c] = 0x00e6, [0x9d] = 0x00b8, [0x9e] = 0x00c6, [0x9f] = 0x20ac,
+  [0xa0] = 0x00b5, [0xa1] = 0x00df, [0xa2] = 0x0073, [0xa3] = 0x0074,
+  [0xa4] = 0x0075, [0xa5] = 0x0076, [0xa6] = 0x0077, [0xa7] = 0x0078,
+  [0xa8] = 0x0079, [0xa9] = 0x007a, [0xaa] = 0x00a1, [0xab] = 0x00bf,
+  [0xac] = 0x00d0, [0xad] = 0x00dd, [0xae] = 0x00de, [0xaf] = 0x00ae,
+  [0xb0] = 0x00a2, [0xb1] = 0x00a3, [0xb2] = 0x00a5, [0xb3] = 0x00b7,
+  [0xb4] = 0x00a9, [0xb5] = 0x0040, [0xb6] = 0x00b6, [0xb7] = 0x00bc,
+  [0xb8] = 0x00bd, [0xb9] = 0x00be, [0xba] = 0x00ac, [0xbb] = 0x007c,
+  [0xbc] = 0x00af, [0xbd] = 0x00a8, [0xbe] = 0x00b4, [0xbf] = 0x00d7,
+  [0xc0] = 0x00e4, [0xc1] = 0x0041, [0xc2] = 0x0042, [0xc3] = 0x0043,
+  [0xc4] = 0x0044, [0xc5] = 0x0045, [0xc6] = 0x0046, [0xc7] = 0x0047,
+  [0xc8] = 0x0048, [0xc9] = 0x0049, [0xca] = 0x00ad, [0xcb] = 0x00f4,
+  [0xcc] = 0x00a6, [0xcd] = 0x00f2, [0xce] = 0x00f3, [0xcf] = 0x00f5,
+  [0xd0] = 0x00fc, [0xd1] = 0x004a, [0xd2] = 0x004b, [0xd3] = 0x004c,
+  [0xd4] = 0x004d, [0xd5] = 0x004e, [0xd6] = 0x004f, [0xd7] = 0x0050,
+  [0xd8] = 0x0051, [0xd9] = 0x0052, [0xda] = 0x00b9, [0xdb] = 0x00fb,
+  [0xdc] = 0x007d, [0xdd] = 0x00f9, [0xde] = 0x00fa, [0xdf] = 0x00ff,
+  [0xe0] = 0x00d6, [0xe1] = 0x00f7, [0xe2] = 0x0053, [0xe3] = 0x0054,
+  [0xe4] = 0x0055, [0xe5] = 0x0056, [0xe6] = 0x0057, [0xe7] = 0x0058,
+  [0xe8] = 0x0059, [0xe9] = 0x005a, [0xea] = 0x00b2, [0xeb] = 0x00d4,
+  [0xec] = 0x005c, [0xed] = 0x00d2, [0xee] = 0x00d3, [0xef] = 0x00d5,
+  [0xf0] = 0x0030, [0xf1] = 0x0031, [0xf2] = 0x0032, [0xf3] = 0x0033,
+  [0xf4] = 0x0034, [0xf5] = 0x0035, [0xf6] = 0x0036, [0xf7] = 0x0037,
+  [0xf8] = 0x0038, [0xf9] = 0x0039, [0xfa] = 0x00b3, [0xfb] = 0x00db,
+  [0xfc] = 0x005d, [0xfd] = 0x00d9, [0xfe] = 0x00da, [0xff] = 0x009f
+};
+
+static const struct gap from_idx[] =
+{
+  { start: 0x0000, end: 0x00ff, idx:     0 },
+  { start: 0x203e, end: 0x203e, idx: -7998 },
+  { start: 0x20ac, end: 0x20ac, idx: -8107 },
+  { start: 0xffff, end: 0xffff, idx:     0 }
+};
+
+static const char from_ucs4[] =
+{
+  '\x00', '\x01', '\x02', '\x03', '\x37', '\x2d', '\x2e', '\x2f',
+  '\x16', '\x05', '\x25', '\x0b', '\x0c', '\x0d', '\x0e', '\x0f',
+  '\x10', '\x11', '\x12', '\x13', '\x3c', '\x3d', '\x32', '\x26',
+  '\x18', '\x19', '\x3f', '\x27', '\x1c', '\x1d', '\x1e', '\x1f',
+  '\x40', '\x4f', '\x7f', '\x7b', '\x5b', '\x6c', '\x50', '\x7d',
+  '\x4d', '\x5d', '\x5c', '\x4e', '\x6b', '\x60', '\x4b', '\x61',
+  '\xf0', '\xf1', '\xf2', '\xf3', '\xf4', '\xf5', '\xf6', '\xf7',
+  '\xf8', '\xf9', '\x7a', '\x5e', '\x4c', '\x7e', '\x6e', '\x6f',
+  '\xb5', '\xc1', '\xc2', '\xc3', '\xc4', '\xc5', '\xc6', '\xc7',
+  '\xc8', '\xc9', '\xd1', '\xd2', '\xd3', '\xd4', '\xd5', '\xd6',
+  '\xd7', '\xd8', '\xd9', '\xe2', '\xe3', '\xe4', '\xe5', '\xe6',
+  '\xe7', '\xe8', '\xe9', '\x63', '\xec', '\xfc', '\x5f', '\x6d',
+  '\x79', '\x81', '\x82', '\x83', '\x84', '\x85', '\x86', '\x87',
+  '\x88', '\x89', '\x91', '\x92', '\x93', '\x94', '\x95', '\x96',
+  '\x97', '\x98', '\x99', '\xa2', '\xa3', '\xa4', '\xa5', '\xa6',
+  '\xa7', '\xa8', '\xa9', '\x43', '\xbb', '\xdc', '\x59', '\x07',
+  '\x20', '\x21', '\x22', '\x23', '\x24', '\x15', '\x06', '\x17',
+  '\x28', '\x29', '\x2a', '\x2b', '\x2c', '\x09', '\x0a', '\x1b',
+  '\x30', '\x31', '\x1a', '\x33', '\x34', '\x35', '\x36', '\x08',
+  '\x38', '\x39', '\x3a', '\x3b', '\x04', '\x14', '\x3e', '\xff',
+  '\x41', '\xaa', '\xb0', '\xb1', '\x00', '\xb2', '\xcc', '\x7c',
+  '\xbd', '\xb4', '\x9a', '\x8a', '\xba', '\xca', '\xaf', '\xbc',
+  '\x90', '\x8f', '\xea', '\xfa', '\xbe', '\xa0', '\xb6', '\xb3',
+  '\x9d', '\xda', '\x9b', '\x8b', '\xb7', '\xb8', '\xb9', '\xab',
+  '\x64', '\x65', '\x62', '\x66', '\x4a', '\x67', '\x9e', '\x68',
+  '\x74', '\x71', '\x72', '\x73', '\x78', '\x75', '\x76', '\x77',
+  '\xac', '\x69', '\xed', '\xee', '\xeb', '\xef', '\xe0', '\xbf',
+  '\x80', '\xfd', '\xfe', '\xfb', '\x5a', '\xad', '\xae', '\xa1',
+  '\x44', '\x45', '\x42', '\x46', '\xc0', '\x47', '\x9c', '\x48',
+  '\x54', '\x51', '\x52', '\x53', '\x58', '\x55', '\x56', '\x57',
+  '\x8c', '\x49', '\xcd', '\xce', '\xcb', '\xcf', '\x6a', '\xe1',
+  '\x70', '\xdd', '\xde', '\xdb', '\xd0', '\x8d', '\x8e', '\xdf',
+  '\xbc', '\x9f'
+};
diff --git a/iconvdata/ibm1142.c b/iconvdata/ibm1142.c
new file mode 100644
index 0000000000..147784ca71
--- /dev/null
+++ b/iconvdata/ibm1142.c
@@ -0,0 +1,29 @@
+/* Conversion from and to IBM1142.
+   Copyright (C) 2005 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#include <stdint.h>
+
+/* Get the conversion table.  */
+#define TABLES <ibm1142.h>
+
+#define CHARSET_NAME	"IBM1142//"
+#define HAS_HOLES	0	/* All 256 character are defined.  */
+
+#include <8bit-gap.c>
diff --git a/iconvdata/ibm1142.h b/iconvdata/ibm1142.h
new file mode 100644
index 0000000000..04dd4c3e1f
--- /dev/null
+++ b/iconvdata/ibm1142.h
@@ -0,0 +1,132 @@
+/* Tables for conversion from and to IBM1142.
+   Copyright (C) 2005 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+static const uint32_t to_ucs4[256] =
+{
+  [0x00] = 0x0000, [0x01] = 0x0001, [0x02] = 0x0002, [0x03] = 0x0003,
+  [0x04] = 0x009c, [0x05] = 0x0009, [0x06] = 0x0086, [0x07] = 0x007f,
+  [0x08] = 0x0097, [0x09] = 0x008d, [0x0a] = 0x008e, [0x0b] = 0x000b,
+  [0x0c] = 0x000c, [0x0d] = 0x000d, [0x0e] = 0x000e, [0x0f] = 0x000f,
+  [0x10] = 0x0010, [0x11] = 0x0011, [0x12] = 0x0012, [0x13] = 0x0013,
+  [0x14] = 0x009d, [0x15] = 0x0085, [0x16] = 0x0008, [0x17] = 0x0087,
+  [0x18] = 0x0018, [0x19] = 0x0019, [0x1a] = 0x0092, [0x1b] = 0x008f,
+  [0x1c] = 0x001c, [0x1d] = 0x001d, [0x1e] = 0x001e, [0x1f] = 0x001f,
+  [0x20] = 0x0080, [0x21] = 0x0081, [0x22] = 0x0082, [0x23] = 0x0083,
+  [0x24] = 0x0084, [0x25] = 0x000a, [0x26] = 0x0017, [0x27] = 0x001b,
+  [0x28] = 0x0088, [0x29] = 0x0089, [0x2a] = 0x008a, [0x2b] = 0x008b,
+  [0x2c] = 0x008c, [0x2d] = 0x0005, [0x2e] = 0x0006, [0x2f] = 0x0007,
+  [0x30] = 0x0090, [0x31] = 0x0091, [0x32] = 0x0016, [0x33] = 0x0093,
+  [0x34] = 0x0094, [0x35] = 0x0095, [0x36] = 0x0096, [0x37] = 0x0004,
+  [0x38] = 0x0098, [0x39] = 0x0099, [0x3a] = 0x009a, [0x3b] = 0x009b,
+  [0x3c] = 0x0014, [0x3d] = 0x0015, [0x3e] = 0x009e, [0x3f] = 0x001a,
+  [0x40] = 0x0020, [0x41] = 0x00a0, [0x42] = 0x00e2, [0x43] = 0x00e4,
+  [0x44] = 0x00e0, [0x45] = 0x00e1, [0x46] = 0x00e3, [0x47] = 0x007d,
+  [0x48] = 0x00e7, [0x49] = 0x00f1, [0x4a] = 0x0023, [0x4b] = 0x002e,
+  [0x4c] = 0x003c, [0x4d] = 0x0028, [0x4e] = 0x002b, [0x4f] = 0x0021,
+  [0x50] = 0x0026, [0x51] = 0x00e9, [0x52] = 0x00ea, [0x53] = 0x00eb,
+  [0x54] = 0x00e8, [0x55] = 0x00ed, [0x56] = 0x00ee, [0x57] = 0x00ef,
+  [0x58] = 0x00ec, [0x59] = 0x00df, [0x5a] = 0x20ac, [0x5b] = 0x00c5,
+  [0x5c] = 0x002a, [0x5d] = 0x0029, [0x5e] = 0x003b, [0x5f] = 0x005e,
+  [0x60] = 0x002d, [0x61] = 0x002f, [0x62] = 0x00c2, [0x63] = 0x00c4,
+  [0x64] = 0x00c0, [0x65] = 0x00c1, [0x66] = 0x00c3, [0x67] = 0x0024,
+  [0x68] = 0x00c7, [0x69] = 0x00d1, [0x6a] = 0x00f8, [0x6b] = 0x002c,
+  [0x6c] = 0x0025, [0x6d] = 0x005f, [0x6e] = 0x003e, [0x6f] = 0x003f,
+  [0x70] = 0x00a6, [0x71] = 0x00c9, [0x72] = 0x00ca, [0x73] = 0x00cb,
+  [0x74] = 0x00c8, [0x75] = 0x00cd, [0x76] = 0x00ce, [0x77] = 0x00cf,
+  [0x78] = 0x00cc, [0x79] = 0x0060, [0x7a] = 0x003a, [0x7b] = 0x00c6,
+  [0x7c] = 0x00d8, [0x7d] = 0x0027, [0x7e] = 0x003d, [0x7f] = 0x0022,
+  [0x80] = 0x0040, [0x81] = 0x0061, [0x82] = 0x0062, [0x83] = 0x0063,
+  [0x84] = 0x0064, [0x85] = 0x0065, [0x86] = 0x0066, [0x87] = 0x0067,
+  [0x88] = 0x0068, [0x89] = 0x0069, [0x8a] = 0x00ab, [0x8b] = 0x00bb,
+  [0x8c] = 0x00f0, [0x8d] = 0x00fd, [0x8e] = 0x00fe, [0x8f] = 0x00b1,
+  [0x90] = 0x00b0, [0x91] = 0x006a, [0x92] = 0x006b, [0x93] = 0x006c,
+  [0x94] = 0x006d, [0x95] = 0x006e, [0x96] = 0x006f, [0x97] = 0x0070,
+  [0x98] = 0x0071, [0x99] = 0x0072, [0x9a] = 0x00aa, [0x9b] = 0x00ba,
+  [0x9c] = 0x007b, [0x9d] = 0x00b8, [0x9e] = 0x005b, [0x9f] = 0x005d,
+  [0xa0] = 0x00b5, [0xa1] = 0x00fc, [0xa2] = 0x0073, [0xa3] = 0x0074,
+  [0xa4] = 0x0075, [0xa5] = 0x0076, [0xa6] = 0x0077, [0xa7] = 0x0078,
+  [0xa8] = 0x0079, [0xa9] = 0x007a, [0xaa] = 0x00a1, [0xab] = 0x00bf,
+  [0xac] = 0x00d0, [0xad] = 0x00dd, [0xae] = 0x00de, [0xaf] = 0x00ae,
+  [0xb0] = 0x00a2, [0xb1] = 0x00a3, [0xb2] = 0x00a5, [0xb3] = 0x00b7,
+  [0xb4] = 0x00a9, [0xb5] = 0x00a7, [0xb6] = 0x00b6, [0xb7] = 0x00bc,
+  [0xb8] = 0x00bd, [0xb9] = 0x00be, [0xba] = 0x00ac, [0xbb] = 0x007c,
+  [0xbc] = 0x00af, [0xbd] = 0x00a8, [0xbe] = 0x00b4, [0xbf] = 0x00d7,
+  [0xc0] = 0x00e6, [0xc1] = 0x0041, [0xc2] = 0x0042, [0xc3] = 0x0043,
+  [0xc4] = 0x0044, [0xc5] = 0x0045, [0xc6] = 0x0046, [0xc7] = 0x0047,
+  [0xc8] = 0x0048, [0xc9] = 0x0049, [0xca] = 0x00ad, [0xcb] = 0x00f4,
+  [0xcc] = 0x00f6, [0xcd] = 0x00f2, [0xce] = 0x00f3, [0xcf] = 0x00f5,
+  [0xd0] = 0x00e5, [0xd1] = 0x004a, [0xd2] = 0x004b, [0xd3] = 0x004c,
+  [0xd4] = 0x004d, [0xd5] = 0x004e, [0xd6] = 0x004f, [0xd7] = 0x0050,
+  [0xd8] = 0x0051, [0xd9] = 0x0052, [0xda] = 0x00b9, [0xdb] = 0x00fb,
+  [0xdc] = 0x007e, [0xdd] = 0x00f9, [0xde] = 0x00fa, [0xdf] = 0x00ff,
+  [0xe0] = 0x005c, [0xe1] = 0x00f7, [0xe2] = 0x0053, [0xe3] = 0x0054,
+  [0xe4] = 0x0055, [0xe5] = 0x0056, [0xe6] = 0x0057, [0xe7] = 0x0058,
+  [0xe8] = 0x0059, [0xe9] = 0x005a, [0xea] = 0x00b2, [0xeb] = 0x00d4,
+  [0xec] = 0x00d6, [0xed] = 0x00d2, [0xee] = 0x00d3, [0xef] = 0x00d5,
+  [0xf0] = 0x0030, [0xf1] = 0x0031, [0xf2] = 0x0032, [0xf3] = 0x0033,
+  [0xf4] = 0x0034, [0xf5] = 0x0035, [0xf6] = 0x0036, [0xf7] = 0x0037,
+  [0xf8] = 0x0038, [0xf9] = 0x0039, [0xfa] = 0x00b3, [0xfb] = 0x00db,
+  [0xfc] = 0x00dc, [0xfd] = 0x00d9, [0xfe] = 0x00da, [0xff] = 0x009f
+};
+
+static const struct gap from_idx[] =
+{
+  { start: 0x0000, end: 0x00ff, idx:     0 },
+  { start: 0x203e, end: 0x203e, idx: -7998 },
+  { start: 0x20ac, end: 0x20ac, idx: -8107 },
+  { start: 0xffff, end: 0xffff, idx:     0 }
+};
+
+static const char from_ucs4[] =
+{
+  '\x00', '\x01', '\x02', '\x03', '\x37', '\x2d', '\x2e', '\x2f',
+  '\x16', '\x05', '\x25', '\x0b', '\x0c', '\x0d', '\x0e', '\x0f',
+  '\x10', '\x11', '\x12', '\x13', '\x3c', '\x3d', '\x32', '\x26',
+  '\x18', '\x19', '\x3f', '\x27', '\x1c', '\x1d', '\x1e', '\x1f',
+  '\x40', '\x4f', '\x7f', '\x4a', '\x67', '\x6c', '\x50', '\x7d',
+  '\x4d', '\x5d', '\x5c', '\x4e', '\x6b', '\x60', '\x4b', '\x61',
+  '\xf0', '\xf1', '\xf2', '\xf3', '\xf4', '\xf5', '\xf6', '\xf7',
+  '\xf8', '\xf9', '\x7a', '\x5e', '\x4c', '\x7e', '\x6e', '\x6f',
+  '\x80', '\xc1', '\xc2', '\xc3', '\xc4', '\xc5', '\xc6', '\xc7',
+  '\xc8', '\xc9', '\xd1', '\xd2', '\xd3', '\xd4', '\xd5', '\xd6',
+  '\xd7', '\xd8', '\xd9', '\xe2', '\xe3', '\xe4', '\xe5', '\xe6',
+  '\xe7', '\xe8', '\xe9', '\x9e', '\xe0', '\x9f', '\x5f', '\x6d',
+  '\x79', '\x81', '\x82', '\x83', '\x84', '\x85', '\x86', '\x87',
+  '\x88', '\x89', '\x91', '\x92', '\x93', '\x94', '\x95', '\x96',
+  '\x97', '\x98', '\x99', '\xa2', '\xa3', '\xa4', '\xa5', '\xa6',
+  '\xa7', '\xa8', '\xa9', '\x9c', '\xbb', '\x47', '\xdc', '\x07',
+  '\x20', '\x21', '\x22', '\x23', '\x24', '\x15', '\x06', '\x17',
+  '\x28', '\x29', '\x2a', '\x2b', '\x2c', '\x09', '\x0a', '\x1b',
+  '\x30', '\x31', '\x1a', '\x33', '\x34', '\x35', '\x36', '\x08',
+  '\x38', '\x39', '\x3a', '\x3b', '\x04', '\x14', '\x3e', '\xff',
+  '\x41', '\xaa', '\xb0', '\xb1', '\x00', '\xb2', '\x70', '\xb5',
+  '\xbd', '\xb4', '\x9a', '\x8a', '\xba', '\xca', '\xaf', '\xbc',
+  '\x90', '\x8f', '\xea', '\xfa', '\xbe', '\xa0', '\xb6', '\xb3',
+  '\x9d', '\xda', '\x9b', '\x8b', '\xb7', '\xb8', '\xb9', '\xab',
+  '\x64', '\x65', '\x62', '\x66', '\x63', '\x5b', '\x7b', '\x68',
+  '\x74', '\x71', '\x72', '\x73', '\x78', '\x75', '\x76', '\x77',
+  '\xac', '\x69', '\xed', '\xee', '\xeb', '\xef', '\xec', '\xbf',
+  '\x7c', '\xfd', '\xfe', '\xfb', '\xfc', '\xad', '\xae', '\x59',
+  '\x44', '\x45', '\x42', '\x46', '\x43', '\xd0', '\xc0', '\x48',
+  '\x54', '\x51', '\x52', '\x53', '\x58', '\x55', '\x56', '\x57',
+  '\x8c', '\x49', '\xcd', '\xce', '\xcb', '\xcf', '\xcc', '\xe1',
+  '\x6a', '\xdd', '\xde', '\xdb', '\xa1', '\x8d', '\x8e', '\xdf',
+  '\xbc', '\x5a'
+};
diff --git a/iconvdata/ibm1143.c b/iconvdata/ibm1143.c
new file mode 100644
index 0000000000..5c7c208e4e
--- /dev/null
+++ b/iconvdata/ibm1143.c
@@ -0,0 +1,29 @@
+/* Conversion from and to IBM1143.
+   Copyright (C) 2005 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#include <stdint.h>
+
+/* Get the conversion table.  */
+#define TABLES <ibm1143.h>
+
+#define CHARSET_NAME	"IBM1143//"
+#define HAS_HOLES	0	/* All 256 character are defined.  */
+
+#include <8bit-gap.c>
diff --git a/iconvdata/ibm1143.h b/iconvdata/ibm1143.h
new file mode 100644
index 0000000000..2a5112c261
--- /dev/null
+++ b/iconvdata/ibm1143.h
@@ -0,0 +1,132 @@
+/* Tables for conversion from and to IBM1143.
+   Copyright (C) 2005 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+static const uint32_t to_ucs4[256] =
+{
+  [0x00] = 0x0000, [0x01] = 0x0001, [0x02] = 0x0002, [0x03] = 0x0003,
+  [0x04] = 0x009c, [0x05] = 0x0009, [0x06] = 0x0086, [0x07] = 0x007f,
+  [0x08] = 0x0097, [0x09] = 0x008d, [0x0a] = 0x008e, [0x0b] = 0x000b,
+  [0x0c] = 0x000c, [0x0d] = 0x000d, [0x0e] = 0x000e, [0x0f] = 0x000f,
+  [0x10] = 0x0010, [0x11] = 0x0011, [0x12] = 0x0012, [0x13] = 0x0013,
+  [0x14] = 0x009d, [0x15] = 0x0085, [0x16] = 0x0008, [0x17] = 0x0087,
+  [0x18] = 0x0018, [0x19] = 0x0019, [0x1a] = 0x0092, [0x1b] = 0x008f,
+  [0x1c] = 0x001c, [0x1d] = 0x001d, [0x1e] = 0x001e, [0x1f] = 0x001f,
+  [0x20] = 0x0080, [0x21] = 0x0081, [0x22] = 0x0082, [0x23] = 0x0083,
+  [0x24] = 0x0084, [0x25] = 0x000a, [0x26] = 0x0017, [0x27] = 0x001b,
+  [0x28] = 0x0088, [0x29] = 0x0089, [0x2a] = 0x008a, [0x2b] = 0x008b,
+  [0x2c] = 0x008c, [0x2d] = 0x0005, [0x2e] = 0x0006, [0x2f] = 0x0007,
+  [0x30] = 0x0090, [0x31] = 0x0091, [0x32] = 0x0016, [0x33] = 0x0093,
+  [0x34] = 0x0094, [0x35] = 0x0095, [0x36] = 0x0096, [0x37] = 0x0004,
+  [0x38] = 0x0098, [0x39] = 0x0099, [0x3a] = 0x009a, [0x3b] = 0x009b,
+  [0x3c] = 0x0014, [0x3d] = 0x0015, [0x3e] = 0x009e, [0x3f] = 0x001a,
+  [0x40] = 0x0020, [0x41] = 0x00a0, [0x42] = 0x00e2, [0x43] = 0x007b,
+  [0x44] = 0x00e0, [0x45] = 0x00e1, [0x46] = 0x00e3, [0x47] = 0x007d,
+  [0x48] = 0x00e7, [0x49] = 0x00f1, [0x4a] = 0x00a7, [0x4b] = 0x002e,
+  [0x4c] = 0x003c, [0x4d] = 0x0028, [0x4e] = 0x002b, [0x4f] = 0x0021,
+  [0x50] = 0x0026, [0x51] = 0x0060, [0x52] = 0x00ea, [0x53] = 0x00eb,
+  [0x54] = 0x00e8, [0x55] = 0x00ed, [0x56] = 0x00ee, [0x57] = 0x00ef,
+  [0x58] = 0x00ec, [0x59] = 0x00df, [0x5a] = 0x20ac, [0x5b] = 0x00c5,
+  [0x5c] = 0x002a, [0x5d] = 0x0029, [0x5e] = 0x003b, [0x5f] = 0x005e,
+  [0x60] = 0x002d, [0x61] = 0x002f, [0x62] = 0x00c2, [0x63] = 0x0023,
+  [0x64] = 0x00c0, [0x65] = 0x00c1, [0x66] = 0x00c3, [0x67] = 0x0024,
+  [0x68] = 0x00c7, [0x69] = 0x00d1, [0x6a] = 0x00f6, [0x6b] = 0x002c,
+  [0x6c] = 0x0025, [0x6d] = 0x005f, [0x6e] = 0x003e, [0x6f] = 0x003f,
+  [0x70] = 0x00f8, [0x71] = 0x005c, [0x72] = 0x00ca, [0x73] = 0x00cb,
+  [0x74] = 0x00c8, [0x75] = 0x00cd, [0x76] = 0x00ce, [0x77] = 0x00cf,
+  [0x78] = 0x00cc, [0x79] = 0x00e9, [0x7a] = 0x003a, [0x7b] = 0x00c4,
+  [0x7c] = 0x00d6, [0x7d] = 0x0027, [0x7e] = 0x003d, [0x7f] = 0x0022,
+  [0x80] = 0x00d8, [0x81] = 0x0061, [0x82] = 0x0062, [0x83] = 0x0063,
+  [0x84] = 0x0064, [0x85] = 0x0065, [0x86] = 0x0066, [0x87] = 0x0067,
+  [0x88] = 0x0068, [0x89] = 0x0069, [0x8a] = 0x00ab, [0x8b] = 0x00bb,
+  [0x8c] = 0x00f0, [0x8d] = 0x00fd, [0x8e] = 0x00fe, [0x8f] = 0x00b1,
+  [0x90] = 0x00b0, [0x91] = 0x006a, [0x92] = 0x006b, [0x93] = 0x006c,
+  [0x94] = 0x006d, [0x95] = 0x006e, [0x96] = 0x006f, [0x97] = 0x0070,
+  [0x98] = 0x0071, [0x99] = 0x0072, [0x9a] = 0x00aa, [0x9b] = 0x00ba,
+  [0x9c] = 0x00e6, [0x9d] = 0x00b8, [0x9e] = 0x00c6, [0x9f] = 0x005d,
+  [0xa0] = 0x00b5, [0xa1] = 0x00fc, [0xa2] = 0x0073, [0xa3] = 0x0074,
+  [0xa4] = 0x0075, [0xa5] = 0x0076, [0xa6] = 0x0077, [0xa7] = 0x0078,
+  [0xa8] = 0x0079, [0xa9] = 0x007a, [0xaa] = 0x00a1, [0xab] = 0x00bf,
+  [0xac] = 0x00d0, [0xad] = 0x00dd, [0xae] = 0x00de, [0xaf] = 0x00ae,
+  [0xb0] = 0x00a2, [0xb1] = 0x00a3, [0xb2] = 0x00a5, [0xb3] = 0x00b7,
+  [0xb4] = 0x00a9, [0xb5] = 0x005b, [0xb6] = 0x00b6, [0xb7] = 0x00bc,
+  [0xb8] = 0x00bd, [0xb9] = 0x00be, [0xba] = 0x00ac, [0xbb] = 0x007c,
+  [0xbc] = 0x00af, [0xbd] = 0x00a8, [0xbe] = 0x00b4, [0xbf] = 0x00d7,
+  [0xc0] = 0x00e4, [0xc1] = 0x0041, [0xc2] = 0x0042, [0xc3] = 0x0043,
+  [0xc4] = 0x0044, [0xc5] = 0x0045, [0xc6] = 0x0046, [0xc7] = 0x0047,
+  [0xc8] = 0x0048, [0xc9] = 0x0049, [0xca] = 0x00ad, [0xcb] = 0x00f4,
+  [0xcc] = 0x00a6, [0xcd] = 0x00f2, [0xce] = 0x00f3, [0xcf] = 0x00f5,
+  [0xd0] = 0x00e5, [0xd1] = 0x004a, [0xd2] = 0x004b, [0xd3] = 0x004c,
+  [0xd4] = 0x004d, [0xd5] = 0x004e, [0xd6] = 0x004f, [0xd7] = 0x0050,
+  [0xd8] = 0x0051, [0xd9] = 0x0052, [0xda] = 0x00b9, [0xdb] = 0x00fb,
+  [0xdc] = 0x007e, [0xdd] = 0x00f9, [0xde] = 0x00fa, [0xdf] = 0x00ff,
+  [0xe0] = 0x00c9, [0xe1] = 0x00f7, [0xe2] = 0x0053, [0xe3] = 0x0054,
+  [0xe4] = 0x0055, [0xe5] = 0x0056, [0xe6] = 0x0057, [0xe7] = 0x0058,
+  [0xe8] = 0x0059, [0xe9] = 0x005a, [0xea] = 0x00b2, [0xeb] = 0x00d4,
+  [0xec] = 0x0040, [0xed] = 0x00d2, [0xee] = 0x00d3, [0xef] = 0x00d5,
+  [0xf0] = 0x0030, [0xf1] = 0x0031, [0xf2] = 0x0032, [0xf3] = 0x0033,
+  [0xf4] = 0x0034, [0xf5] = 0x0035, [0xf6] = 0x0036, [0xf7] = 0x0037,
+  [0xf8] = 0x0038, [0xf9] = 0x0039, [0xfa] = 0x00b3, [0xfb] = 0x00db,
+  [0xfc] = 0x00dc, [0xfd] = 0x00d9, [0xfe] = 0x00da, [0xff] = 0x009f
+};
+
+static const struct gap from_idx[] =
+{
+  { start: 0x0000, end: 0x00ff, idx:     0 },
+  { start: 0x203e, end: 0x203e, idx: -7998 },
+  { start: 0x20ac, end: 0x20ac, idx: -8107 },
+  { start: 0xffff, end: 0xffff, idx:     0 }
+};
+
+static const char from_ucs4[] =
+{
+  '\x00', '\x01', '\x02', '\x03', '\x37', '\x2d', '\x2e', '\x2f',
+  '\x16', '\x05', '\x25', '\x0b', '\x0c', '\x0d', '\x0e', '\x0f',
+  '\x10', '\x11', '\x12', '\x13', '\x3c', '\x3d', '\x32', '\x26',
+  '\x18', '\x19', '\x3f', '\x27', '\x1c', '\x1d', '\x1e', '\x1f',
+  '\x40', '\x4f', '\x7f', '\x63', '\x67', '\x6c', '\x50', '\x7d',
+  '\x4d', '\x5d', '\x5c', '\x4e', '\x6b', '\x60', '\x4b', '\x61',
+  '\xf0', '\xf1', '\xf2', '\xf3', '\xf4', '\xf5', '\xf6', '\xf7',
+  '\xf8', '\xf9', '\x7a', '\x5e', '\x4c', '\x7e', '\x6e', '\x6f',
+  '\xec', '\xc1', '\xc2', '\xc3', '\xc4', '\xc5', '\xc6', '\xc7',
+  '\xc8', '\xc9', '\xd1', '\xd2', '\xd3', '\xd4', '\xd5', '\xd6',
+  '\xd7', '\xd8', '\xd9', '\xe2', '\xe3', '\xe4', '\xe5', '\xe6',
+  '\xe7', '\xe8', '\xe9', '\xb5', '\x71', '\x9f', '\x5f', '\x6d',
+  '\x51', '\x81', '\x82', '\x83', '\x84', '\x85', '\x86', '\x87',
+  '\x88', '\x89', '\x91', '\x92', '\x93', '\x94', '\x95', '\x96',
+  '\x97', '\x98', '\x99', '\xa2', '\xa3', '\xa4', '\xa5', '\xa6',
+  '\xa7', '\xa8', '\xa9', '\x43', '\xbb', '\x47', '\xdc', '\x07',
+  '\x20', '\x21', '\x22', '\x23', '\x24', '\x15', '\x06', '\x17',
+  '\x28', '\x29', '\x2a', '\x2b', '\x2c', '\x09', '\x0a', '\x1b',
+  '\x30', '\x31', '\x1a', '\x33', '\x34', '\x35', '\x36', '\x08',
+  '\x38', '\x39', '\x3a', '\x3b', '\x04', '\x14', '\x3e', '\xff',
+  '\x41', '\xaa', '\xb0', '\xb1', '\x00', '\xb2', '\xcc', '\x4a',
+  '\xbd', '\xb4', '\x9a', '\x8a', '\xba', '\xca', '\xaf', '\xbc',
+  '\x90', '\x8f', '\xea', '\xfa', '\xbe', '\xa0', '\xb6', '\xb3',
+  '\x9d', '\xda', '\x9b', '\x8b', '\xb7', '\xb8', '\xb9', '\xab',
+  '\x64', '\x65', '\x62', '\x66', '\x7b', '\x5b', '\x9e', '\x68',
+  '\x74', '\xe0', '\x72', '\x73', '\x78', '\x75', '\x76', '\x77',
+  '\xac', '\x69', '\xed', '\xee', '\xeb', '\xef', '\x7c', '\xbf',
+  '\x80', '\xfd', '\xfe', '\xfb', '\xfc', '\xad', '\xae', '\x59',
+  '\x44', '\x45', '\x42', '\x46', '\xc0', '\xd0', '\x9c', '\x48',
+  '\x54', '\x79', '\x52', '\x53', '\x58', '\x55', '\x56', '\x57',
+  '\x8c', '\x49', '\xcd', '\xce', '\xcb', '\xcf', '\x6a', '\xe1',
+  '\x70', '\xdd', '\xde', '\xdb', '\xa1', '\x8d', '\x8e', '\xdf',
+  '\xbc', '\x5a'
+};
diff --git a/iconvdata/ibm1144.c b/iconvdata/ibm1144.c
new file mode 100644
index 0000000000..a05436a9db
--- /dev/null
+++ b/iconvdata/ibm1144.c
@@ -0,0 +1,29 @@
+/* Conversion from and to IBM1144.
+   Copyright (C) 2005 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#include <stdint.h>
+
+/* Get the conversion table.  */
+#define TABLES <ibm1144.h>
+
+#define CHARSET_NAME	"IBM1144//"
+#define HAS_HOLES	0	/* All 256 character are defined.  */
+
+#include <8bit-gap.c>
diff --git a/iconvdata/ibm1144.h b/iconvdata/ibm1144.h
new file mode 100644
index 0000000000..df39a735d8
--- /dev/null
+++ b/iconvdata/ibm1144.h
@@ -0,0 +1,132 @@
+/* Tables for conversion from and to IBM1144.
+   Copyright (C) 2005 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+static const uint32_t to_ucs4[256] =
+{
+  [0x00] = 0x0000, [0x01] = 0x0001, [0x02] = 0x0002, [0x03] = 0x0003,
+  [0x04] = 0x009c, [0x05] = 0x0009, [0x06] = 0x0086, [0x07] = 0x007f,
+  [0x08] = 0x0097, [0x09] = 0x008d, [0x0a] = 0x008e, [0x0b] = 0x000b,
+  [0x0c] = 0x000c, [0x0d] = 0x000d, [0x0e] = 0x000e, [0x0f] = 0x000f,
+  [0x10] = 0x0010, [0x11] = 0x0011, [0x12] = 0x0012, [0x13] = 0x0013,
+  [0x14] = 0x009d, [0x15] = 0x0085, [0x16] = 0x0008, [0x17] = 0x0087,
+  [0x18] = 0x0018, [0x19] = 0x0019, [0x1a] = 0x0092, [0x1b] = 0x008f,
+  [0x1c] = 0x001c, [0x1d] = 0x001d, [0x1e] = 0x001e, [0x1f] = 0x001f,
+  [0x20] = 0x0080, [0x21] = 0x0081, [0x22] = 0x0082, [0x23] = 0x0083,
+  [0x24] = 0x0084, [0x25] = 0x000a, [0x26] = 0x0017, [0x27] = 0x001b,
+  [0x28] = 0x0088, [0x29] = 0x0089, [0x2a] = 0x008a, [0x2b] = 0x008b,
+  [0x2c] = 0x008c, [0x2d] = 0x0005, [0x2e] = 0x0006, [0x2f] = 0x0007,
+  [0x30] = 0x0090, [0x31] = 0x0091, [0x32] = 0x0016, [0x33] = 0x0093,
+  [0x34] = 0x0094, [0x35] = 0x0095, [0x36] = 0x0096, [0x37] = 0x0004,
+  [0x38] = 0x0098, [0x39] = 0x0099, [0x3a] = 0x009a, [0x3b] = 0x009b,
+  [0x3c] = 0x0014, [0x3d] = 0x0015, [0x3e] = 0x009e, [0x3f] = 0x001a,
+  [0x40] = 0x0020, [0x41] = 0x00a0, [0x42] = 0x00e2, [0x43] = 0x00e4,
+  [0x44] = 0x007b, [0x45] = 0x00e1, [0x46] = 0x00e3, [0x47] = 0x00e5,
+  [0x48] = 0x005c, [0x49] = 0x00f1, [0x4a] = 0x00b0, [0x4b] = 0x002e,
+  [0x4c] = 0x003c, [0x4d] = 0x0028, [0x4e] = 0x002b, [0x4f] = 0x0021,
+  [0x50] = 0x0026, [0x51] = 0x005d, [0x52] = 0x00ea, [0x53] = 0x00eb,
+  [0x54] = 0x007d, [0x55] = 0x00ed, [0x56] = 0x00ee, [0x57] = 0x00ef,
+  [0x58] = 0x007e, [0x59] = 0x00df, [0x5a] = 0x00e9, [0x5b] = 0x0024,
+  [0x5c] = 0x002a, [0x5d] = 0x0029, [0x5e] = 0x003b, [0x5f] = 0x005e,
+  [0x60] = 0x002d, [0x61] = 0x002f, [0x62] = 0x00c2, [0x63] = 0x00c4,
+  [0x64] = 0x00c0, [0x65] = 0x00c1, [0x66] = 0x00c3, [0x67] = 0x00c5,
+  [0x68] = 0x00c7, [0x69] = 0x00d1, [0x6a] = 0x00f2, [0x6b] = 0x002c,
+  [0x6c] = 0x0025, [0x6d] = 0x005f, [0x6e] = 0x003e, [0x6f] = 0x003f,
+  [0x70] = 0x00f8, [0x71] = 0x00c9, [0x72] = 0x00ca, [0x73] = 0x00cb,
+  [0x74] = 0x00c8, [0x75] = 0x00cd, [0x76] = 0x00ce, [0x77] = 0x00cf,
+  [0x78] = 0x00cc, [0x79] = 0x00f9, [0x7a] = 0x003a, [0x7b] = 0x00a3,
+  [0x7c] = 0x00a7, [0x7d] = 0x0027, [0x7e] = 0x003d, [0x7f] = 0x0022,
+  [0x80] = 0x00d8, [0x81] = 0x0061, [0x82] = 0x0062, [0x83] = 0x0063,
+  [0x84] = 0x0064, [0x85] = 0x0065, [0x86] = 0x0066, [0x87] = 0x0067,
+  [0x88] = 0x0068, [0x89] = 0x0069, [0x8a] = 0x00ab, [0x8b] = 0x00bb,
+  [0x8c] = 0x00f0, [0x8d] = 0x00fd, [0x8e] = 0x00fe, [0x8f] = 0x00b1,
+  [0x90] = 0x005b, [0x91] = 0x006a, [0x92] = 0x006b, [0x93] = 0x006c,
+  [0x94] = 0x006d, [0x95] = 0x006e, [0x96] = 0x006f, [0x97] = 0x0070,
+  [0x98] = 0x0071, [0x99] = 0x0072, [0x9a] = 0x00aa, [0x9b] = 0x00ba,
+  [0x9c] = 0x00e6, [0x9d] = 0x00b8, [0x9e] = 0x00c6, [0x9f] = 0x20ac,
+  [0xa0] = 0x00b5, [0xa1] = 0x00ec, [0xa2] = 0x0073, [0xa3] = 0x0074,
+  [0xa4] = 0x0075, [0xa5] = 0x0076, [0xa6] = 0x0077, [0xa7] = 0x0078,
+  [0xa8] = 0x0079, [0xa9] = 0x007a, [0xaa] = 0x00a1, [0xab] = 0x00bf,
+  [0xac] = 0x00d0, [0xad] = 0x00dd, [0xae] = 0x00de, [0xaf] = 0x00ae,
+  [0xb0] = 0x00a2, [0xb1] = 0x0023, [0xb2] = 0x00a5, [0xb3] = 0x00b7,
+  [0xb4] = 0x00a9, [0xb5] = 0x0040, [0xb6] = 0x00b6, [0xb7] = 0x00bc,
+  [0xb8] = 0x00bd, [0xb9] = 0x00be, [0xba] = 0x00ac, [0xbb] = 0x007c,
+  [0xbc] = 0x00af, [0xbd] = 0x00a8, [0xbe] = 0x00b4, [0xbf] = 0x00d7,
+  [0xc0] = 0x00e0, [0xc1] = 0x0041, [0xc2] = 0x0042, [0xc3] = 0x0043,
+  [0xc4] = 0x0044, [0xc5] = 0x0045, [0xc6] = 0x0046, [0xc7] = 0x0047,
+  [0xc8] = 0x0048, [0xc9] = 0x0049, [0xca] = 0x00ad, [0xcb] = 0x00f4,
+  [0xcc] = 0x00f6, [0xcd] = 0x00a6, [0xce] = 0x00f3, [0xcf] = 0x00f5,
+  [0xd0] = 0x00e8, [0xd1] = 0x004a, [0xd2] = 0x004b, [0xd3] = 0x004c,
+  [0xd4] = 0x004d, [0xd5] = 0x004e, [0xd6] = 0x004f, [0xd7] = 0x0050,
+  [0xd8] = 0x0051, [0xd9] = 0x0052, [0xda] = 0x00b9, [0xdb] = 0x00fb,
+  [0xdc] = 0x00fc, [0xdd] = 0x0060, [0xde] = 0x00fa, [0xdf] = 0x00ff,
+  [0xe0] = 0x00e7, [0xe1] = 0x00f7, [0xe2] = 0x0053, [0xe3] = 0x0054,
+  [0xe4] = 0x0055, [0xe5] = 0x0056, [0xe6] = 0x0057, [0xe7] = 0x0058,
+  [0xe8] = 0x0059, [0xe9] = 0x005a, [0xea] = 0x00b2, [0xeb] = 0x00d4,
+  [0xec] = 0x00d6, [0xed] = 0x00d2, [0xee] = 0x00d3, [0xef] = 0x00d5,
+  [0xf0] = 0x0030, [0xf1] = 0x0031, [0xf2] = 0x0032, [0xf3] = 0x0033,
+  [0xf4] = 0x0034, [0xf5] = 0x0035, [0xf6] = 0x0036, [0xf7] = 0x0037,
+  [0xf8] = 0x0038, [0xf9] = 0x0039, [0xfa] = 0x00b3, [0xfb] = 0x00db,
+  [0xfc] = 0x00dc, [0xfd] = 0x00d9, [0xfe] = 0x00da, [0xff] = 0x009f
+};
+
+static const struct gap from_idx[] =
+{
+  { start: 0x0000, end: 0x00ff, idx:     0 },
+  { start: 0x203e, end: 0x203e, idx: -7998 },
+  { start: 0x20ac, end: 0x20ac, idx: -8107 },
+  { start: 0xffff, end: 0xffff, idx:     0 }
+};
+
+static const char from_ucs4[] =
+{
+  '\x00', '\x01', '\x02', '\x03', '\x37', '\x2d', '\x2e', '\x2f',
+  '\x16', '\x05', '\x25', '\x0b', '\x0c', '\x0d', '\x0e', '\x0f',
+  '\x10', '\x11', '\x12', '\x13', '\x3c', '\x3d', '\x32', '\x26',
+  '\x18', '\x19', '\x3f', '\x27', '\x1c', '\x1d', '\x1e', '\x1f',
+  '\x40', '\x4f', '\x7f', '\xb1', '\x5b', '\x6c', '\x50', '\x7d',
+  '\x4d', '\x5d', '\x5c', '\x4e', '\x6b', '\x60', '\x4b', '\x61',
+  '\xf0', '\xf1', '\xf2', '\xf3', '\xf4', '\xf5', '\xf6', '\xf7',
+  '\xf8', '\xf9', '\x7a', '\x5e', '\x4c', '\x7e', '\x6e', '\x6f',
+  '\xb5', '\xc1', '\xc2', '\xc3', '\xc4', '\xc5', '\xc6', '\xc7',
+  '\xc8', '\xc9', '\xd1', '\xd2', '\xd3', '\xd4', '\xd5', '\xd6',
+  '\xd7', '\xd8', '\xd9', '\xe2', '\xe3', '\xe4', '\xe5', '\xe6',
+  '\xe7', '\xe8', '\xe9', '\x90', '\x48', '\x51', '\x5f', '\x6d',
+  '\xdd', '\x81', '\x82', '\x83', '\x84', '\x85', '\x86', '\x87',
+  '\x88', '\x89', '\x91', '\x92', '\x93', '\x94', '\x95', '\x96',
+  '\x97', '\x98', '\x99', '\xa2', '\xa3', '\xa4', '\xa5', '\xa6',
+  '\xa7', '\xa8', '\xa9', '\x44', '\xbb', '\x54', '\x58', '\x07',
+  '\x20', '\x21', '\x22', '\x23', '\x24', '\x15', '\x06', '\x17',
+  '\x28', '\x29', '\x2a', '\x2b', '\x2c', '\x09', '\x0a', '\x1b',
+  '\x30', '\x31', '\x1a', '\x33', '\x34', '\x35', '\x36', '\x08',
+  '\x38', '\x39', '\x3a', '\x3b', '\x04', '\x14', '\x3e', '\xff',
+  '\x41', '\xaa', '\xb0', '\x7b', '\x00', '\xb2', '\xcd', '\x7c',
+  '\xbd', '\xb4', '\x9a', '\x8a', '\xba', '\xca', '\xaf', '\xbc',
+  '\x4a', '\x8f', '\xea', '\xfa', '\xbe', '\xa0', '\xb6', '\xb3',
+  '\x9d', '\xda', '\x9b', '\x8b', '\xb7', '\xb8', '\xb9', '\xab',
+  '\x64', '\x65', '\x62', '\x66', '\x63', '\x67', '\x9e', '\x68',
+  '\x74', '\x71', '\x72', '\x73', '\x78', '\x75', '\x76', '\x77',
+  '\xac', '\x69', '\xed', '\xee', '\xeb', '\xef', '\xec', '\xbf',
+  '\x80', '\xfd', '\xfe', '\xfb', '\xfc', '\xad', '\xae', '\x59',
+  '\xc0', '\x45', '\x42', '\x46', '\x43', '\x47', '\x9c', '\xe0',
+  '\xd0', '\x5a', '\x52', '\x53', '\xa1', '\x55', '\x56', '\x57',
+  '\x8c', '\x49', '\x6a', '\xce', '\xcb', '\xcf', '\xcc', '\xe1',
+  '\x70', '\x79', '\xde', '\xdb', '\xdc', '\x8d', '\x8e', '\xdf',
+  '\xbc', '\x9f'
+};
diff --git a/iconvdata/ibm1145.c b/iconvdata/ibm1145.c
new file mode 100644
index 0000000000..b3af001366
--- /dev/null
+++ b/iconvdata/ibm1145.c
@@ -0,0 +1,29 @@
+/* Conversion from and to IBM1145.
+   Copyright (C) 2005 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#include <stdint.h>
+
+/* Get the conversion table.  */
+#define TABLES <ibm1145.h>
+
+#define CHARSET_NAME	"IBM1145//"
+#define HAS_HOLES	0	/* All 256 character are defined.  */
+
+#include <8bit-gap.c>
diff --git a/iconvdata/ibm1145.h b/iconvdata/ibm1145.h
new file mode 100644
index 0000000000..fabc28f9f5
--- /dev/null
+++ b/iconvdata/ibm1145.h
@@ -0,0 +1,132 @@
+/* Tables for conversion from and to IBM1145.
+   Copyright (C) 2005 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+static const uint32_t to_ucs4[256] =
+{
+  [0x00] = 0x0000, [0x01] = 0x0001, [0x02] = 0x0002, [0x03] = 0x0003,
+  [0x04] = 0x009c, [0x05] = 0x0009, [0x06] = 0x0086, [0x07] = 0x007f,
+  [0x08] = 0x0097, [0x09] = 0x008d, [0x0a] = 0x008e, [0x0b] = 0x000b,
+  [0x0c] = 0x000c, [0x0d] = 0x000d, [0x0e] = 0x000e, [0x0f] = 0x000f,
+  [0x10] = 0x0010, [0x11] = 0x0011, [0x12] = 0x0012, [0x13] = 0x0013,
+  [0x14] = 0x009d, [0x15] = 0x0085, [0x16] = 0x0008, [0x17] = 0x0087,
+  [0x18] = 0x0018, [0x19] = 0x0019, [0x1a] = 0x0092, [0x1b] = 0x008f,
+  [0x1c] = 0x001c, [0x1d] = 0x001d, [0x1e] = 0x001e, [0x1f] = 0x001f,
+  [0x20] = 0x0080, [0x21] = 0x0081, [0x22] = 0x0082, [0x23] = 0x0083,
+  [0x24] = 0x0084, [0x25] = 0x000a, [0x26] = 0x0017, [0x27] = 0x001b,
+  [0x28] = 0x0088, [0x29] = 0x0089, [0x2a] = 0x008a, [0x2b] = 0x008b,
+  [0x2c] = 0x008c, [0x2d] = 0x0005, [0x2e] = 0x0006, [0x2f] = 0x0007,
+  [0x30] = 0x0090, [0x31] = 0x0091, [0x32] = 0x0016, [0x33] = 0x0093,
+  [0x34] = 0x0094, [0x35] = 0x0095, [0x36] = 0x0096, [0x37] = 0x0004,
+  [0x38] = 0x0098, [0x39] = 0x0099, [0x3a] = 0x009a, [0x3b] = 0x009b,
+  [0x3c] = 0x0014, [0x3d] = 0x0015, [0x3e] = 0x009e, [0x3f] = 0x001a,
+  [0x40] = 0x0020, [0x41] = 0x00a0, [0x42] = 0x00e2, [0x43] = 0x00e4,
+  [0x44] = 0x00e0, [0x45] = 0x00e1, [0x46] = 0x00e3, [0x47] = 0x00e5,
+  [0x48] = 0x00e7, [0x49] = 0x00a6, [0x4a] = 0x005b, [0x4b] = 0x002e,
+  [0x4c] = 0x003c, [0x4d] = 0x0028, [0x4e] = 0x002b, [0x4f] = 0x007c,
+  [0x50] = 0x0026, [0x51] = 0x00e9, [0x52] = 0x00ea, [0x53] = 0x00eb,
+  [0x54] = 0x00e8, [0x55] = 0x00ed, [0x56] = 0x00ee, [0x57] = 0x00ef,
+  [0x58] = 0x00ec, [0x59] = 0x00df, [0x5a] = 0x005d, [0x5b] = 0x0024,
+  [0x5c] = 0x002a, [0x5d] = 0x0029, [0x5e] = 0x003b, [0x5f] = 0x00ac,
+  [0x60] = 0x002d, [0x61] = 0x002f, [0x62] = 0x00c2, [0x63] = 0x00c4,
+  [0x64] = 0x00c0, [0x65] = 0x00c1, [0x66] = 0x00c3, [0x67] = 0x00c5,
+  [0x68] = 0x00c7, [0x69] = 0x0023, [0x6a] = 0x00f1, [0x6b] = 0x002c,
+  [0x6c] = 0x0025, [0x6d] = 0x005f, [0x6e] = 0x003e, [0x6f] = 0x003f,
+  [0x70] = 0x00f8, [0x71] = 0x00c9, [0x72] = 0x00ca, [0x73] = 0x00cb,
+  [0x74] = 0x00c8, [0x75] = 0x00cd, [0x76] = 0x00ce, [0x77] = 0x00cf,
+  [0x78] = 0x00cc, [0x79] = 0x0060, [0x7a] = 0x003a, [0x7b] = 0x00d1,
+  [0x7c] = 0x0040, [0x7d] = 0x0027, [0x7e] = 0x003d, [0x7f] = 0x0022,
+  [0x80] = 0x00d8, [0x81] = 0x0061, [0x82] = 0x0062, [0x83] = 0x0063,
+  [0x84] = 0x0064, [0x85] = 0x0065, [0x86] = 0x0066, [0x87] = 0x0067,
+  [0x88] = 0x0068, [0x89] = 0x0069, [0x8a] = 0x00ab, [0x8b] = 0x00bb,
+  [0x8c] = 0x00f0, [0x8d] = 0x00fd, [0x8e] = 0x00fe, [0x8f] = 0x00b1,
+  [0x90] = 0x00b0, [0x91] = 0x006a, [0x92] = 0x006b, [0x93] = 0x006c,
+  [0x94] = 0x006d, [0x95] = 0x006e, [0x96] = 0x006f, [0x97] = 0x0070,
+  [0x98] = 0x0071, [0x99] = 0x0072, [0x9a] = 0x00aa, [0x9b] = 0x00ba,
+  [0x9c] = 0x00e6, [0x9d] = 0x00b8, [0x9e] = 0x00c6, [0x9f] = 0x20ac,
+  [0xa0] = 0x00b5, [0xa1] = 0x00a8, [0xa2] = 0x0073, [0xa3] = 0x0074,
+  [0xa4] = 0x0075, [0xa5] = 0x0076, [0xa6] = 0x0077, [0xa7] = 0x0078,
+  [0xa8] = 0x0079, [0xa9] = 0x007a, [0xaa] = 0x00a1, [0xab] = 0x00bf,
+  [0xac] = 0x00d0, [0xad] = 0x00dd, [0xae] = 0x00de, [0xaf] = 0x00ae,
+  [0xb0] = 0x00a2, [0xb1] = 0x00a3, [0xb2] = 0x00a5, [0xb3] = 0x00b7,
+  [0xb4] = 0x00a9, [0xb5] = 0x00a7, [0xb6] = 0x00b6, [0xb7] = 0x00bc,
+  [0xb8] = 0x00bd, [0xb9] = 0x00be, [0xba] = 0x005e, [0xbb] = 0x0021,
+  [0xbc] = 0x00af, [0xbd] = 0x007e, [0xbe] = 0x00b4, [0xbf] = 0x00d7,
+  [0xc0] = 0x007b, [0xc1] = 0x0041, [0xc2] = 0x0042, [0xc3] = 0x0043,
+  [0xc4] = 0x0044, [0xc5] = 0x0045, [0xc6] = 0x0046, [0xc7] = 0x0047,
+  [0xc8] = 0x0048, [0xc9] = 0x0049, [0xca] = 0x00ad, [0xcb] = 0x00f4,
+  [0xcc] = 0x00f6, [0xcd] = 0x00f2, [0xce] = 0x00f3, [0xcf] = 0x00f5,
+  [0xd0] = 0x007d, [0xd1] = 0x004a, [0xd2] = 0x004b, [0xd3] = 0x004c,
+  [0xd4] = 0x004d, [0xd5] = 0x004e, [0xd6] = 0x004f, [0xd7] = 0x0050,
+  [0xd8] = 0x0051, [0xd9] = 0x0052, [0xda] = 0x00b9, [0xdb] = 0x00fb,
+  [0xdc] = 0x00fc, [0xdd] = 0x00f9, [0xde] = 0x00fa, [0xdf] = 0x00ff,
+  [0xe0] = 0x005c, [0xe1] = 0x00f7, [0xe2] = 0x0053, [0xe3] = 0x0054,
+  [0xe4] = 0x0055, [0xe5] = 0x0056, [0xe6] = 0x0057, [0xe7] = 0x0058,
+  [0xe8] = 0x0059, [0xe9] = 0x005a, [0xea] = 0x00b2, [0xeb] = 0x00d4,
+  [0xec] = 0x00d6, [0xed] = 0x00d2, [0xee] = 0x00d3, [0xef] = 0x00d5,
+  [0xf0] = 0x0030, [0xf1] = 0x0031, [0xf2] = 0x0032, [0xf3] = 0x0033,
+  [0xf4] = 0x0034, [0xf5] = 0x0035, [0xf6] = 0x0036, [0xf7] = 0x0037,
+  [0xf8] = 0x0038, [0xf9] = 0x0039, [0xfa] = 0x00b3, [0xfb] = 0x00db,
+  [0xfc] = 0x00dc, [0xfd] = 0x00d9, [0xfe] = 0x00da, [0xff] = 0x009f
+};
+
+static const struct gap from_idx[] =
+{
+  { start: 0x0000, end: 0x00ff, idx:     0 },
+  { start: 0x203e, end: 0x203e, idx: -7998 },
+  { start: 0x20ac, end: 0x20ac, idx: -8107 },
+  { start: 0xffff, end: 0xffff, idx:     0 }
+};
+
+static const char from_ucs4[] =
+{
+  '\x00', '\x01', '\x02', '\x03', '\x37', '\x2d', '\x2e', '\x2f',
+  '\x16', '\x05', '\x25', '\x0b', '\x0c', '\x0d', '\x0e', '\x0f',
+  '\x10', '\x11', '\x12', '\x13', '\x3c', '\x3d', '\x32', '\x26',
+  '\x18', '\x19', '\x3f', '\x27', '\x1c', '\x1d', '\x1e', '\x1f',
+  '\x40', '\xbb', '\x7f', '\x69', '\x5b', '\x6c', '\x50', '\x7d',
+  '\x4d', '\x5d', '\x5c', '\x4e', '\x6b', '\x60', '\x4b', '\x61',
+  '\xf0', '\xf1', '\xf2', '\xf3', '\xf4', '\xf5', '\xf6', '\xf7',
+  '\xf8', '\xf9', '\x7a', '\x5e', '\x4c', '\x7e', '\x6e', '\x6f',
+  '\x7c', '\xc1', '\xc2', '\xc3', '\xc4', '\xc5', '\xc6', '\xc7',
+  '\xc8', '\xc9', '\xd1', '\xd2', '\xd3', '\xd4', '\xd5', '\xd6',
+  '\xd7', '\xd8', '\xd9', '\xe2', '\xe3', '\xe4', '\xe5', '\xe6',
+  '\xe7', '\xe8', '\xe9', '\x4a', '\xe0', '\x5a', '\xba', '\x6d',
+  '\x79', '\x81', '\x82', '\x83', '\x84', '\x85', '\x86', '\x87',
+  '\x88', '\x89', '\x91', '\x92', '\x93', '\x94', '\x95', '\x96',
+  '\x97', '\x98', '\x99', '\xa2', '\xa3', '\xa4', '\xa5', '\xa6',
+  '\xa7', '\xa8', '\xa9', '\xc0', '\x4f', '\xd0', '\xbd', '\x07',
+  '\x20', '\x21', '\x22', '\x23', '\x24', '\x15', '\x06', '\x17',
+  '\x28', '\x29', '\x2a', '\x2b', '\x2c', '\x09', '\x0a', '\x1b',
+  '\x30', '\x31', '\x1a', '\x33', '\x34', '\x35', '\x36', '\x08',
+  '\x38', '\x39', '\x3a', '\x3b', '\x04', '\x14', '\x3e', '\xff',
+  '\x41', '\xaa', '\xb0', '\xb1', '\x00', '\xb2', '\x49', '\xb5',
+  '\xa1', '\xb4', '\x9a', '\x8a', '\x5f', '\xca', '\xaf', '\xbc',
+  '\x90', '\x8f', '\xea', '\xfa', '\xbe', '\xa0', '\xb6', '\xb3',
+  '\x9d', '\xda', '\x9b', '\x8b', '\xb7', '\xb8', '\xb9', '\xab',
+  '\x64', '\x65', '\x62', '\x66', '\x63', '\x67', '\x9e', '\x68',
+  '\x74', '\x71', '\x72', '\x73', '\x78', '\x75', '\x76', '\x77',
+  '\xac', '\x7b', '\xed', '\xee', '\xeb', '\xef', '\xec', '\xbf',
+  '\x80', '\xfd', '\xfe', '\xfb', '\xfc', '\xad', '\xae', '\x59',
+  '\x44', '\x45', '\x42', '\x46', '\x43', '\x47', '\x9c', '\x48',
+  '\x54', '\x51', '\x52', '\x53', '\x58', '\x55', '\x56', '\x57',
+  '\x8c', '\x6a', '\xcd', '\xce', '\xcb', '\xcf', '\xcc', '\xe1',
+  '\x70', '\xdd', '\xde', '\xdb', '\xdc', '\x8d', '\x8e', '\xdf',
+  '\xbc', '\x9f'
+};
diff --git a/iconvdata/ibm1146.c b/iconvdata/ibm1146.c
new file mode 100644
index 0000000000..72e6e6903d
--- /dev/null
+++ b/iconvdata/ibm1146.c
@@ -0,0 +1,29 @@
+/* Conversion from and to IBM1146.
+   Copyright (C) 2005 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#include <stdint.h>
+
+/* Get the conversion table.  */
+#define TABLES <ibm1146.h>
+
+#define CHARSET_NAME	"IBM1146//"
+#define HAS_HOLES	0	/* All 256 character are defined.  */
+
+#include <8bit-gap.c>
diff --git a/iconvdata/ibm1146.h b/iconvdata/ibm1146.h
new file mode 100644
index 0000000000..3b58e9364e
--- /dev/null
+++ b/iconvdata/ibm1146.h
@@ -0,0 +1,132 @@
+/* Tables for conversion from and to IBM1146.
+   Copyright (C) 2005 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+static const uint32_t to_ucs4[256] =
+{
+  [0x00] = 0x0000, [0x01] = 0x0001, [0x02] = 0x0002, [0x03] = 0x0003,
+  [0x04] = 0x009c, [0x05] = 0x0009, [0x06] = 0x0086, [0x07] = 0x007f,
+  [0x08] = 0x0097, [0x09] = 0x008d, [0x0a] = 0x008e, [0x0b] = 0x000b,
+  [0x0c] = 0x000c, [0x0d] = 0x000d, [0x0e] = 0x000e, [0x0f] = 0x000f,
+  [0x10] = 0x0010, [0x11] = 0x0011, [0x12] = 0x0012, [0x13] = 0x0013,
+  [0x14] = 0x009d, [0x15] = 0x0085, [0x16] = 0x0008, [0x17] = 0x0087,
+  [0x18] = 0x0018, [0x19] = 0x0019, [0x1a] = 0x0092, [0x1b] = 0x008f,
+  [0x1c] = 0x001c, [0x1d] = 0x001d, [0x1e] = 0x001e, [0x1f] = 0x001f,
+  [0x20] = 0x0080, [0x21] = 0x0081, [0x22] = 0x0082, [0x23] = 0x0083,
+  [0x24] = 0x0084, [0x25] = 0x000a, [0x26] = 0x0017, [0x27] = 0x001b,
+  [0x28] = 0x0088, [0x29] = 0x0089, [0x2a] = 0x008a, [0x2b] = 0x008b,
+  [0x2c] = 0x008c, [0x2d] = 0x0005, [0x2e] = 0x0006, [0x2f] = 0x0007,
+  [0x30] = 0x0090, [0x31] = 0x0091, [0x32] = 0x0016, [0x33] = 0x0093,
+  [0x34] = 0x0094, [0x35] = 0x0095, [0x36] = 0x0096, [0x37] = 0x0004,
+  [0x38] = 0x0098, [0x39] = 0x0099, [0x3a] = 0x009a, [0x3b] = 0x009b,
+  [0x3c] = 0x0014, [0x3d] = 0x0015, [0x3e] = 0x009e, [0x3f] = 0x001a,
+  [0x40] = 0x0020, [0x41] = 0x00a0, [0x42] = 0x00e2, [0x43] = 0x00e4,
+  [0x44] = 0x00e0, [0x45] = 0x00e1, [0x46] = 0x00e3, [0x47] = 0x00e5,
+  [0x48] = 0x00e7, [0x49] = 0x00f1, [0x4a] = 0x0024, [0x4b] = 0x002e,
+  [0x4c] = 0x003c, [0x4d] = 0x0028, [0x4e] = 0x002b, [0x4f] = 0x007c,
+  [0x50] = 0x0026, [0x51] = 0x00e9, [0x52] = 0x00ea, [0x53] = 0x00eb,
+  [0x54] = 0x00e8, [0x55] = 0x00ed, [0x56] = 0x00ee, [0x57] = 0x00ef,
+  [0x58] = 0x00ec, [0x59] = 0x00df, [0x5a] = 0x0021, [0x5b] = 0x00a3,
+  [0x5c] = 0x002a, [0x5d] = 0x0029, [0x5e] = 0x003b, [0x5f] = 0x00ac,
+  [0x60] = 0x002d, [0x61] = 0x002f, [0x62] = 0x00c2, [0x63] = 0x00c4,
+  [0x64] = 0x00c0, [0x65] = 0x00c1, [0x66] = 0x00c3, [0x67] = 0x00c5,
+  [0x68] = 0x00c7, [0x69] = 0x00d1, [0x6a] = 0x00a6, [0x6b] = 0x002c,
+  [0x6c] = 0x0025, [0x6d] = 0x005f, [0x6e] = 0x003e, [0x6f] = 0x003f,
+  [0x70] = 0x00f8, [0x71] = 0x00c9, [0x72] = 0x00ca, [0x73] = 0x00cb,
+  [0x74] = 0x00c8, [0x75] = 0x00cd, [0x76] = 0x00ce, [0x77] = 0x00cf,
+  [0x78] = 0x00cc, [0x79] = 0x0060, [0x7a] = 0x003a, [0x7b] = 0x0023,
+  [0x7c] = 0x0040, [0x7d] = 0x0027, [0x7e] = 0x003d, [0x7f] = 0x0022,
+  [0x80] = 0x00d8, [0x81] = 0x0061, [0x82] = 0x0062, [0x83] = 0x0063,
+  [0x84] = 0x0064, [0x85] = 0x0065, [0x86] = 0x0066, [0x87] = 0x0067,
+  [0x88] = 0x0068, [0x89] = 0x0069, [0x8a] = 0x00ab, [0x8b] = 0x00bb,
+  [0x8c] = 0x00f0, [0x8d] = 0x00fd, [0x8e] = 0x00fe, [0x8f] = 0x00b1,
+  [0x90] = 0x00b0, [0x91] = 0x006a, [0x92] = 0x006b, [0x93] = 0x006c,
+  [0x94] = 0x006d, [0x95] = 0x006e, [0x96] = 0x006f, [0x97] = 0x0070,
+  [0x98] = 0x0071, [0x99] = 0x0072, [0x9a] = 0x00aa, [0x9b] = 0x00ba,
+  [0x9c] = 0x00e6, [0x9d] = 0x00b8, [0x9e] = 0x00c6, [0x9f] = 0x20ac,
+  [0xa0] = 0x00b5, [0xa1] = 0x00af, [0xa2] = 0x0073, [0xa3] = 0x0074,
+  [0xa4] = 0x0075, [0xa5] = 0x0076, [0xa6] = 0x0077, [0xa7] = 0x0078,
+  [0xa8] = 0x0079, [0xa9] = 0x007a, [0xaa] = 0x00a1, [0xab] = 0x00bf,
+  [0xac] = 0x00d0, [0xad] = 0x00dd, [0xae] = 0x00de, [0xaf] = 0x00ae,
+  [0xb0] = 0x00a2, [0xb1] = 0x005b, [0xb2] = 0x00a5, [0xb3] = 0x00b7,
+  [0xb4] = 0x00a9, [0xb5] = 0x00a7, [0xb6] = 0x00b6, [0xb7] = 0x00bc,
+  [0xb8] = 0x00bd, [0xb9] = 0x00be, [0xba] = 0x005e, [0xbb] = 0x005d,
+  [0xbc] = 0x007e, [0xbd] = 0x00a8, [0xbe] = 0x00b4, [0xbf] = 0x00d7,
+  [0xc0] = 0x007b, [0xc1] = 0x0041, [0xc2] = 0x0042, [0xc3] = 0x0043,
+  [0xc4] = 0x0044, [0xc5] = 0x0045, [0xc6] = 0x0046, [0xc7] = 0x0047,
+  [0xc8] = 0x0048, [0xc9] = 0x0049, [0xca] = 0x00ad, [0xcb] = 0x00f4,
+  [0xcc] = 0x00f6, [0xcd] = 0x00f2, [0xce] = 0x00f3, [0xcf] = 0x00f5,
+  [0xd0] = 0x007d, [0xd1] = 0x004a, [0xd2] = 0x004b, [0xd3] = 0x004c,
+  [0xd4] = 0x004d, [0xd5] = 0x004e, [0xd6] = 0x004f, [0xd7] = 0x0050,
+  [0xd8] = 0x0051, [0xd9] = 0x0052, [0xda] = 0x00b9, [0xdb] = 0x00fb,
+  [0xdc] = 0x00fc, [0xdd] = 0x00f9, [0xde] = 0x00fa, [0xdf] = 0x00ff,
+  [0xe0] = 0x005c, [0xe1] = 0x00f7, [0xe2] = 0x0053, [0xe3] = 0x0054,
+  [0xe4] = 0x0055, [0xe5] = 0x0056, [0xe6] = 0x0057, [0xe7] = 0x0058,
+  [0xe8] = 0x0059, [0xe9] = 0x005a, [0xea] = 0x00b2, [0xeb] = 0x00d4,
+  [0xec] = 0x00d6, [0xed] = 0x00d2, [0xee] = 0x00d3, [0xef] = 0x00d5,
+  [0xf0] = 0x0030, [0xf1] = 0x0031, [0xf2] = 0x0032, [0xf3] = 0x0033,
+  [0xf4] = 0x0034, [0xf5] = 0x0035, [0xf6] = 0x0036, [0xf7] = 0x0037,
+  [0xf8] = 0x0038, [0xf9] = 0x0039, [0xfa] = 0x00b3, [0xfb] = 0x00db,
+  [0xfc] = 0x00dc, [0xfd] = 0x00d9, [0xfe] = 0x00da, [0xff] = 0x009f
+};
+
+static const struct gap from_idx[] =
+{
+  { start: 0x0000, end: 0x00ff, idx:     0 },
+  { start: 0x203e, end: 0x203e, idx: -7998 },
+  { start: 0x20ac, end: 0x20ac, idx: -8107 },
+  { start: 0xffff, end: 0xffff, idx:     0 }
+};
+
+static const char from_ucs4[] =
+{
+  '\x00', '\x01', '\x02', '\x03', '\x37', '\x2d', '\x2e', '\x2f',
+  '\x16', '\x05', '\x25', '\x0b', '\x0c', '\x0d', '\x0e', '\x0f',
+  '\x10', '\x11', '\x12', '\x13', '\x3c', '\x3d', '\x32', '\x26',
+  '\x18', '\x19', '\x3f', '\x27', '\x1c', '\x1d', '\x1e', '\x1f',
+  '\x40', '\x5a', '\x7f', '\x7b', '\x4a', '\x6c', '\x50', '\x7d',
+  '\x4d', '\x5d', '\x5c', '\x4e', '\x6b', '\x60', '\x4b', '\x61',
+  '\xf0', '\xf1', '\xf2', '\xf3', '\xf4', '\xf5', '\xf6', '\xf7',
+  '\xf8', '\xf9', '\x7a', '\x5e', '\x4c', '\x7e', '\x6e', '\x6f',
+  '\x7c', '\xc1', '\xc2', '\xc3', '\xc4', '\xc5', '\xc6', '\xc7',
+  '\xc8', '\xc9', '\xd1', '\xd2', '\xd3', '\xd4', '\xd5', '\xd6',
+  '\xd7', '\xd8', '\xd9', '\xe2', '\xe3', '\xe4', '\xe5', '\xe6',
+  '\xe7', '\xe8', '\xe9', '\xb1', '\xe0', '\xbb', '\xba', '\x6d',
+  '\x79', '\x81', '\x82', '\x83', '\x84', '\x85', '\x86', '\x87',
+  '\x88', '\x89', '\x91', '\x92', '\x93', '\x94', '\x95', '\x96',
+  '\x97', '\x98', '\x99', '\xa2', '\xa3', '\xa4', '\xa5', '\xa6',
+  '\xa7', '\xa8', '\xa9', '\xc0', '\x4f', '\xd0', '\xbc', '\x07',
+  '\x20', '\x21', '\x22', '\x23', '\x24', '\x15', '\x06', '\x17',
+  '\x28', '\x29', '\x2a', '\x2b', '\x2c', '\x09', '\x0a', '\x1b',
+  '\x30', '\x31', '\x1a', '\x33', '\x34', '\x35', '\x36', '\x08',
+  '\x38', '\x39', '\x3a', '\x3b', '\x04', '\x14', '\x3e', '\xff',
+  '\x41', '\xaa', '\xb0', '\x5b', '\x00', '\xb2', '\x6a', '\xb5',
+  '\xbd', '\xb4', '\x9a', '\x8a', '\x5f', '\xca', '\xaf', '\xa1',
+  '\x90', '\x8f', '\xea', '\xfa', '\xbe', '\xa0', '\xb6', '\xb3',
+  '\x9d', '\xda', '\x9b', '\x8b', '\xb7', '\xb8', '\xb9', '\xab',
+  '\x64', '\x65', '\x62', '\x66', '\x63', '\x67', '\x9e', '\x68',
+  '\x74', '\x71', '\x72', '\x73', '\x78', '\x75', '\x76', '\x77',
+  '\xac', '\x69', '\xed', '\xee', '\xeb', '\xef', '\xec', '\xbf',
+  '\x80', '\xfd', '\xfe', '\xfb', '\xfc', '\xad', '\xae', '\x59',
+  '\x44', '\x45', '\x42', '\x46', '\x43', '\x47', '\x9c', '\x48',
+  '\x54', '\x51', '\x52', '\x53', '\x58', '\x55', '\x56', '\x57',
+  '\x8c', '\x49', '\xcd', '\xce', '\xcb', '\xcf', '\xcc', '\xe1',
+  '\x70', '\xdd', '\xde', '\xdb', '\xdc', '\x8d', '\x8e', '\xdf',
+  '\xa1', '\x9f'
+};
diff --git a/iconvdata/ibm1147.c b/iconvdata/ibm1147.c
new file mode 100644
index 0000000000..5c47102dd7
--- /dev/null
+++ b/iconvdata/ibm1147.c
@@ -0,0 +1,29 @@
+/* Conversion from and to IBM1147.
+   Copyright (C) 2005 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#include <stdint.h>
+
+/* Get the conversion table.  */
+#define TABLES <ibm1147.h>
+
+#define CHARSET_NAME	"IBM1147//"
+#define HAS_HOLES	0	/* All 256 character are defined.  */
+
+#include <8bit-gap.c>
diff --git a/iconvdata/ibm1147.h b/iconvdata/ibm1147.h
new file mode 100644
index 0000000000..3dbb3fedaa
--- /dev/null
+++ b/iconvdata/ibm1147.h
@@ -0,0 +1,132 @@
+/* Tables for conversion from and to IBM1147.
+   Copyright (C) 2005 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+static const uint32_t to_ucs4[256] =
+{
+  [0x00] = 0x0000, [0x01] = 0x0001, [0x02] = 0x0002, [0x03] = 0x0003,
+  [0x04] = 0x009c, [0x05] = 0x0009, [0x06] = 0x0086, [0x07] = 0x007f,
+  [0x08] = 0x0097, [0x09] = 0x008d, [0x0a] = 0x008e, [0x0b] = 0x000b,
+  [0x0c] = 0x000c, [0x0d] = 0x000d, [0x0e] = 0x000e, [0x0f] = 0x000f,
+  [0x10] = 0x0010, [0x11] = 0x0011, [0x12] = 0x0012, [0x13] = 0x0013,
+  [0x14] = 0x009d, [0x15] = 0x0085, [0x16] = 0x0008, [0x17] = 0x0087,
+  [0x18] = 0x0018, [0x19] = 0x0019, [0x1a] = 0x0092, [0x1b] = 0x008f,
+  [0x1c] = 0x001c, [0x1d] = 0x001d, [0x1e] = 0x001e, [0x1f] = 0x001f,
+  [0x20] = 0x0080, [0x21] = 0x0081, [0x22] = 0x0082, [0x23] = 0x0083,
+  [0x24] = 0x0084, [0x25] = 0x000a, [0x26] = 0x0017, [0x27] = 0x001b,
+  [0x28] = 0x0088, [0x29] = 0x0089, [0x2a] = 0x008a, [0x2b] = 0x008b,
+  [0x2c] = 0x008c, [0x2d] = 0x0005, [0x2e] = 0x0006, [0x2f] = 0x0007,
+  [0x30] = 0x0090, [0x31] = 0x0091, [0x32] = 0x0016, [0x33] = 0x0093,
+  [0x34] = 0x0094, [0x35] = 0x0095, [0x36] = 0x0096, [0x37] = 0x0004,
+  [0x38] = 0x0098, [0x39] = 0x0099, [0x3a] = 0x009a, [0x3b] = 0x009b,
+  [0x3c] = 0x0014, [0x3d] = 0x0015, [0x3e] = 0x009e, [0x3f] = 0x001a,
+  [0x40] = 0x0020, [0x41] = 0x00a0, [0x42] = 0x00e2, [0x43] = 0x00e4,
+  [0x44] = 0x0040, [0x45] = 0x00e1, [0x46] = 0x00e3, [0x47] = 0x00e5,
+  [0x48] = 0x005c, [0x49] = 0x00f1, [0x4a] = 0x00b0, [0x4b] = 0x002e,
+  [0x4c] = 0x003c, [0x4d] = 0x0028, [0x4e] = 0x002b, [0x4f] = 0x0021,
+  [0x50] = 0x0026, [0x51] = 0x007b, [0x52] = 0x00ea, [0x53] = 0x00eb,
+  [0x54] = 0x007d, [0x55] = 0x00ed, [0x56] = 0x00ee, [0x57] = 0x00ef,
+  [0x58] = 0x00ec, [0x59] = 0x00df, [0x5a] = 0x00a7, [0x5b] = 0x0024,
+  [0x5c] = 0x002a, [0x5d] = 0x0029, [0x5e] = 0x003b, [0x5f] = 0x005e,
+  [0x60] = 0x002d, [0x61] = 0x002f, [0x62] = 0x00c2, [0x63] = 0x00c4,
+  [0x64] = 0x00c0, [0x65] = 0x00c1, [0x66] = 0x00c3, [0x67] = 0x00c5,
+  [0x68] = 0x00c7, [0x69] = 0x00d1, [0x6a] = 0x00f9, [0x6b] = 0x002c,
+  [0x6c] = 0x0025, [0x6d] = 0x005f, [0x6e] = 0x003e, [0x6f] = 0x003f,
+  [0x70] = 0x00f8, [0x71] = 0x00c9, [0x72] = 0x00ca, [0x73] = 0x00cb,
+  [0x74] = 0x00c8, [0x75] = 0x00cd, [0x76] = 0x00ce, [0x77] = 0x00cf,
+  [0x78] = 0x00cc, [0x79] = 0x00b5, [0x7a] = 0x003a, [0x7b] = 0x00a3,
+  [0x7c] = 0x00e0, [0x7d] = 0x0027, [0x7e] = 0x003d, [0x7f] = 0x0022,
+  [0x80] = 0x00d8, [0x81] = 0x0061, [0x82] = 0x0062, [0x83] = 0x0063,
+  [0x84] = 0x0064, [0x85] = 0x0065, [0x86] = 0x0066, [0x87] = 0x0067,
+  [0x88] = 0x0068, [0x89] = 0x0069, [0x8a] = 0x00ab, [0x8b] = 0x00bb,
+  [0x8c] = 0x00f0, [0x8d] = 0x00fd, [0x8e] = 0x00fe, [0x8f] = 0x00b1,
+  [0x90] = 0x005b, [0x91] = 0x006a, [0x92] = 0x006b, [0x93] = 0x006c,
+  [0x94] = 0x006d, [0x95] = 0x006e, [0x96] = 0x006f, [0x97] = 0x0070,
+  [0x98] = 0x0071, [0x99] = 0x0072, [0x9a] = 0x00aa, [0x9b] = 0x00ba,
+  [0x9c] = 0x00e6, [0x9d] = 0x00b8, [0x9e] = 0x00c6, [0x9f] = 0x20ac,
+  [0xa0] = 0x0060, [0xa1] = 0x00a8, [0xa2] = 0x0073, [0xa3] = 0x0074,
+  [0xa4] = 0x0075, [0xa5] = 0x0076, [0xa6] = 0x0077, [0xa7] = 0x0078,
+  [0xa8] = 0x0079, [0xa9] = 0x007a, [0xaa] = 0x00a1, [0xab] = 0x00bf,
+  [0xac] = 0x00d0, [0xad] = 0x00dd, [0xae] = 0x00de, [0xaf] = 0x00ae,
+  [0xb0] = 0x00a2, [0xb1] = 0x0023, [0xb2] = 0x00a5, [0xb3] = 0x00b7,
+  [0xb4] = 0x00a9, [0xb5] = 0x005d, [0xb6] = 0x00b6, [0xb7] = 0x00bc,
+  [0xb8] = 0x00bd, [0xb9] = 0x00be, [0xba] = 0x00ac, [0xbb] = 0x007c,
+  [0xbc] = 0x00af, [0xbd] = 0x007e, [0xbe] = 0x00b4, [0xbf] = 0x00d7,
+  [0xc0] = 0x00e9, [0xc1] = 0x0041, [0xc2] = 0x0042, [0xc3] = 0x0043,
+  [0xc4] = 0x0044, [0xc5] = 0x0045, [0xc6] = 0x0046, [0xc7] = 0x0047,
+  [0xc8] = 0x0048, [0xc9] = 0x0049, [0xca] = 0x00ad, [0xcb] = 0x00f4,
+  [0xcc] = 0x00f6, [0xcd] = 0x00f2, [0xce] = 0x00f3, [0xcf] = 0x00f5,
+  [0xd0] = 0x00e8, [0xd1] = 0x004a, [0xd2] = 0x004b, [0xd3] = 0x004c,
+  [0xd4] = 0x004d, [0xd5] = 0x004e, [0xd6] = 0x004f, [0xd7] = 0x0050,
+  [0xd8] = 0x0051, [0xd9] = 0x0052, [0xda] = 0x00b9, [0xdb] = 0x00fb,
+  [0xdc] = 0x00fc, [0xdd] = 0x00a6, [0xde] = 0x00fa, [0xdf] = 0x00ff,
+  [0xe0] = 0x00e7, [0xe1] = 0x00f7, [0xe2] = 0x0053, [0xe3] = 0x0054,
+  [0xe4] = 0x0055, [0xe5] = 0x0056, [0xe6] = 0x0057, [0xe7] = 0x0058,
+  [0xe8] = 0x0059, [0xe9] = 0x005a, [0xea] = 0x00b2, [0xeb] = 0x00d4,
+  [0xec] = 0x00d6, [0xed] = 0x00d2, [0xee] = 0x00d3, [0xef] = 0x00d5,
+  [0xf0] = 0x0030, [0xf1] = 0x0031, [0xf2] = 0x0032, [0xf3] = 0x0033,
+  [0xf4] = 0x0034, [0xf5] = 0x0035, [0xf6] = 0x0036, [0xf7] = 0x0037,
+  [0xf8] = 0x0038, [0xf9] = 0x0039, [0xfa] = 0x00b3, [0xfb] = 0x00db,
+  [0xfc] = 0x00dc, [0xfd] = 0x00d9, [0xfe] = 0x00da, [0xff] = 0x009f
+};
+
+static const struct gap from_idx[] =
+{
+  { start: 0x0000, end: 0x00ff, idx:     0 },
+  { start: 0x203e, end: 0x203e, idx: -7998 },
+  { start: 0x20ac, end: 0x20ac, idx: -8107 },
+  { start: 0xffff, end: 0xffff, idx:     0 }
+};
+
+static const char from_ucs4[] =
+{
+  '\x00', '\x01', '\x02', '\x03', '\x37', '\x2d', '\x2e', '\x2f',
+  '\x16', '\x05', '\x25', '\x0b', '\x0c', '\x0d', '\x0e', '\x0f',
+  '\x10', '\x11', '\x12', '\x13', '\x3c', '\x3d', '\x32', '\x26',
+  '\x18', '\x19', '\x3f', '\x27', '\x1c', '\x1d', '\x1e', '\x1f',
+  '\x40', '\x4f', '\x7f', '\xb1', '\x5b', '\x6c', '\x50', '\x7d',
+  '\x4d', '\x5d', '\x5c', '\x4e', '\x6b', '\x60', '\x4b', '\x61',
+  '\xf0', '\xf1', '\xf2', '\xf3', '\xf4', '\xf5', '\xf6', '\xf7',
+  '\xf8', '\xf9', '\x7a', '\x5e', '\x4c', '\x7e', '\x6e', '\x6f',
+  '\x44', '\xc1', '\xc2', '\xc3', '\xc4', '\xc5', '\xc6', '\xc7',
+  '\xc8', '\xc9', '\xd1', '\xd2', '\xd3', '\xd4', '\xd5', '\xd6',
+  '\xd7', '\xd8', '\xd9', '\xe2', '\xe3', '\xe4', '\xe5', '\xe6',
+  '\xe7', '\xe8', '\xe9', '\x90', '\x48', '\xb5', '\x5f', '\x6d',
+  '\xa0', '\x81', '\x82', '\x83', '\x84', '\x85', '\x86', '\x87',
+  '\x88', '\x89', '\x91', '\x92', '\x93', '\x94', '\x95', '\x96',
+  '\x97', '\x98', '\x99', '\xa2', '\xa3', '\xa4', '\xa5', '\xa6',
+  '\xa7', '\xa8', '\xa9', '\x51', '\xbb', '\x54', '\xbd', '\x07',
+  '\x20', '\x21', '\x22', '\x23', '\x24', '\x15', '\x06', '\x17',
+  '\x28', '\x29', '\x2a', '\x2b', '\x2c', '\x09', '\x0a', '\x1b',
+  '\x30', '\x31', '\x1a', '\x33', '\x34', '\x35', '\x36', '\x08',
+  '\x38', '\x39', '\x3a', '\x3b', '\x04', '\x14', '\x3e', '\xff',
+  '\x41', '\xaa', '\xb0', '\x7b', '\x00', '\xb2', '\xdd', '\x5a',
+  '\xa1', '\xb4', '\x9a', '\x8a', '\xba', '\xca', '\xaf', '\xbc',
+  '\x4a', '\x8f', '\xea', '\xfa', '\xbe', '\x79', '\xb6', '\xb3',
+  '\x9d', '\xda', '\x9b', '\x8b', '\xb7', '\xb8', '\xb9', '\xab',
+  '\x64', '\x65', '\x62', '\x66', '\x63', '\x67', '\x9e', '\x68',
+  '\x74', '\x71', '\x72', '\x73', '\x78', '\x75', '\x76', '\x77',
+  '\xac', '\x69', '\xed', '\xee', '\xeb', '\xef', '\xec', '\xbf',
+  '\x80', '\xfd', '\xfe', '\xfb', '\xfc', '\xad', '\xae', '\x59',
+  '\x7c', '\x45', '\x42', '\x46', '\x43', '\x47', '\x9c', '\xe0',
+  '\xd0', '\xc0', '\x52', '\x53', '\x58', '\x55', '\x56', '\x57',
+  '\x8c', '\x49', '\xcd', '\xce', '\xcb', '\xcf', '\xcc', '\xe1',
+  '\x70', '\x6a', '\xde', '\xdb', '\xdc', '\x8d', '\x8e', '\xdf',
+  '\xbc', '\x9f'
+};
diff --git a/iconvdata/ibm1148.c b/iconvdata/ibm1148.c
new file mode 100644
index 0000000000..85d6fed2dc
--- /dev/null
+++ b/iconvdata/ibm1148.c
@@ -0,0 +1,29 @@
+/* Conversion from and to IBM1148.
+   Copyright (C) 2005 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#include <stdint.h>
+
+/* Get the conversion table.  */
+#define TABLES <ibm1148.h>
+
+#define CHARSET_NAME	"IBM1148//"
+#define HAS_HOLES	0	/* All 256 character are defined.  */
+
+#include <8bit-gap.c>
diff --git a/iconvdata/ibm1148.h b/iconvdata/ibm1148.h
new file mode 100644
index 0000000000..7f0cfe0583
--- /dev/null
+++ b/iconvdata/ibm1148.h
@@ -0,0 +1,132 @@
+/* Tables for conversion from and to IBM1148.
+   Copyright (C) 2005 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+static const uint32_t to_ucs4[256] =
+{
+  [0x00] = 0x0000, [0x01] = 0x0001, [0x02] = 0x0002, [0x03] = 0x0003,
+  [0x04] = 0x009c, [0x05] = 0x0009, [0x06] = 0x0086, [0x07] = 0x007f,
+  [0x08] = 0x0097, [0x09] = 0x008d, [0x0a] = 0x008e, [0x0b] = 0x000b,
+  [0x0c] = 0x000c, [0x0d] = 0x000d, [0x0e] = 0x000e, [0x0f] = 0x000f,
+  [0x10] = 0x0010, [0x11] = 0x0011, [0x12] = 0x0012, [0x13] = 0x0013,
+  [0x14] = 0x009d, [0x15] = 0x0085, [0x16] = 0x0008, [0x17] = 0x0087,
+  [0x18] = 0x0018, [0x19] = 0x0019, [0x1a] = 0x0092, [0x1b] = 0x008f,
+  [0x1c] = 0x001c, [0x1d] = 0x001d, [0x1e] = 0x001e, [0x1f] = 0x001f,
+  [0x20] = 0x0080, [0x21] = 0x0081, [0x22] = 0x0082, [0x23] = 0x0083,
+  [0x24] = 0x0084, [0x25] = 0x000a, [0x26] = 0x0017, [0x27] = 0x001b,
+  [0x28] = 0x0088, [0x29] = 0x0089, [0x2a] = 0x008a, [0x2b] = 0x008b,
+  [0x2c] = 0x008c, [0x2d] = 0x0005, [0x2e] = 0x0006, [0x2f] = 0x0007,
+  [0x30] = 0x0090, [0x31] = 0x0091, [0x32] = 0x0016, [0x33] = 0x0093,
+  [0x34] = 0x0094, [0x35] = 0x0095, [0x36] = 0x0096, [0x37] = 0x0004,
+  [0x38] = 0x0098, [0x39] = 0x0099, [0x3a] = 0x009a, [0x3b] = 0x009b,
+  [0x3c] = 0x0014, [0x3d] = 0x0015, [0x3e] = 0x009e, [0x3f] = 0x001a,
+  [0x40] = 0x0020, [0x41] = 0x00a0, [0x42] = 0x00e2, [0x43] = 0x00e4,
+  [0x44] = 0x00e0, [0x45] = 0x00e1, [0x46] = 0x00e3, [0x47] = 0x00e5,
+  [0x48] = 0x00e7, [0x49] = 0x00f1, [0x4a] = 0x005b, [0x4b] = 0x002e,
+  [0x4c] = 0x003c, [0x4d] = 0x0028, [0x4e] = 0x002b, [0x4f] = 0x0021,
+  [0x50] = 0x0026, [0x51] = 0x00e9, [0x52] = 0x00ea, [0x53] = 0x00eb,
+  [0x54] = 0x00e8, [0x55] = 0x00ed, [0x56] = 0x00ee, [0x57] = 0x00ef,
+  [0x58] = 0x00ec, [0x59] = 0x00df, [0x5a] = 0x005d, [0x5b] = 0x0024,
+  [0x5c] = 0x002a, [0x5d] = 0x0029, [0x5e] = 0x003b, [0x5f] = 0x005e,
+  [0x60] = 0x002d, [0x61] = 0x002f, [0x62] = 0x00c2, [0x63] = 0x00c4,
+  [0x64] = 0x00c0, [0x65] = 0x00c1, [0x66] = 0x00c3, [0x67] = 0x00c5,
+  [0x68] = 0x00c7, [0x69] = 0x00d1, [0x6a] = 0x00a6, [0x6b] = 0x002c,
+  [0x6c] = 0x0025, [0x6d] = 0x005f, [0x6e] = 0x003e, [0x6f] = 0x003f,
+  [0x70] = 0x00f8, [0x71] = 0x00c9, [0x72] = 0x00ca, [0x73] = 0x00cb,
+  [0x74] = 0x00c8, [0x75] = 0x00cd, [0x76] = 0x00ce, [0x77] = 0x00cf,
+  [0x78] = 0x00cc, [0x79] = 0x0060, [0x7a] = 0x003a, [0x7b] = 0x0023,
+  [0x7c] = 0x0040, [0x7d] = 0x0027, [0x7e] = 0x003d, [0x7f] = 0x0022,
+  [0x80] = 0x00d8, [0x81] = 0x0061, [0x82] = 0x0062, [0x83] = 0x0063,
+  [0x84] = 0x0064, [0x85] = 0x0065, [0x86] = 0x0066, [0x87] = 0x0067,
+  [0x88] = 0x0068, [0x89] = 0x0069, [0x8a] = 0x00ab, [0x8b] = 0x00bb,
+  [0x8c] = 0x00f0, [0x8d] = 0x00fd, [0x8e] = 0x00fe, [0x8f] = 0x00b1,
+  [0x90] = 0x00b0, [0x91] = 0x006a, [0x92] = 0x006b, [0x93] = 0x006c,
+  [0x94] = 0x006d, [0x95] = 0x006e, [0x96] = 0x006f, [0x97] = 0x0070,
+  [0x98] = 0x0071, [0x99] = 0x0072, [0x9a] = 0x00aa, [0x9b] = 0x00ba,
+  [0x9c] = 0x00e6, [0x9d] = 0x00b8, [0x9e] = 0x00c6, [0x9f] = 0x20ac,
+  [0xa0] = 0x00b5, [0xa1] = 0x007e, [0xa2] = 0x0073, [0xa3] = 0x0074,
+  [0xa4] = 0x0075, [0xa5] = 0x0076, [0xa6] = 0x0077, [0xa7] = 0x0078,
+  [0xa8] = 0x0079, [0xa9] = 0x007a, [0xaa] = 0x00a1, [0xab] = 0x00bf,
+  [0xac] = 0x00d0, [0xad] = 0x00dd, [0xae] = 0x00de, [0xaf] = 0x00ae,
+  [0xb0] = 0x00a2, [0xb1] = 0x00a3, [0xb2] = 0x00a5, [0xb3] = 0x00b7,
+  [0xb4] = 0x00a9, [0xb5] = 0x00a7, [0xb6] = 0x00b6, [0xb7] = 0x00bc,
+  [0xb8] = 0x00bd, [0xb9] = 0x00be, [0xba] = 0x00ac, [0xbb] = 0x007c,
+  [0xbc] = 0x00af, [0xbd] = 0x00a8, [0xbe] = 0x00b4, [0xbf] = 0x00d7,
+  [0xc0] = 0x007b, [0xc1] = 0x0041, [0xc2] = 0x0042, [0xc3] = 0x0043,
+  [0xc4] = 0x0044, [0xc5] = 0x0045, [0xc6] = 0x0046, [0xc7] = 0x0047,
+  [0xc8] = 0x0048, [0xc9] = 0x0049, [0xca] = 0x00ad, [0xcb] = 0x00f4,
+  [0xcc] = 0x00f6, [0xcd] = 0x00f2, [0xce] = 0x00f3, [0xcf] = 0x00f5,
+  [0xd0] = 0x007d, [0xd1] = 0x004a, [0xd2] = 0x004b, [0xd3] = 0x004c,
+  [0xd4] = 0x004d, [0xd5] = 0x004e, [0xd6] = 0x004f, [0xd7] = 0x0050,
+  [0xd8] = 0x0051, [0xd9] = 0x0052, [0xda] = 0x00b9, [0xdb] = 0x00fb,
+  [0xdc] = 0x00fc, [0xdd] = 0x00f9, [0xde] = 0x00fa, [0xdf] = 0x00ff,
+  [0xe0] = 0x005c, [0xe1] = 0x00f7, [0xe2] = 0x0053, [0xe3] = 0x0054,
+  [0xe4] = 0x0055, [0xe5] = 0x0056, [0xe6] = 0x0057, [0xe7] = 0x0058,
+  [0xe8] = 0x0059, [0xe9] = 0x005a, [0xea] = 0x00b2, [0xeb] = 0x00d4,
+  [0xec] = 0x00d6, [0xed] = 0x00d2, [0xee] = 0x00d3, [0xef] = 0x00d5,
+  [0xf0] = 0x0030, [0xf1] = 0x0031, [0xf2] = 0x0032, [0xf3] = 0x0033,
+  [0xf4] = 0x0034, [0xf5] = 0x0035, [0xf6] = 0x0036, [0xf7] = 0x0037,
+  [0xf8] = 0x0038, [0xf9] = 0x0039, [0xfa] = 0x00b3, [0xfb] = 0x00db,
+  [0xfc] = 0x00dc, [0xfd] = 0x00d9, [0xfe] = 0x00da, [0xff] = 0x009f
+};
+
+static const struct gap from_idx[] =
+{
+  { start: 0x0000, end: 0x00ff, idx:     0 },
+  { start: 0x203e, end: 0x203e, idx: -7998 },
+  { start: 0x20ac, end: 0x20ac, idx: -8107 },
+  { start: 0xffff, end: 0xffff, idx:     0 }
+};
+
+static const char from_ucs4[] =
+{
+  '\x00', '\x01', '\x02', '\x03', '\x37', '\x2d', '\x2e', '\x2f',
+  '\x16', '\x05', '\x25', '\x0b', '\x0c', '\x0d', '\x0e', '\x0f',
+  '\x10', '\x11', '\x12', '\x13', '\x3c', '\x3d', '\x32', '\x26',
+  '\x18', '\x19', '\x3f', '\x27', '\x1c', '\x1d', '\x1e', '\x1f',
+  '\x40', '\x4f', '\x7f', '\x7b', '\x5b', '\x6c', '\x50', '\x7d',
+  '\x4d', '\x5d', '\x5c', '\x4e', '\x6b', '\x60', '\x4b', '\x61',
+  '\xf0', '\xf1', '\xf2', '\xf3', '\xf4', '\xf5', '\xf6', '\xf7',
+  '\xf8', '\xf9', '\x7a', '\x5e', '\x4c', '\x7e', '\x6e', '\x6f',
+  '\x7c', '\xc1', '\xc2', '\xc3', '\xc4', '\xc5', '\xc6', '\xc7',
+  '\xc8', '\xc9', '\xd1', '\xd2', '\xd3', '\xd4', '\xd5', '\xd6',
+  '\xd7', '\xd8', '\xd9', '\xe2', '\xe3', '\xe4', '\xe5', '\xe6',
+  '\xe7', '\xe8', '\xe9', '\x4a', '\xe0', '\x5a', '\x5f', '\x6d',
+  '\x79', '\x81', '\x82', '\x83', '\x84', '\x85', '\x86', '\x87',
+  '\x88', '\x89', '\x91', '\x92', '\x93', '\x94', '\x95', '\x96',
+  '\x97', '\x98', '\x99', '\xa2', '\xa3', '\xa4', '\xa5', '\xa6',
+  '\xa7', '\xa8', '\xa9', '\xc0', '\xbb', '\xd0', '\xa1', '\x07',
+  '\x20', '\x21', '\x22', '\x23', '\x24', '\x15', '\x06', '\x17',
+  '\x28', '\x29', '\x2a', '\x2b', '\x2c', '\x09', '\x0a', '\x1b',
+  '\x30', '\x31', '\x1a', '\x33', '\x34', '\x35', '\x36', '\x08',
+  '\x38', '\x39', '\x3a', '\x3b', '\x04', '\x14', '\x3e', '\xff',
+  '\x41', '\xaa', '\xb0', '\xb1', '\x00', '\xb2', '\x6a', '\xb5',
+  '\xbd', '\xb4', '\x9a', '\x8a', '\xba', '\xca', '\xaf', '\xbc',
+  '\x90', '\x8f', '\xea', '\xfa', '\xbe', '\xa0', '\xb6', '\xb3',
+  '\x9d', '\xda', '\x9b', '\x8b', '\xb7', '\xb8', '\xb9', '\xab',
+  '\x64', '\x65', '\x62', '\x66', '\x63', '\x67', '\x9e', '\x68',
+  '\x74', '\x71', '\x72', '\x73', '\x78', '\x75', '\x76', '\x77',
+  '\xac', '\x69', '\xed', '\xee', '\xeb', '\xef', '\xec', '\xbf',
+  '\x80', '\xfd', '\xfe', '\xfb', '\xfc', '\xad', '\xae', '\x59',
+  '\x44', '\x45', '\x42', '\x46', '\x43', '\x47', '\x9c', '\x48',
+  '\x54', '\x51', '\x52', '\x53', '\x58', '\x55', '\x56', '\x57',
+  '\x8c', '\x49', '\xcd', '\xce', '\xcb', '\xcf', '\xcc', '\xe1',
+  '\x70', '\xdd', '\xde', '\xdb', '\xdc', '\x8d', '\x8e', '\xdf',
+  '\xbc', '\x9f'
+};
diff --git a/iconvdata/ibm1149.c b/iconvdata/ibm1149.c
new file mode 100644
index 0000000000..a91652bba5
--- /dev/null
+++ b/iconvdata/ibm1149.c
@@ -0,0 +1,29 @@
+/* Conversion from and to IBM1149.
+   Copyright (C) 2005 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#include <stdint.h>
+
+/* Get the conversion table.  */
+#define TABLES <ibm1149.h>
+
+#define CHARSET_NAME	"IBM1149//"
+#define HAS_HOLES	0	/* All 256 character are defined.  */
+
+#include <8bit-gap.c>
diff --git a/iconvdata/ibm1149.h b/iconvdata/ibm1149.h
new file mode 100644
index 0000000000..1debebfad0
--- /dev/null
+++ b/iconvdata/ibm1149.h
@@ -0,0 +1,132 @@
+/* Tables for conversion from and to IBM1149.
+   Copyright (C) 2005 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+static const uint32_t to_ucs4[256] =
+{
+  [0x00] = 0x0000, [0x01] = 0x0001, [0x02] = 0x0002, [0x03] = 0x0003,
+  [0x04] = 0x009c, [0x05] = 0x0009, [0x06] = 0x0086, [0x07] = 0x007f,
+  [0x08] = 0x0097, [0x09] = 0x008d, [0x0a] = 0x008e, [0x0b] = 0x000b,
+  [0x0c] = 0x000c, [0x0d] = 0x000d, [0x0e] = 0x000e, [0x0f] = 0x000f,
+  [0x10] = 0x0010, [0x11] = 0x0011, [0x12] = 0x0012, [0x13] = 0x0013,
+  [0x14] = 0x009d, [0x15] = 0x0085, [0x16] = 0x0008, [0x17] = 0x0087,
+  [0x18] = 0x0018, [0x19] = 0x0019, [0x1a] = 0x0092, [0x1b] = 0x008f,
+  [0x1c] = 0x001c, [0x1d] = 0x001d, [0x1e] = 0x001e, [0x1f] = 0x001f,
+  [0x20] = 0x0080, [0x21] = 0x0081, [0x22] = 0x0082, [0x23] = 0x0083,
+  [0x24] = 0x0084, [0x25] = 0x000a, [0x26] = 0x0017, [0x27] = 0x001b,
+  [0x28] = 0x0088, [0x29] = 0x0089, [0x2a] = 0x008a, [0x2b] = 0x008b,
+  [0x2c] = 0x008c, [0x2d] = 0x0005, [0x2e] = 0x0006, [0x2f] = 0x0007,
+  [0x30] = 0x0090, [0x31] = 0x0091, [0x32] = 0x0016, [0x33] = 0x0093,
+  [0x34] = 0x0094, [0x35] = 0x0095, [0x36] = 0x0096, [0x37] = 0x0004,
+  [0x38] = 0x0098, [0x39] = 0x0099, [0x3a] = 0x009a, [0x3b] = 0x009b,
+  [0x3c] = 0x0014, [0x3d] = 0x0015, [0x3e] = 0x009e, [0x3f] = 0x001a,
+  [0x40] = 0x0020, [0x41] = 0x00a0, [0x42] = 0x00e2, [0x43] = 0x00e4,
+  [0x44] = 0x00e0, [0x45] = 0x00e1, [0x46] = 0x00e3, [0x47] = 0x00e5,
+  [0x48] = 0x00e7, [0x49] = 0x00f1, [0x4a] = 0x00de, [0x4b] = 0x002e,
+  [0x4c] = 0x003c, [0x4d] = 0x0028, [0x4e] = 0x002b, [0x4f] = 0x0021,
+  [0x50] = 0x0026, [0x51] = 0x00e9, [0x52] = 0x00ea, [0x53] = 0x00eb,
+  [0x54] = 0x00e8, [0x55] = 0x00ed, [0x56] = 0x00ee, [0x57] = 0x00ef,
+  [0x58] = 0x00ec, [0x59] = 0x00df, [0x5a] = 0x00c6, [0x5b] = 0x0024,
+  [0x5c] = 0x002a, [0x5d] = 0x0029, [0x5e] = 0x003b, [0x5f] = 0x00d6,
+  [0x60] = 0x002d, [0x61] = 0x002f, [0x62] = 0x00c2, [0x63] = 0x00c4,
+  [0x64] = 0x00c0, [0x65] = 0x00c1, [0x66] = 0x00c3, [0x67] = 0x00c5,
+  [0x68] = 0x00c7, [0x69] = 0x00d1, [0x6a] = 0x00a6, [0x6b] = 0x002c,
+  [0x6c] = 0x0025, [0x6d] = 0x005f, [0x6e] = 0x003e, [0x6f] = 0x003f,
+  [0x70] = 0x00f8, [0x71] = 0x00c9, [0x72] = 0x00ca, [0x73] = 0x00cb,
+  [0x74] = 0x00c8, [0x75] = 0x00cd, [0x76] = 0x00ce, [0x77] = 0x00cf,
+  [0x78] = 0x00cc, [0x79] = 0x00f0, [0x7a] = 0x003a, [0x7b] = 0x0023,
+  [0x7c] = 0x00d0, [0x7d] = 0x0027, [0x7e] = 0x003d, [0x7f] = 0x0022,
+  [0x80] = 0x00d8, [0x81] = 0x0061, [0x82] = 0x0062, [0x83] = 0x0063,
+  [0x84] = 0x0064, [0x85] = 0x0065, [0x86] = 0x0066, [0x87] = 0x0067,
+  [0x88] = 0x0068, [0x89] = 0x0069, [0x8a] = 0x00ab, [0x8b] = 0x00bb,
+  [0x8c] = 0x0060, [0x8d] = 0x00fd, [0x8e] = 0x007b, [0x8f] = 0x00b1,
+  [0x90] = 0x00b0, [0x91] = 0x006a, [0x92] = 0x006b, [0x93] = 0x006c,
+  [0x94] = 0x006d, [0x95] = 0x006e, [0x96] = 0x006f, [0x97] = 0x0070,
+  [0x98] = 0x0071, [0x99] = 0x0072, [0x9a] = 0x00aa, [0x9b] = 0x00ba,
+  [0x9c] = 0x007d, [0x9d] = 0x00b8, [0x9e] = 0x005d, [0x9f] = 0x20ac,
+  [0xa0] = 0x00b5, [0xa1] = 0x00f6, [0xa2] = 0x0073, [0xa3] = 0x0074,
+  [0xa4] = 0x0075, [0xa5] = 0x0076, [0xa6] = 0x0077, [0xa7] = 0x0078,
+  [0xa8] = 0x0079, [0xa9] = 0x007a, [0xaa] = 0x00a1, [0xab] = 0x00bf,
+  [0xac] = 0x0040, [0xad] = 0x00dd, [0xae] = 0x005b, [0xaf] = 0x00ae,
+  [0xb0] = 0x00a2, [0xb1] = 0x00a3, [0xb2] = 0x00a5, [0xb3] = 0x00b7,
+  [0xb4] = 0x00a9, [0xb5] = 0x00a7, [0xb6] = 0x00b6, [0xb7] = 0x00bc,
+  [0xb8] = 0x00bd, [0xb9] = 0x00be, [0xba] = 0x00ac, [0xbb] = 0x007c,
+  [0xbc] = 0x00af, [0xbd] = 0x00a8, [0xbe] = 0x005c, [0xbf] = 0x00d7,
+  [0xc0] = 0x00fe, [0xc1] = 0x0041, [0xc2] = 0x0042, [0xc3] = 0x0043,
+  [0xc4] = 0x0044, [0xc5] = 0x0045, [0xc6] = 0x0046, [0xc7] = 0x0047,
+  [0xc8] = 0x0048, [0xc9] = 0x0049, [0xca] = 0x00ad, [0xcb] = 0x00f4,
+  [0xcc] = 0x007e, [0xcd] = 0x00f2, [0xce] = 0x00f3, [0xcf] = 0x00f5,
+  [0xd0] = 0x00e6, [0xd1] = 0x004a, [0xd2] = 0x004b, [0xd3] = 0x004c,
+  [0xd4] = 0x004d, [0xd5] = 0x004e, [0xd6] = 0x004f, [0xd7] = 0x0050,
+  [0xd8] = 0x0051, [0xd9] = 0x0052, [0xda] = 0x00b9, [0xdb] = 0x00fb,
+  [0xdc] = 0x00fc, [0xdd] = 0x00f9, [0xde] = 0x00fa, [0xdf] = 0x00ff,
+  [0xe0] = 0x00b4, [0xe1] = 0x00f7, [0xe2] = 0x0053, [0xe3] = 0x0054,
+  [0xe4] = 0x0055, [0xe5] = 0x0056, [0xe6] = 0x0057, [0xe7] = 0x0058,
+  [0xe8] = 0x0059, [0xe9] = 0x005a, [0xea] = 0x00b2, [0xeb] = 0x00d4,
+  [0xec] = 0x005e, [0xed] = 0x00d2, [0xee] = 0x00d3, [0xef] = 0x00d5,
+  [0xf0] = 0x0030, [0xf1] = 0x0031, [0xf2] = 0x0032, [0xf3] = 0x0033,
+  [0xf4] = 0x0034, [0xf5] = 0x0035, [0xf6] = 0x0036, [0xf7] = 0x0037,
+  [0xf8] = 0x0038, [0xf9] = 0x0039, [0xfa] = 0x00b3, [0xfb] = 0x00db,
+  [0xfc] = 0x00dc, [0xfd] = 0x00d9, [0xfe] = 0x00da, [0xff] = 0x009f
+};
+
+static const struct gap from_idx[] =
+{
+  { start: 0x0000, end: 0x00ff, idx:     0 },
+  { start: 0x203e, end: 0x203e, idx: -7998 },
+  { start: 0x20ac, end: 0x20ac, idx: -8107 },
+  { start: 0xffff, end: 0xffff, idx:     0 }
+};
+
+static const char from_ucs4[] =
+{
+  '\x00', '\x01', '\x02', '\x03', '\x37', '\x2d', '\x2e', '\x2f',
+  '\x16', '\x05', '\x25', '\x0b', '\x0c', '\x0d', '\x0e', '\x0f',
+  '\x10', '\x11', '\x12', '\x13', '\x3c', '\x3d', '\x32', '\x26',
+  '\x18', '\x19', '\x3f', '\x27', '\x1c', '\x1d', '\x1e', '\x1f',
+  '\x40', '\x4f', '\x7f', '\x7b', '\x5b', '\x6c', '\x50', '\x7d',
+  '\x4d', '\x5d', '\x5c', '\x4e', '\x6b', '\x60', '\x4b', '\x61',
+  '\xf0', '\xf1', '\xf2', '\xf3', '\xf4', '\xf5', '\xf6', '\xf7',
+  '\xf8', '\xf9', '\x7a', '\x5e', '\x4c', '\x7e', '\x6e', '\x6f',
+  '\xac', '\xc1', '\xc2', '\xc3', '\xc4', '\xc5', '\xc6', '\xc7',
+  '\xc8', '\xc9', '\xd1', '\xd2', '\xd3', '\xd4', '\xd5', '\xd6',
+  '\xd7', '\xd8', '\xd9', '\xe2', '\xe3', '\xe4', '\xe5', '\xe6',
+  '\xe7', '\xe8', '\xe9', '\xae', '\xbe', '\x9e', '\xec', '\x6d',
+  '\x8c', '\x81', '\x82', '\x83', '\x84', '\x85', '\x86', '\x87',
+  '\x88', '\x89', '\x91', '\x92', '\x93', '\x94', '\x95', '\x96',
+  '\x97', '\x98', '\x99', '\xa2', '\xa3', '\xa4', '\xa5', '\xa6',
+  '\xa7', '\xa8', '\xa9', '\x8e', '\xbb', '\x9c', '\xcc', '\x07',
+  '\x20', '\x21', '\x22', '\x23', '\x24', '\x15', '\x06', '\x17',
+  '\x28', '\x29', '\x2a', '\x2b', '\x2c', '\x09', '\x0a', '\x1b',
+  '\x30', '\x31', '\x1a', '\x33', '\x34', '\x35', '\x36', '\x08',
+  '\x38', '\x39', '\x3a', '\x3b', '\x04', '\x14', '\x3e', '\xff',
+  '\x41', '\xaa', '\xb0', '\xb1', '\x00', '\xb2', '\x6a', '\xb5',
+  '\xbd', '\xb4', '\x9a', '\x8a', '\xba', '\xca', '\xaf', '\xbc',
+  '\x90', '\x8f', '\xea', '\xfa', '\xe0', '\xa0', '\xb6', '\xb3',
+  '\x9d', '\xda', '\x9b', '\x8b', '\xb7', '\xb8', '\xb9', '\xab',
+  '\x64', '\x65', '\x62', '\x66', '\x63', '\x67', '\x5a', '\x68',
+  '\x74', '\x71', '\x72', '\x73', '\x78', '\x75', '\x76', '\x77',
+  '\x7c', '\x69', '\xed', '\xee', '\xeb', '\xef', '\x5f', '\xbf',
+  '\x80', '\xfd', '\xfe', '\xfb', '\xfc', '\xad', '\x4a', '\x59',
+  '\x44', '\x45', '\x42', '\x46', '\x43', '\x47', '\xd0', '\x48',
+  '\x54', '\x51', '\x52', '\x53', '\x58', '\x55', '\x56', '\x57',
+  '\x79', '\x49', '\xcd', '\xce', '\xcb', '\xcf', '\xa1', '\xe1',
+  '\x70', '\xdd', '\xde', '\xdb', '\xdc', '\x8d', '\xc0', '\xdf',
+  '\xbc', '\x9f'
+};
diff --git a/iconvdata/ibm1166.c b/iconvdata/ibm1166.c
new file mode 100644
index 0000000000..75ff337c1a
--- /dev/null
+++ b/iconvdata/ibm1166.c
@@ -0,0 +1,29 @@
+/* Conversion from and to IBM1166.
+   Copyright (C) 2005 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#include <stdint.h>
+
+/* Get the conversion table.  */
+#define TABLES <ibm1166.h>
+
+#define CHARSET_NAME	"IBM1166//"
+#define HAS_HOLES	0	/* All 256 character are defined.  */
+
+#include <8bit-gap.c>
diff --git a/iconvdata/ibm1166.h b/iconvdata/ibm1166.h
new file mode 100644
index 0000000000..9eaa63e547
--- /dev/null
+++ b/iconvdata/ibm1166.h
@@ -0,0 +1,143 @@
+/* Tables for conversion from and to IBM1166.
+   Copyright (C) 2005 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+static const uint32_t to_ucs4[256] =
+{
+  [0x00] = 0x0000, [0x01] = 0x0001, [0x02] = 0x0002, [0x03] = 0x0003,
+  [0x04] = 0x009c, [0x05] = 0x0009, [0x06] = 0x0086, [0x07] = 0x007f,
+  [0x08] = 0x0097, [0x09] = 0x008d, [0x0a] = 0x008e, [0x0b] = 0x000b,
+  [0x0c] = 0x000c, [0x0d] = 0x000d, [0x0e] = 0x000e, [0x0f] = 0x000f,
+  [0x10] = 0x0010, [0x11] = 0x0011, [0x12] = 0x0012, [0x13] = 0x0013,
+  [0x14] = 0x009d, [0x15] = 0x0085, [0x16] = 0x0008, [0x17] = 0x0087,
+  [0x18] = 0x0018, [0x19] = 0x0019, [0x1a] = 0x0092, [0x1b] = 0x008f,
+  [0x1c] = 0x001c, [0x1d] = 0x001d, [0x1e] = 0x001e, [0x1f] = 0x001f,
+  [0x20] = 0x0080, [0x21] = 0x0081, [0x22] = 0x0082, [0x23] = 0x0083,
+  [0x24] = 0x0084, [0x25] = 0x000a, [0x26] = 0x0017, [0x27] = 0x001b,
+  [0x28] = 0x0088, [0x29] = 0x0089, [0x2a] = 0x008a, [0x2b] = 0x008b,
+  [0x2c] = 0x008c, [0x2d] = 0x0005, [0x2e] = 0x0006, [0x2f] = 0x0007,
+  [0x30] = 0x0090, [0x31] = 0x0091, [0x32] = 0x0016, [0x33] = 0x0093,
+  [0x34] = 0x0094, [0x35] = 0x0095, [0x36] = 0x0096, [0x37] = 0x0004,
+  [0x38] = 0x0098, [0x39] = 0x0099, [0x3a] = 0x009a, [0x3b] = 0x009b,
+  [0x3c] = 0x0014, [0x3d] = 0x0015, [0x3e] = 0x009e, [0x3f] = 0x001a,
+  [0x40] = 0x0020, [0x41] = 0x00a0, [0x42] = 0x04d9, [0x43] = 0x0493,
+  [0x44] = 0x0451, [0x45] = 0x0454, [0x46] = 0x0455, [0x47] = 0x0456,
+  [0x48] = 0x049b, [0x49] = 0x0458, [0x4a] = 0x005b, [0x4b] = 0x002e,
+  [0x4c] = 0x003c, [0x4d] = 0x0028, [0x4e] = 0x002b, [0x4f] = 0x0021,
+  [0x50] = 0x0026, [0x51] = 0x04a3, [0x52] = 0x04e9, [0x53] = 0x04b1,
+  [0x54] = 0x04af, [0x55] = 0x045e, [0x56] = 0x04bb, [0x57] = 0x042a,
+  [0x58] = 0x2116, [0x59] = 0x04d8, [0x5a] = 0x005d, [0x5b] = 0x0024,
+  [0x5c] = 0x002a, [0x5d] = 0x0029, [0x5e] = 0x003b, [0x5f] = 0x005e,
+  [0x60] = 0x002d, [0x61] = 0x002f, [0x62] = 0x0492, [0x63] = 0x0401,
+  [0x64] = 0x0404, [0x65] = 0x0405, [0x66] = 0x0406, [0x67] = 0x049a,
+  [0x68] = 0x0408, [0x69] = 0x04a2, [0x6a] = 0x007c, [0x6b] = 0x002c,
+  [0x6c] = 0x0025, [0x6d] = 0x005f, [0x6e] = 0x003e, [0x6f] = 0x003f,
+  [0x70] = 0x04e8, [0x71] = 0x04b0, [0x72] = 0x04ae, [0x73] = 0x00ad,
+  [0x74] = 0x040e, [0x75] = 0x04ba, [0x76] = 0x044e, [0x77] = 0x0430,
+  [0x78] = 0x0431, [0x79] = 0x0060, [0x7a] = 0x003a, [0x7b] = 0x0023,
+  [0x7c] = 0x0040, [0x7d] = 0x0027, [0x7e] = 0x003d, [0x7f] = 0x0022,
+  [0x80] = 0x0446, [0x81] = 0x0061, [0x82] = 0x0062, [0x83] = 0x0063,
+  [0x84] = 0x0064, [0x85] = 0x0065, [0x86] = 0x0066, [0x87] = 0x0067,
+  [0x88] = 0x0068, [0x89] = 0x0069, [0x8a] = 0x0434, [0x8b] = 0x0435,
+  [0x8c] = 0x0444, [0x8d] = 0x0433, [0x8e] = 0x0445, [0x8f] = 0x0438,
+  [0x90] = 0x0439, [0x91] = 0x006a, [0x92] = 0x006b, [0x93] = 0x006c,
+  [0x94] = 0x006d, [0x95] = 0x006e, [0x96] = 0x006f, [0x97] = 0x0070,
+  [0x98] = 0x0071, [0x99] = 0x0072, [0x9a] = 0x043a, [0x9b] = 0x043b,
+  [0x9c] = 0x043c, [0x9d] = 0x043d, [0x9e] = 0x043e, [0x9f] = 0x043f,
+  [0xa0] = 0x044f, [0xa1] = 0x007e, [0xa2] = 0x0073, [0xa3] = 0x0074,
+  [0xa4] = 0x0075, [0xa5] = 0x0076, [0xa6] = 0x0077, [0xa7] = 0x0078,
+  [0xa8] = 0x0079, [0xa9] = 0x007a, [0xaa] = 0x0440, [0xab] = 0x0441,
+  [0xac] = 0x0442, [0xad] = 0x0443, [0xae] = 0x0436, [0xaf] = 0x0432,
+  [0xb0] = 0x044c, [0xb1] = 0x044b, [0xb2] = 0x0437, [0xb3] = 0x0448,
+  [0xb4] = 0x044d, [0xb5] = 0x0449, [0xb6] = 0x0447, [0xb7] = 0x044a,
+  [0xb8] = 0x042e, [0xb9] = 0x0410, [0xba] = 0x0411, [0xbb] = 0x0426,
+  [0xbc] = 0x0414, [0xbd] = 0x0415, [0xbe] = 0x0424, [0xbf] = 0x0413,
+  [0xc0] = 0x007b, [0xc1] = 0x0041, [0xc2] = 0x0042, [0xc3] = 0x0043,
+  [0xc4] = 0x0044, [0xc5] = 0x0045, [0xc6] = 0x0046, [0xc7] = 0x0047,
+  [0xc8] = 0x0048, [0xc9] = 0x0049, [0xca] = 0x0425, [0xcb] = 0x0418,
+  [0xcc] = 0x0419, [0xcd] = 0x041a, [0xce] = 0x041b, [0xcf] = 0x041c,
+  [0xd0] = 0x007d, [0xd1] = 0x004a, [0xd2] = 0x004b, [0xd3] = 0x004c,
+  [0xd4] = 0x004d, [0xd5] = 0x004e, [0xd6] = 0x004f, [0xd7] = 0x0050,
+  [0xd8] = 0x0051, [0xd9] = 0x0052, [0xda] = 0x041d, [0xdb] = 0x041e,
+  [0xdc] = 0x041f, [0xdd] = 0x042f, [0xde] = 0x0420, [0xdf] = 0x0421,
+  [0xe0] = 0x005c, [0xe1] = 0x20ac, [0xe2] = 0x0053, [0xe3] = 0x0054,
+  [0xe4] = 0x0055, [0xe5] = 0x0056, [0xe6] = 0x0057, [0xe7] = 0x0058,
+  [0xe8] = 0x0059, [0xe9] = 0x005a, [0xea] = 0x0422, [0xeb] = 0x0423,
+  [0xec] = 0x0416, [0xed] = 0x0412, [0xee] = 0x042c, [0xef] = 0x042b,
+  [0xf0] = 0x0030, [0xf1] = 0x0031, [0xf2] = 0x0032, [0xf3] = 0x0033,
+  [0xf4] = 0x0034, [0xf5] = 0x0035, [0xf6] = 0x0036, [0xf7] = 0x0037,
+  [0xf8] = 0x0038, [0xf9] = 0x0039, [0xfa] = 0x0417, [0xfb] = 0x0428,
+  [0xfc] = 0x042d, [0xfd] = 0x0429, [0xfe] = 0x0427, [0xff] = 0x009f
+};
+
+static const struct gap from_idx[] =
+{
+  { start: 0x0000, end: 0x00a0, idx:     0 },
+  { start: 0x00ad, end: 0x00ad, idx:   -12 },
+  { start: 0x0401, end: 0x045e, idx:  -863 },
+  { start: 0x0492, end: 0x0493, idx:  -914 },
+  { start: 0x049a, end: 0x049b, idx:  -920 },
+  { start: 0x04a2, end: 0x04a3, idx:  -926 },
+  { start: 0x04ae, end: 0x04b1, idx:  -936 },
+  { start: 0x04ba, end: 0x04bb, idx:  -944 },
+  { start: 0x04d8, end: 0x04d9, idx:  -972 },
+  { start: 0x04e8, end: 0x04e9, idx:  -986 },
+  { start: 0x20ac, end: 0x20ac, idx: -8092 },
+  { start: 0x2116, end: 0x2116, idx: -8197 },
+  { start: 0xffff, end: 0xffff, idx:     0 }
+};
+
+static const char from_ucs4[] =
+{
+  '\x00', '\x01', '\x02', '\x03', '\x37', '\x2d', '\x2e', '\x2f',
+  '\x16', '\x05', '\x25', '\x0b', '\x0c', '\x0d', '\x0e', '\x0f',
+  '\x10', '\x11', '\x12', '\x13', '\x3c', '\x3d', '\x32', '\x26',
+  '\x18', '\x19', '\x3f', '\x27', '\x1c', '\x1d', '\x1e', '\x1f',
+  '\x40', '\x4f', '\x7f', '\x7b', '\x5b', '\x6c', '\x50', '\x7d',
+  '\x4d', '\x5d', '\x5c', '\x4e', '\x6b', '\x60', '\x4b', '\x61',
+  '\xf0', '\xf1', '\xf2', '\xf3', '\xf4', '\xf5', '\xf6', '\xf7',
+  '\xf8', '\xf9', '\x7a', '\x5e', '\x4c', '\x7e', '\x6e', '\x6f',
+  '\x7c', '\xc1', '\xc2', '\xc3', '\xc4', '\xc5', '\xc6', '\xc7',
+  '\xc8', '\xc9', '\xd1', '\xd2', '\xd3', '\xd4', '\xd5', '\xd6',
+  '\xd7', '\xd8', '\xd9', '\xe2', '\xe3', '\xe4', '\xe5', '\xe6',
+  '\xe7', '\xe8', '\xe9', '\x4a', '\xe0', '\x5a', '\x5f', '\x6d',
+  '\x79', '\x81', '\x82', '\x83', '\x84', '\x85', '\x86', '\x87',
+  '\x88', '\x89', '\x91', '\x92', '\x93', '\x94', '\x95', '\x96',
+  '\x97', '\x98', '\x99', '\xa2', '\xa3', '\xa4', '\xa5', '\xa6',
+  '\xa7', '\xa8', '\xa9', '\xc0', '\x6a', '\xd0', '\xa1', '\x07',
+  '\x20', '\x21', '\x22', '\x23', '\x24', '\x15', '\x06', '\x17',
+  '\x28', '\x29', '\x2a', '\x2b', '\x2c', '\x09', '\x0a', '\x1b',
+  '\x30', '\x31', '\x1a', '\x33', '\x34', '\x35', '\x36', '\x08',
+  '\x38', '\x39', '\x3a', '\x3b', '\x04', '\x14', '\x3e', '\xff',
+  '\x41', '\x73', '\x63', '\x00', '\x00', '\x64', '\x65', '\x66',
+  '\x00', '\x68', '\x00', '\x00', '\x00', '\x00', '\x00', '\x74',
+  '\x00', '\xb9', '\xba', '\xed', '\xbf', '\xbc', '\xbd', '\xec',
+  '\xfa', '\xcb', '\xcc', '\xcd', '\xce', '\xcf', '\xda', '\xdb',
+  '\xdc', '\xde', '\xdf', '\xea', '\xeb', '\xbe', '\xca', '\xbb',
+  '\xfe', '\xfb', '\xfd', '\x57', '\xef', '\xee', '\xfc', '\xb8',
+  '\xdd', '\x77', '\x78', '\xaf', '\x8d', '\x8a', '\x8b', '\xae',
+  '\xb2', '\x8f', '\x90', '\x9a', '\x9b', '\x9c', '\x9d', '\x9e',
+  '\x9f', '\xaa', '\xab', '\xac', '\xad', '\x8c', '\x8e', '\x80',
+  '\xb6', '\xb3', '\xb5', '\xb7', '\xb1', '\xb0', '\xb4', '\x76',
+  '\xa0', '\x00', '\x44', '\x00', '\x00', '\x45', '\x46', '\x47',
+  '\x00', '\x49', '\x00', '\x00', '\x00', '\x00', '\x00', '\x55',
+  '\x62', '\x43', '\x67', '\x48', '\x69', '\x51', '\x72', '\x54',
+  '\x71', '\x53', '\x75', '\x56', '\x59', '\x42', '\x70', '\x52',
+  '\xe1', '\x58'
+};
diff --git a/iconvdata/ibm1167.c b/iconvdata/ibm1167.c
new file mode 100644
index 0000000000..5a05d799aa
--- /dev/null
+++ b/iconvdata/ibm1167.c
@@ -0,0 +1,29 @@
+/* Conversion from and to IBM1167.
+   Copyright (C) 2005 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#include <stdint.h>
+
+/* Get the conversion table.  */
+#define TABLES <ibm1167.h>
+
+#define CHARSET_NAME	"IBM1167//"
+#define HAS_HOLES	0	/* All 256 character are defined.  */
+
+#include <8bit-gap.c>
diff --git a/iconvdata/ibm1167.h b/iconvdata/ibm1167.h
new file mode 100644
index 0000000000..b19e268e34
--- /dev/null
+++ b/iconvdata/ibm1167.h
@@ -0,0 +1,156 @@
+/* Tables for conversion from and to IBM1167.
+   Copyright (C) 2005 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+static const uint32_t to_ucs4[256] =
+{
+  [0x00] = 0x0000, [0x01] = 0x0001, [0x02] = 0x0002, [0x03] = 0x0003,
+  [0x04] = 0x0004, [0x05] = 0x0005, [0x06] = 0x0006, [0x07] = 0x0007,
+  [0x08] = 0x0008, [0x09] = 0x0009, [0x0a] = 0x000a, [0x0b] = 0x000b,
+  [0x0c] = 0x000c, [0x0d] = 0x000d, [0x0e] = 0x000e, [0x0f] = 0x000f,
+  [0x10] = 0x0010, [0x11] = 0x0011, [0x12] = 0x0012, [0x13] = 0x0013,
+  [0x14] = 0x0014, [0x15] = 0x0015, [0x16] = 0x0016, [0x17] = 0x0017,
+  [0x18] = 0x0018, [0x19] = 0x0019, [0x1a] = 0x001a, [0x1b] = 0x001b,
+  [0x1c] = 0x001c, [0x1d] = 0x001d, [0x1e] = 0x001e, [0x1f] = 0x001f,
+  [0x20] = 0x0020, [0x21] = 0x0021, [0x22] = 0x0022, [0x23] = 0x0023,
+  [0x24] = 0x0024, [0x25] = 0x0025, [0x26] = 0x0026, [0x27] = 0x0027,
+  [0x28] = 0x0028, [0x29] = 0x0029, [0x2a] = 0x002a, [0x2b] = 0x002b,
+  [0x2c] = 0x002c, [0x2d] = 0x002d, [0x2e] = 0x002e, [0x2f] = 0x002f,
+  [0x30] = 0x0030, [0x31] = 0x0031, [0x32] = 0x0032, [0x33] = 0x0033,
+  [0x34] = 0x0034, [0x35] = 0x0035, [0x36] = 0x0036, [0x37] = 0x0037,
+  [0x38] = 0x0038, [0x39] = 0x0039, [0x3a] = 0x003a, [0x3b] = 0x003b,
+  [0x3c] = 0x003c, [0x3d] = 0x003d, [0x3e] = 0x003e, [0x3f] = 0x003f,
+  [0x40] = 0x0040, [0x41] = 0x0041, [0x42] = 0x0042, [0x43] = 0x0043,
+  [0x44] = 0x0044, [0x45] = 0x0045, [0x46] = 0x0046, [0x47] = 0x0047,
+  [0x48] = 0x0048, [0x49] = 0x0049, [0x4a] = 0x004a, [0x4b] = 0x004b,
+  [0x4c] = 0x004c, [0x4d] = 0x004d, [0x4e] = 0x004e, [0x4f] = 0x004f,
+  [0x50] = 0x0050, [0x51] = 0x0051, [0x52] = 0x0052, [0x53] = 0x0053,
+  [0x54] = 0x0054, [0x55] = 0x0055, [0x56] = 0x0056, [0x57] = 0x0057,
+  [0x58] = 0x0058, [0x59] = 0x0059, [0x5a] = 0x005a, [0x5b] = 0x005b,
+  [0x5c] = 0x005c, [0x5d] = 0x005d, [0x5e] = 0x005e, [0x5f] = 0x005f,
+  [0x60] = 0x0060, [0x61] = 0x0061, [0x62] = 0x0062, [0x63] = 0x0063,
+  [0x64] = 0x0064, [0x65] = 0x0065, [0x66] = 0x0066, [0x67] = 0x0067,
+  [0x68] = 0x0068, [0x69] = 0x0069, [0x6a] = 0x006a, [0x6b] = 0x006b,
+  [0x6c] = 0x006c, [0x6d] = 0x006d, [0x6e] = 0x006e, [0x6f] = 0x006f,
+  [0x70] = 0x0070, [0x71] = 0x0071, [0x72] = 0x0072, [0x73] = 0x0073,
+  [0x74] = 0x0074, [0x75] = 0x0075, [0x76] = 0x0076, [0x77] = 0x0077,
+  [0x78] = 0x0078, [0x79] = 0x0079, [0x7a] = 0x007a, [0x7b] = 0x007b,
+  [0x7c] = 0x007c, [0x7d] = 0x007d, [0x7e] = 0x007e, [0x7f] = 0x007f,
+  [0x80] = 0x2500, [0x81] = 0x2502, [0x82] = 0x250c, [0x83] = 0x2510,
+  [0x84] = 0x2514, [0x85] = 0x2518, [0x86] = 0x251c, [0x87] = 0x2524,
+  [0x88] = 0x252c, [0x89] = 0x2534, [0x8a] = 0x253c, [0x8b] = 0x2580,
+  [0x8c] = 0x2584, [0x8d] = 0x2588, [0x8e] = 0x258c, [0x8f] = 0x2590,
+  [0x90] = 0x2591, [0x91] = 0x2592, [0x92] = 0x2593, [0x93] = 0x201c,
+  [0x94] = 0x25a0, [0x95] = 0x2219, [0x96] = 0x201d, [0x97] = 0x2014,
+  [0x98] = 0x2116, [0x99] = 0x2122, [0x9a] = 0x00a0, [0x9b] = 0x00bb,
+  [0x9c] = 0x00ae, [0x9d] = 0x00ab, [0x9e] = 0x00b7, [0x9f] = 0x00a4,
+  [0xa0] = 0x2550, [0xa1] = 0x2551, [0xa2] = 0x2552, [0xa3] = 0x0451,
+  [0xa4] = 0x0454, [0xa5] = 0x2554, [0xa6] = 0x0456, [0xa7] = 0x0457,
+  [0xa8] = 0x2557, [0xa9] = 0x2558, [0xaa] = 0x2559, [0xab] = 0x255a,
+  [0xac] = 0x255b, [0xad] = 0x0491, [0xae] = 0x045e, [0xaf] = 0x255e,
+  [0xb0] = 0x255f, [0xb1] = 0x2560, [0xb2] = 0x2561, [0xb3] = 0x0401,
+  [0xb4] = 0x0404, [0xb5] = 0x2563, [0xb6] = 0x0406, [0xb7] = 0x0407,
+  [0xb8] = 0x2566, [0xb9] = 0x2567, [0xba] = 0x2568, [0xbb] = 0x2569,
+  [0xbc] = 0x256a, [0xbd] = 0x0490, [0xbe] = 0x040e, [0xbf] = 0x00a9,
+  [0xc0] = 0x044e, [0xc1] = 0x0430, [0xc2] = 0x0431, [0xc3] = 0x0446,
+  [0xc4] = 0x0434, [0xc5] = 0x0435, [0xc6] = 0x0444, [0xc7] = 0x0433,
+  [0xc8] = 0x0445, [0xc9] = 0x0438, [0xca] = 0x0439, [0xcb] = 0x043a,
+  [0xcc] = 0x043b, [0xcd] = 0x043c, [0xce] = 0x043d, [0xcf] = 0x043e,
+  [0xd0] = 0x043f, [0xd1] = 0x044f, [0xd2] = 0x0440, [0xd3] = 0x0441,
+  [0xd4] = 0x0442, [0xd5] = 0x0443, [0xd6] = 0x0436, [0xd7] = 0x0432,
+  [0xd8] = 0x044c, [0xd9] = 0x044b, [0xda] = 0x0437, [0xdb] = 0x0448,
+  [0xdc] = 0x044d, [0xdd] = 0x0449, [0xde] = 0x0447, [0xdf] = 0x044a,
+  [0xe0] = 0x042e, [0xe1] = 0x0410, [0xe2] = 0x0411, [0xe3] = 0x0426,
+  [0xe4] = 0x0414, [0xe5] = 0x0415, [0xe6] = 0x0424, [0xe7] = 0x0413,
+  [0xe8] = 0x0425, [0xe9] = 0x0418, [0xea] = 0x0419, [0xeb] = 0x041a,
+  [0xec] = 0x041b, [0xed] = 0x041c, [0xee] = 0x041d, [0xef] = 0x041e,
+  [0xf0] = 0x041f, [0xf1] = 0x042f, [0xf2] = 0x0420, [0xf3] = 0x0421,
+  [0xf4] = 0x0422, [0xf5] = 0x0423, [0xf6] = 0x0416, [0xf7] = 0x0412,
+  [0xf8] = 0x042c, [0xf9] = 0x042b, [0xfa] = 0x0417, [0xfb] = 0x0428,
+  [0xfc] = 0x042d, [0xfd] = 0x0429, [0xfe] = 0x0427, [0xff] = 0x042a
+};
+
+static const struct gap from_idx[] =
+{
+  { start: 0x0000, end: 0x007f, idx:     0 },
+  { start: 0x00a0, end: 0x00ae, idx:   -32 },
+  { start: 0x00b7, end: 0x00bb, idx:   -40 },
+  { start: 0x0401, end: 0x0407, idx:  -877 },
+  { start: 0x040e, end: 0x0457, idx:  -883 },
+  { start: 0x045e, end: 0x045e, idx:  -889 },
+  { start: 0x0490, end: 0x0491, idx:  -938 },
+  { start: 0x2014, end: 0x2014, idx: -7980 },
+  { start: 0x201c, end: 0x201d, idx: -7987 },
+  { start: 0x2116, end: 0x2116, idx: -8235 },
+  { start: 0x2122, end: 0x2122, idx: -8246 },
+  { start: 0x2219, end: 0x2219, idx: -8492 },
+  { start: 0x2500, end: 0x2502, idx: -9234 },
+  { start: 0x250c, end: 0x251c, idx: -9243 },
+  { start: 0x2524, end: 0x2524, idx: -9250 },
+  { start: 0x252c, end: 0x252c, idx: -9257 },
+  { start: 0x2534, end: 0x2534, idx: -9264 },
+  { start: 0x253c, end: 0x253c, idx: -9271 },
+  { start: 0x2550, end: 0x256a, idx: -9290 },
+  { start: 0x2580, end: 0x2593, idx: -9311 },
+  { start: 0x25a0, end: 0x25a0, idx: -9323 },
+  { start: 0xffff, end: 0xffff, idx:     0 }
+};
+
+static const char from_ucs4[] =
+{
+  '\x00', '\x01', '\x02', '\x03', '\x04', '\x05', '\x06', '\x07',
+  '\x08', '\x09', '\x0a', '\x0b', '\x0c', '\x0d', '\x0e', '\x0f',
+  '\x10', '\x11', '\x12', '\x13', '\x14', '\x15', '\x16', '\x17',
+  '\x18', '\x19', '\x1a', '\x1b', '\x1c', '\x1d', '\x1e', '\x1f',
+  '\x20', '\x21', '\x22', '\x23', '\x24', '\x25', '\x26', '\x27',
+  '\x28', '\x29', '\x2a', '\x2b', '\x2c', '\x2d', '\x2e', '\x2f',
+  '\x30', '\x31', '\x32', '\x33', '\x34', '\x35', '\x36', '\x37',
+  '\x38', '\x39', '\x3a', '\x3b', '\x3c', '\x3d', '\x3e', '\x3f',
+  '\x40', '\x41', '\x42', '\x43', '\x44', '\x45', '\x46', '\x47',
+  '\x48', '\x49', '\x4a', '\x4b', '\x4c', '\x4d', '\x4e', '\x4f',
+  '\x50', '\x51', '\x52', '\x53', '\x54', '\x55', '\x56', '\x57',
+  '\x58', '\x59', '\x5a', '\x5b', '\x5c', '\x5d', '\x5e', '\x5f',
+  '\x60', '\x61', '\x62', '\x63', '\x64', '\x65', '\x66', '\x67',
+  '\x68', '\x69', '\x6a', '\x6b', '\x6c', '\x6d', '\x6e', '\x6f',
+  '\x70', '\x71', '\x72', '\x73', '\x74', '\x75', '\x76', '\x77',
+  '\x78', '\x79', '\x7a', '\x7b', '\x7c', '\x7d', '\x7e', '\x7f',
+  '\x9a', '\x00', '\x00', '\x00', '\x9f', '\x00', '\x00', '\x00',
+  '\x00', '\xbf', '\x00', '\x9d', '\x00', '\x00', '\x9c', '\x9e',
+  '\x00', '\x00', '\x00', '\x9b', '\xb3', '\x00', '\x00', '\xb4',
+  '\x00', '\xb6', '\xb7', '\xbe', '\x00', '\xe1', '\xe2', '\xf7',
+  '\xe7', '\xe4', '\xe5', '\xf6', '\xfa', '\xe9', '\xea', '\xeb',
+  '\xec', '\xed', '\xee', '\xef', '\xf0', '\xf2', '\xf3', '\xf4',
+  '\xf5', '\xe6', '\xe8', '\xe3', '\xfe', '\xfb', '\xfd', '\xff',
+  '\xf9', '\xf8', '\xfc', '\xe0', '\xf1', '\xc1', '\xc2', '\xd7',
+  '\xc7', '\xc4', '\xc5', '\xd6', '\xda', '\xc9', '\xca', '\xcb',
+  '\xcc', '\xcd', '\xce', '\xcf', '\xd0', '\xd2', '\xd3', '\xd4',
+  '\xd5', '\xc6', '\xc8', '\xc3', '\xde', '\xdb', '\xdd', '\xdf',
+  '\xd9', '\xd8', '\xdc', '\xc0', '\xd1', '\x00', '\xa3', '\x00',
+  '\x00', '\xa4', '\x00', '\xa6', '\xa7', '\xae', '\xbd', '\xad',
+  '\x97', '\x93', '\x96', '\x98', '\x99', '\x95', '\x80', '\x00',
+  '\x81', '\x82', '\x00', '\x00', '\x00', '\x83', '\x00', '\x00',
+  '\x00', '\x84', '\x00', '\x00', '\x00', '\x85', '\x00', '\x00',
+  '\x00', '\x86', '\x87', '\x88', '\x89', '\x8a', '\xa0', '\xa1',
+  '\xa2', '\x00', '\xa5', '\x00', '\x00', '\xa8', '\xa9', '\xaa',
+  '\xab', '\xac', '\x00', '\x00', '\xaf', '\xb0', '\xb1', '\xb2',
+  '\x00', '\xb5', '\x00', '\x00', '\xb8', '\xb9', '\xba', '\xbb',
+  '\xbc', '\x8b', '\x00', '\x00', '\x00', '\x8c', '\x00', '\x00',
+  '\x00', '\x8d', '\x00', '\x00', '\x00', '\x8e', '\x00', '\x00',
+  '\x00', '\x8f', '\x90', '\x91', '\x92', '\x94'
+};
diff --git a/iconvdata/ibm12712.c b/iconvdata/ibm12712.c
new file mode 100644
index 0000000000..8bc0760953
--- /dev/null
+++ b/iconvdata/ibm12712.c
@@ -0,0 +1,29 @@
+/* Conversion from and to IBM12712.
+   Copyright (C) 2005 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#include <stdint.h>
+
+/* Get the conversion table.  */
+#define TABLES <ibm12712.h>
+
+#define CHARSET_NAME	"IBM12712//"
+#define HAS_HOLES	1	/* Not all 256 character are defined.  */
+
+#include <8bit-gap.c>
diff --git a/iconvdata/ibm12712.h b/iconvdata/ibm12712.h
new file mode 100644
index 0000000000..1c42e6fc5d
--- /dev/null
+++ b/iconvdata/ibm12712.h
@@ -0,0 +1,129 @@
+/* Tables for conversion from and to IBM12712.
+   Copyright (C) 2005 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+static const uint32_t to_ucs4[256] =
+{
+  [0x00] = 0x0000, [0x01] = 0x0001, [0x02] = 0x0002, [0x03] = 0x0003,
+  [0x04] = 0x009c, [0x05] = 0x0009, [0x06] = 0x0086, [0x07] = 0x007f,
+  [0x08] = 0x0097, [0x09] = 0x008d, [0x0a] = 0x008e, [0x0b] = 0x000b,
+  [0x0c] = 0x000c, [0x0d] = 0x000d, [0x0e] = 0x000e, [0x0f] = 0x000f,
+  [0x10] = 0x0010, [0x11] = 0x0011, [0x12] = 0x0012, [0x13] = 0x0013,
+  [0x14] = 0x009d, [0x15] = 0x0085, [0x16] = 0x0008, [0x17] = 0x0087,
+  [0x18] = 0x0018, [0x19] = 0x0019, [0x1a] = 0x0092, [0x1b] = 0x008f,
+  [0x1c] = 0x001c, [0x1d] = 0x001d, [0x1e] = 0x001e, [0x1f] = 0x001f,
+  [0x20] = 0x0080, [0x21] = 0x0081, [0x22] = 0x0082, [0x23] = 0x0083,
+  [0x24] = 0x0084, [0x25] = 0x000a, [0x26] = 0x0017, [0x27] = 0x001b,
+  [0x28] = 0x0088, [0x29] = 0x0089, [0x2a] = 0x008a, [0x2b] = 0x008b,
+  [0x2c] = 0x008c, [0x2d] = 0x0005, [0x2e] = 0x0006, [0x2f] = 0x0007,
+  [0x30] = 0x0090, [0x31] = 0x0091, [0x32] = 0x0016, [0x33] = 0x0093,
+  [0x34] = 0x0094, [0x35] = 0x0095, [0x36] = 0x0096, [0x37] = 0x0004,
+  [0x38] = 0x0098, [0x39] = 0x0099, [0x3a] = 0x009a, [0x3b] = 0x009b,
+  [0x3c] = 0x0014, [0x3d] = 0x0015, [0x3e] = 0x009e, [0x3f] = 0x001a,
+  [0x40] = 0x0020, [0x41] = 0x05d0, [0x42] = 0x05d1, [0x43] = 0x05d2,
+  [0x44] = 0x05d3, [0x45] = 0x05d4, [0x46] = 0x05d5, [0x47] = 0x05d6,
+  [0x48] = 0x05d7, [0x49] = 0x05d8, [0x4a] = 0x00a2, [0x4b] = 0x002e,
+  [0x4c] = 0x003c, [0x4d] = 0x0028, [0x4e] = 0x002b, [0x4f] = 0x007c,
+  [0x50] = 0x0026, [0x51] = 0x05d9, [0x52] = 0x05da, [0x53] = 0x05db,
+  [0x54] = 0x05dc, [0x55] = 0x05dd, [0x56] = 0x05de, [0x57] = 0x05df,
+  [0x58] = 0x05e0, [0x59] = 0x05e1, [0x5a] = 0x0021, [0x5b] = 0x0024,
+  [0x5c] = 0x002a, [0x5d] = 0x0029, [0x5e] = 0x003b, [0x5f] = 0x00ac,
+  [0x60] = 0x002d, [0x61] = 0x002f, [0x62] = 0x05e2, [0x63] = 0x05e3,
+  [0x64] = 0x05e4, [0x65] = 0x05e5, [0x66] = 0x05e6, [0x67] = 0x05e7,
+  [0x68] = 0x05e8, [0x69] = 0x05e9, [0x6a] = 0x00a6, [0x6b] = 0x002c,
+  [0x6c] = 0x0025, [0x6d] = 0x005f, [0x6e] = 0x003e, [0x6f] = 0x003f,
+  [0x71] = 0x05ea, [0x74] = 0x00a0, [0x78] = 0x2017, [0x79] = 0x0060,
+  [0x7a] = 0x003a, [0x7b] = 0x0023, [0x7c] = 0x0040, [0x7d] = 0x0027,
+  [0x7e] = 0x003d, [0x7f] = 0x0022, [0x81] = 0x0061, [0x82] = 0x0062,
+  [0x83] = 0x0063, [0x84] = 0x0064, [0x85] = 0x0065, [0x86] = 0x0066,
+  [0x87] = 0x0067, [0x88] = 0x0068, [0x89] = 0x0069, [0x8a] = 0x00ab,
+  [0x8b] = 0x00bb, [0x8f] = 0x00b1, [0x90] = 0x00b0, [0x91] = 0x006a,
+  [0x92] = 0x006b, [0x93] = 0x006c, [0x94] = 0x006d, [0x95] = 0x006e,
+  [0x96] = 0x006f, [0x97] = 0x0070, [0x98] = 0x0071, [0x99] = 0x0072,
+  [0x9c] = 0x20ac, [0x9d] = 0x00b8, [0x9e] = 0x20aa, [0x9f] = 0x00a4,
+  [0xa0] = 0x00b5, [0xa1] = 0x007e, [0xa2] = 0x0073, [0xa3] = 0x0074,
+  [0xa4] = 0x0075, [0xa5] = 0x0076, [0xa6] = 0x0077, [0xa7] = 0x0078,
+  [0xa8] = 0x0079, [0xa9] = 0x007a, [0xaf] = 0x00ae, [0xb0] = 0x005e,
+  [0xb1] = 0x00a3, [0xb2] = 0x00a5, [0xb3] = 0x2022, [0xb4] = 0x00a9,
+  [0xb5] = 0x00a7, [0xb6] = 0x00b6, [0xb7] = 0x00bc, [0xb8] = 0x00bd,
+  [0xb9] = 0x00be, [0xba] = 0x005b, [0xbb] = 0x005d, [0xbc] = 0x203e,
+  [0xbd] = 0x00a8, [0xbe] = 0x00b4, [0xbf] = 0x00d7, [0xc0] = 0x007b,
+  [0xc1] = 0x0041, [0xc2] = 0x0042, [0xc3] = 0x0043, [0xc4] = 0x0044,
+  [0xc5] = 0x0045, [0xc6] = 0x0046, [0xc7] = 0x0047, [0xc8] = 0x0048,
+  [0xc9] = 0x0049, [0xca] = 0x00ad, [0xd0] = 0x007d, [0xd1] = 0x004a,
+  [0xd2] = 0x004b, [0xd3] = 0x004c, [0xd4] = 0x004d, [0xd5] = 0x004e,
+  [0xd6] = 0x004f, [0xd7] = 0x0050, [0xd8] = 0x0051, [0xd9] = 0x0052,
+  [0xda] = 0x00b9, [0xdb] = 0x202d, [0xdc] = 0x202e, [0xdd] = 0x202c,
+  [0xe0] = 0x005c, [0xe1] = 0x00f7, [0xe2] = 0x0053, [0xe3] = 0x0054,
+  [0xe4] = 0x0055, [0xe5] = 0x0056, [0xe6] = 0x0057, [0xe7] = 0x0058,
+  [0xe8] = 0x0059, [0xe9] = 0x005a, [0xea] = 0x00b2, [0xf0] = 0x0030,
+  [0xf1] = 0x0031, [0xf2] = 0x0032, [0xf3] = 0x0033, [0xf4] = 0x0034,
+  [0xf5] = 0x0035, [0xf6] = 0x0036, [0xf7] = 0x0037, [0xf8] = 0x0038,
+  [0xf9] = 0x0039, [0xfa] = 0x00b3, [0xfb] = 0x202a, [0xfc] = 0x202b,
+  [0xfd] = 0x200e, [0xfe] = 0x200f, [0xff] = 0x009f
+};
+
+static const struct gap from_idx[] =
+{
+  { start: 0x0000, end: 0x00be, idx:     0 },
+  { start: 0x00d7, end: 0x00d7, idx:   -24 },
+  { start: 0x00f7, end: 0x00f7, idx:   -55 },
+  { start: 0x05d0, end: 0x05ea, idx: -1295 },
+  { start: 0x200e, end: 0x200f, idx: -7986 },
+  { start: 0x2017, end: 0x2017, idx: -7993 },
+  { start: 0x2022, end: 0x2022, idx: -8003 },
+  { start: 0x202a, end: 0x202e, idx: -8010 },
+  { start: 0x203e, end: 0x203e, idx: -8025 },
+  { start: 0x20aa, end: 0x20ac, idx: -8132 },
+  { start: 0xffff, end: 0xffff, idx:     0 }
+};
+
+static const char from_ucs4[] =
+{
+  '\x00', '\x01', '\x02', '\x03', '\x37', '\x2d', '\x2e', '\x2f',
+  '\x16', '\x05', '\x25', '\x0b', '\x0c', '\x0d', '\x0e', '\x0f',
+  '\x10', '\x11', '\x12', '\x13', '\x3c', '\x3d', '\x32', '\x26',
+  '\x18', '\x19', '\x3f', '\x27', '\x1c', '\x1d', '\x1e', '\x1f',
+  '\x40', '\x5a', '\x7f', '\x7b', '\x5b', '\x6c', '\x50', '\x7d',
+  '\x4d', '\x5d', '\x5c', '\x4e', '\x6b', '\x60', '\x4b', '\x61',
+  '\xf0', '\xf1', '\xf2', '\xf3', '\xf4', '\xf5', '\xf6', '\xf7',
+  '\xf8', '\xf9', '\x7a', '\x5e', '\x4c', '\x7e', '\x6e', '\x6f',
+  '\x7c', '\xc1', '\xc2', '\xc3', '\xc4', '\xc5', '\xc6', '\xc7',
+  '\xc8', '\xc9', '\xd1', '\xd2', '\xd3', '\xd4', '\xd5', '\xd6',
+  '\xd7', '\xd8', '\xd9', '\xe2', '\xe3', '\xe4', '\xe5', '\xe6',
+  '\xe7', '\xe8', '\xe9', '\xba', '\xe0', '\xbb', '\xb0', '\x6d',
+  '\x79', '\x81', '\x82', '\x83', '\x84', '\x85', '\x86', '\x87',
+  '\x88', '\x89', '\x91', '\x92', '\x93', '\x94', '\x95', '\x96',
+  '\x97', '\x98', '\x99', '\xa2', '\xa3', '\xa4', '\xa5', '\xa6',
+  '\xa7', '\xa8', '\xa9', '\xc0', '\x4f', '\xd0', '\xa1', '\x07',
+  '\x20', '\x21', '\x22', '\x23', '\x24', '\x15', '\x06', '\x17',
+  '\x28', '\x29', '\x2a', '\x2b', '\x2c', '\x09', '\x0a', '\x1b',
+  '\x30', '\x31', '\x1a', '\x33', '\x34', '\x35', '\x36', '\x08',
+  '\x38', '\x39', '\x3a', '\x3b', '\x04', '\x14', '\x3e', '\xff',
+  '\x74', '\x00', '\x4a', '\xb1', '\x9f', '\xb2', '\x6a', '\xb5',
+  '\xbd', '\xb4', '\x00', '\x8a', '\x5f', '\xca', '\xaf', '\x00',
+  '\x90', '\x8f', '\xea', '\xfa', '\xbe', '\xa0', '\xb6', '\x00',
+  '\x9d', '\xda', '\x00', '\x8b', '\xb7', '\xb8', '\xb9', '\xbf',
+  '\xe1', '\x41', '\x42', '\x43', '\x44', '\x45', '\x46', '\x47',
+  '\x48', '\x49', '\x51', '\x52', '\x53', '\x54', '\x55', '\x56',
+  '\x57', '\x58', '\x59', '\x62', '\x63', '\x64', '\x65', '\x66',
+  '\x67', '\x68', '\x69', '\x71', '\xfd', '\xfe', '\x78', '\xb3',
+  '\xfb', '\xfc', '\xdd', '\xdb', '\xdc', '\xbc', '\x9e', '\x00',
+  '\x9c'
+};
diff --git a/iconvdata/ibm16804.c b/iconvdata/ibm16804.c
new file mode 100644
index 0000000000..2e5f65ea8c
--- /dev/null
+++ b/iconvdata/ibm16804.c
@@ -0,0 +1,29 @@
+/* Conversion from and to IBM16804.
+   Copyright (C) 2005 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#include <stdint.h>
+
+/* Get the conversion table.  */
+#define TABLES <ibm16804.h>
+
+#define CHARSET_NAME	"IBM16804//"
+#define HAS_HOLES	1	/* Not all 256 character are defined.  */
+
+#include <8bit-gap.c>
diff --git a/iconvdata/ibm16804.h b/iconvdata/ibm16804.h
new file mode 100644
index 0000000000..699ef659fa
--- /dev/null
+++ b/iconvdata/ibm16804.h
@@ -0,0 +1,152 @@
+/* Tables for conversion from and to IBM16804.
+   Copyright (C) 2005 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+static const uint32_t to_ucs4[256] =
+{
+  [0x00] = 0x0000, [0x01] = 0x0001, [0x02] = 0x0002, [0x03] = 0x0003,
+  [0x04] = 0x009c, [0x05] = 0x0009, [0x06] = 0x0086, [0x07] = 0x007f,
+  [0x08] = 0x0097, [0x09] = 0x008d, [0x0a] = 0x008e, [0x0b] = 0x000b,
+  [0x0c] = 0x000c, [0x0d] = 0x000d, [0x0e] = 0x000e, [0x0f] = 0x000f,
+  [0x10] = 0x0010, [0x11] = 0x0011, [0x12] = 0x0012, [0x13] = 0x0013,
+  [0x14] = 0x009d, [0x15] = 0x0085, [0x16] = 0x0008, [0x17] = 0x0087,
+  [0x18] = 0x0018, [0x19] = 0x0019, [0x1a] = 0x0092, [0x1b] = 0x008f,
+  [0x1c] = 0x001c, [0x1d] = 0x001d, [0x1e] = 0x001e, [0x1f] = 0x001f,
+  [0x20] = 0x0080, [0x21] = 0x0081, [0x22] = 0x0082, [0x23] = 0x0083,
+  [0x24] = 0x0084, [0x25] = 0x000a, [0x26] = 0x0017, [0x27] = 0x001b,
+  [0x28] = 0x0088, [0x29] = 0x0089, [0x2a] = 0x008a, [0x2b] = 0x008b,
+  [0x2c] = 0x008c, [0x2d] = 0x0005, [0x2e] = 0x0006, [0x2f] = 0x0007,
+  [0x30] = 0x0090, [0x31] = 0x0091, [0x32] = 0x0016, [0x33] = 0x0093,
+  [0x34] = 0x0094, [0x35] = 0x0095, [0x36] = 0x0096, [0x37] = 0x0004,
+  [0x38] = 0x0098, [0x39] = 0x0099, [0x3a] = 0x009a, [0x3b] = 0x009b,
+  [0x3c] = 0x0014, [0x3d] = 0x0015, [0x3e] = 0x009e, [0x3f] = 0x001a,
+  [0x40] = 0x0020, [0x41] = 0x00a0, [0x42] = 0x0651, [0x43] = 0xfe7d,
+  [0x44] = 0x0640, [0x45] = 0x200b, [0x46] = 0x0621, [0x47] = 0x0622,
+  [0x48] = 0xfe82, [0x49] = 0x0623, [0x4a] = 0x00a2, [0x4b] = 0x002e,
+  [0x4c] = 0x003c, [0x4d] = 0x0028, [0x4e] = 0x002b, [0x4f] = 0x007c,
+  [0x50] = 0x0026, [0x51] = 0xfe84, [0x52] = 0x0624, [0x55] = 0x0626,
+  [0x56] = 0x0627, [0x57] = 0xfe8e, [0x58] = 0x0628, [0x59] = 0xfe91,
+  [0x5a] = 0x0021, [0x5b] = 0x0024, [0x5c] = 0x002a, [0x5d] = 0x0029,
+  [0x5e] = 0x003b, [0x5f] = 0x00ac, [0x60] = 0x002d, [0x61] = 0x002f,
+  [0x62] = 0x0629, [0x63] = 0x062a, [0x64] = 0xfe97, [0x65] = 0x062b,
+  [0x66] = 0xfe9b, [0x67] = 0x062c, [0x68] = 0xfe9f, [0x69] = 0x062d,
+  [0x6a] = 0x00a6, [0x6b] = 0x002c, [0x6c] = 0x0025, [0x6d] = 0x005f,
+  [0x6e] = 0x003e, [0x6f] = 0x003f, [0x70] = 0xfea3, [0x71] = 0x062e,
+  [0x72] = 0xfea7, [0x73] = 0x062f, [0x74] = 0x0630, [0x75] = 0x0631,
+  [0x76] = 0x0632, [0x77] = 0x0633, [0x78] = 0xfeb3, [0x79] = 0x060c,
+  [0x7a] = 0x003a, [0x7b] = 0x0023, [0x7c] = 0x0040, [0x7d] = 0x0027,
+  [0x7e] = 0x003d, [0x7f] = 0x0022, [0x80] = 0x0634, [0x81] = 0x0061,
+  [0x82] = 0x0062, [0x83] = 0x0063, [0x84] = 0x0064, [0x85] = 0x0065,
+  [0x86] = 0x0066, [0x87] = 0x0067, [0x88] = 0x0068, [0x89] = 0x0069,
+  [0x8a] = 0xfeb7, [0x8b] = 0x0635, [0x8c] = 0xfebb, [0x8d] = 0x0636,
+  [0x8e] = 0xfebf, [0x8f] = 0x0637, [0x90] = 0x0638, [0x91] = 0x006a,
+  [0x92] = 0x006b, [0x93] = 0x006c, [0x94] = 0x006d, [0x95] = 0x006e,
+  [0x96] = 0x006f, [0x97] = 0x0070, [0x98] = 0x0071, [0x99] = 0x0072,
+  [0x9a] = 0x0639, [0x9b] = 0xfeca, [0x9c] = 0xfecb, [0x9d] = 0xfecc,
+  [0x9e] = 0x063a, [0x9f] = 0xfece, [0xa0] = 0xfecf, [0xa1] = 0x00f7,
+  [0xa2] = 0x0073, [0xa3] = 0x0074, [0xa4] = 0x0075, [0xa5] = 0x0076,
+  [0xa6] = 0x0077, [0xa7] = 0x0078, [0xa8] = 0x0079, [0xa9] = 0x007a,
+  [0xaa] = 0xfed0, [0xab] = 0x0641, [0xac] = 0xfed3, [0xad] = 0x0642,
+  [0xae] = 0xfed7, [0xaf] = 0x0643, [0xb0] = 0xfedb, [0xb1] = 0x0644,
+  [0xb2] = 0xfef5, [0xb3] = 0xfef6, [0xb4] = 0xfef7, [0xb5] = 0xfef8,
+  [0xb8] = 0xfefb, [0xb9] = 0xfefc, [0xba] = 0xfedf, [0xbb] = 0x0645,
+  [0xbc] = 0xfee3, [0xbd] = 0x0646, [0xbe] = 0xfee7, [0xbf] = 0x0647,
+  [0xc0] = 0x061b, [0xc1] = 0x0041, [0xc2] = 0x0042, [0xc3] = 0x0043,
+  [0xc4] = 0x0044, [0xc5] = 0x0045, [0xc6] = 0x0046, [0xc7] = 0x0047,
+  [0xc8] = 0x0048, [0xc9] = 0x0049, [0xca] = 0x00ad, [0xcb] = 0xfeeb,
+  [0xcd] = 0xfeec, [0xcf] = 0x0648, [0xd0] = 0x061f, [0xd1] = 0x004a,
+  [0xd2] = 0x004b, [0xd3] = 0x004c, [0xd4] = 0x004d, [0xd5] = 0x004e,
+  [0xd6] = 0x004f, [0xd7] = 0x0050, [0xd8] = 0x0051, [0xd9] = 0x0052,
+  [0xda] = 0x0649, [0xdb] = 0xfef0, [0xdc] = 0x064a, [0xdd] = 0xfef2,
+  [0xde] = 0xfef3, [0xdf] = 0x0660, [0xe0] = 0x00d7, [0xe1] = 0x2007,
+  [0xe2] = 0x0053, [0xe3] = 0x0054, [0xe4] = 0x0055, [0xe5] = 0x0056,
+  [0xe6] = 0x0057, [0xe7] = 0x0058, [0xe8] = 0x0059, [0xe9] = 0x005a,
+  [0xea] = 0x0661, [0xeb] = 0x0662, [0xed] = 0x0663, [0xee] = 0x0664,
+  [0xef] = 0x0665, [0xf0] = 0x0030, [0xf1] = 0x0031, [0xf2] = 0x0032,
+  [0xf3] = 0x0033, [0xf4] = 0x0034, [0xf5] = 0x0035, [0xf6] = 0x0036,
+  [0xf7] = 0x0037, [0xf8] = 0x0038, [0xf9] = 0x0039, [0xfa] = 0x20ac,
+  [0xfb] = 0x0666, [0xfc] = 0x0667, [0xfd] = 0x0668, [0xfe] = 0x0669,
+  [0xff] = 0x009f
+};
+
+static const struct gap from_idx[] =
+{
+  { start: 0x0000, end: 0x00ad, idx:     0 },
+  { start: 0x00d7, end: 0x00d7, idx:   -41 },
+  { start: 0x00f7, end: 0x00f7, idx:   -72 },
+  { start: 0x060c, end: 0x060c, idx: -1372 },
+  { start: 0x061b, end: 0x064a, idx: -1386 },
+  { start: 0x0651, end: 0x0651, idx: -1392 },
+  { start: 0x0660, end: 0x066d, idx: -1406 },
+  { start: 0x2007, end: 0x200b, idx: -7959 },
+  { start: 0x20ac, end: 0x20ac, idx: -8119 },
+  { start: 0xfe7c, end: 0xfefc, idx: -64902 },
+  { start: 0xffff, end: 0xffff, idx:     0 }
+};
+
+static const char from_ucs4[] =
+{
+  '\x00', '\x01', '\x02', '\x03', '\x37', '\x2d', '\x2e', '\x2f',
+  '\x16', '\x05', '\x25', '\x0b', '\x0c', '\x0d', '\x0e', '\x0f',
+  '\x10', '\x11', '\x12', '\x13', '\x3c', '\x3d', '\x32', '\x26',
+  '\x18', '\x19', '\x3f', '\x27', '\x1c', '\x1d', '\x1e', '\x1f',
+  '\x40', '\x5a', '\x7f', '\x7b', '\x5b', '\x6c', '\x50', '\x7d',
+  '\x4d', '\x5d', '\x5c', '\x4e', '\x6b', '\x60', '\x4b', '\x61',
+  '\xf0', '\xf1', '\xf2', '\xf3', '\xf4', '\xf5', '\xf6', '\xf7',
+  '\xf8', '\xf9', '\x7a', '\x5e', '\x4c', '\x7e', '\x6e', '\x6f',
+  '\x7c', '\xc1', '\xc2', '\xc3', '\xc4', '\xc5', '\xc6', '\xc7',
+  '\xc8', '\xc9', '\xd1', '\xd2', '\xd3', '\xd4', '\xd5', '\xd6',
+  '\xd7', '\xd8', '\xd9', '\xe2', '\xe3', '\xe4', '\xe5', '\xe6',
+  '\xe7', '\xe8', '\xe9', '\x00', '\x00', '\x00', '\x00', '\x6d',
+  '\x00', '\x81', '\x82', '\x83', '\x84', '\x85', '\x86', '\x87',
+  '\x88', '\x89', '\x91', '\x92', '\x93', '\x94', '\x95', '\x96',
+  '\x97', '\x98', '\x99', '\xa2', '\xa3', '\xa4', '\xa5', '\xa6',
+  '\xa7', '\xa8', '\xa9', '\x00', '\x4f', '\x00', '\x00', '\x07',
+  '\x20', '\x21', '\x22', '\x23', '\x24', '\x15', '\x06', '\x17',
+  '\x28', '\x29', '\x2a', '\x2b', '\x2c', '\x09', '\x0a', '\x1b',
+  '\x30', '\x31', '\x1a', '\x33', '\x34', '\x35', '\x36', '\x08',
+  '\x38', '\x39', '\x3a', '\x3b', '\x04', '\x14', '\x3e', '\xff',
+  '\x41', '\x00', '\x4a', '\x00', '\x00', '\x00', '\x6a', '\x00',
+  '\x00', '\x00', '\x00', '\x00', '\x5f', '\xca', '\xe0', '\xa1',
+  '\x79', '\xc0', '\x00', '\x00', '\x00', '\xd0', '\x00', '\x46',
+  '\x47', '\x49', '\x52', '\x56', '\x55', '\x56', '\x58', '\x62',
+  '\x63', '\x65', '\x67', '\x69', '\x71', '\x73', '\x74', '\x75',
+  '\x76', '\x77', '\x80', '\x8b', '\x8d', '\x8f', '\x90', '\x9a',
+  '\x9e', '\x00', '\x00', '\x00', '\x00', '\x00', '\x44', '\xab',
+  '\xad', '\xaf', '\xb1', '\xbb', '\xbd', '\xbf', '\xcf', '\xda',
+  '\xdc', '\x42', '\xdf', '\xea', '\xeb', '\xed', '\xee', '\xef',
+  '\xfb', '\xfc', '\xfd', '\xfe', '\x6c', '\x6b', '\x4b', '\x5c',
+  '\xe1', '\x00', '\x00', '\x00', '\x45', '\xfa', '\x42', '\x43',
+  '\x00', '\x00', '\x46', '\x47', '\x48', '\x49', '\x51', '\x52',
+  '\x52', '\x56', '\x57', '\x00', '\x00', '\x55', '\x55', '\x56',
+  '\x57', '\x58', '\x58', '\x59', '\x59', '\x62', '\x62', '\x63',
+  '\x63', '\x64', '\x64', '\x65', '\x65', '\x66', '\x66', '\x67',
+  '\x67', '\x68', '\x68', '\x69', '\x69', '\x70', '\x70', '\x71',
+  '\x71', '\x72', '\x72', '\x73', '\x73', '\x74', '\x74', '\x75',
+  '\x75', '\x76', '\x76', '\x77', '\x77', '\x78', '\x78', '\x80',
+  '\x80', '\x8a', '\x8a', '\x8b', '\x8b', '\x8c', '\x8c', '\x8d',
+  '\x8d', '\x8e', '\x8e', '\x8f', '\x8f', '\x8f', '\x8f', '\x90',
+  '\x90', '\x90', '\x90', '\x9a', '\x9b', '\x9c', '\x9d', '\x9e',
+  '\x9f', '\xa0', '\xaa', '\xab', '\xab', '\xac', '\xac', '\xad',
+  '\xad', '\xae', '\xae', '\xaf', '\xaf', '\xb0', '\xb0', '\xb1',
+  '\xb1', '\xba', '\xba', '\xbb', '\xbb', '\xbc', '\xbc', '\xbd',
+  '\xbd', '\xbe', '\xbe', '\xbf', '\xbf', '\xcb', '\xcd', '\xcf',
+  '\xcf', '\xda', '\xdb', '\xdc', '\xdd', '\xde', '\xde', '\xb2',
+  '\xb3', '\xb4', '\xb5', '\xb8', '\xb9', '\xb8', '\xb9'
+};
diff --git a/iconvdata/ibm4517.c b/iconvdata/ibm4517.c
new file mode 100644
index 0000000000..587172481f
--- /dev/null
+++ b/iconvdata/ibm4517.c
@@ -0,0 +1,29 @@
+/* Conversion from and to IBM4517.
+   Copyright (C) 2005 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#include <stdint.h>
+
+/* Get the conversion table.  */
+#define TABLES <ibm4517.h>
+
+#define CHARSET_NAME	"IBM4517//"
+#define HAS_HOLES	1	/* Not all 256 character are defined.  */
+
+#include <8bit-gap.c>
diff --git a/iconvdata/ibm4517.h b/iconvdata/ibm4517.h
new file mode 100644
index 0000000000..59e9f83cb7
--- /dev/null
+++ b/iconvdata/ibm4517.h
@@ -0,0 +1,156 @@
+/* Tables for conversion from and to IBM4517.
+   Copyright (C) 2005 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+static const uint32_t to_ucs4[256] =
+{
+  [0x00] = 0x0000, [0x01] = 0x0001, [0x02] = 0x0002, [0x03] = 0x0003,
+  [0x04] = 0x009c, [0x05] = 0x0009, [0x06] = 0x0086, [0x07] = 0x007f,
+  [0x08] = 0x0097, [0x09] = 0x008d, [0x0a] = 0x008e, [0x0b] = 0x000b,
+  [0x0c] = 0x000c, [0x0d] = 0x000d, [0x0e] = 0x000e, [0x0f] = 0x000f,
+  [0x10] = 0x0010, [0x11] = 0x0011, [0x12] = 0x0012, [0x13] = 0x0013,
+  [0x14] = 0x009d, [0x15] = 0x0085, [0x16] = 0x0008, [0x17] = 0x0087,
+  [0x18] = 0x0018, [0x19] = 0x0019, [0x1a] = 0x0092, [0x1b] = 0x008f,
+  [0x1c] = 0x001c, [0x1d] = 0x001d, [0x1e] = 0x001e, [0x1f] = 0x001f,
+  [0x20] = 0x0080, [0x21] = 0x0081, [0x22] = 0x0082, [0x23] = 0x0083,
+  [0x24] = 0x0084, [0x25] = 0x000a, [0x26] = 0x0017, [0x27] = 0x001b,
+  [0x28] = 0x0088, [0x29] = 0x0089, [0x2a] = 0x008a, [0x2b] = 0x008b,
+  [0x2c] = 0x008c, [0x2d] = 0x0005, [0x2e] = 0x0006, [0x2f] = 0x0007,
+  [0x30] = 0x0090, [0x31] = 0x0091, [0x32] = 0x0016, [0x33] = 0x0093,
+  [0x34] = 0x0094, [0x35] = 0x0095, [0x36] = 0x0096, [0x37] = 0x0004,
+  [0x38] = 0x0098, [0x39] = 0x0099, [0x3a] = 0x009a, [0x3b] = 0x009b,
+  [0x3c] = 0x0014, [0x3d] = 0x0015, [0x3e] = 0x009e, [0x3f] = 0x001a,
+  [0x40] = 0x0020, [0x41] = 0x00a0, [0x42] = 0xfe7c, [0x43] = 0xfe7d,
+  [0x44] = 0x0640, [0x45] = 0x200b, [0x46] = 0xfe80, [0x47] = 0xfe81,
+  [0x48] = 0xfe82, [0x49] = 0xfe83, [0x4a] = 0x00b0, [0x4b] = 0x002e,
+  [0x4c] = 0x003c, [0x4d] = 0x0028, [0x4e] = 0x002b, [0x4f] = 0x0021,
+  [0x50] = 0x0026, [0x51] = 0xfe84, [0x52] = 0xfe85, [0x55] = 0xfe8b,
+  [0x56] = 0xfe8d, [0x57] = 0xfe8e, [0x58] = 0xfe8f, [0x59] = 0xfe91,
+  [0x5a] = 0x00a7, [0x5b] = 0x0024, [0x5c] = 0x002a, [0x5d] = 0x0029,
+  [0x5e] = 0x003b, [0x5f] = 0x005e, [0x60] = 0x002d, [0x61] = 0x002f,
+  [0x62] = 0xfe93, [0x63] = 0xfe95, [0x64] = 0xfe97, [0x65] = 0xfe99,
+  [0x66] = 0xfe9b, [0x67] = 0xfe9d, [0x68] = 0xfe9f, [0x69] = 0xfea1,
+  [0x6a] = 0x00fa, [0x6b] = 0x002c, [0x6c] = 0x0025, [0x6d] = 0x005f,
+  [0x6e] = 0x003e, [0x6f] = 0x003f, [0x70] = 0xfea3, [0x71] = 0xfea5,
+  [0x72] = 0xfea7, [0x73] = 0xfea9, [0x74] = 0xfeab, [0x75] = 0xfead,
+  [0x76] = 0xfeaf, [0x77] = 0xfeb1, [0x78] = 0xfeb3, [0x79] = 0x00a3,
+  [0x7a] = 0x003a, [0x7b] = 0x00b5, [0x7c] = 0x00e1, [0x7d] = 0x0027,
+  [0x7e] = 0x003d, [0x7f] = 0x0022, [0x80] = 0xfeb5, [0x81] = 0x0061,
+  [0x82] = 0x0062, [0x83] = 0x0063, [0x84] = 0x0064, [0x85] = 0x0065,
+  [0x86] = 0x0066, [0x87] = 0x0067, [0x88] = 0x0068, [0x89] = 0x0069,
+  [0x8a] = 0xfeb7, [0x8b] = 0xfeb9, [0x8c] = 0xfebb, [0x8d] = 0xfebd,
+  [0x8e] = 0xfebf, [0x8f] = 0xfec3, [0x90] = 0xfec7, [0x91] = 0x006a,
+  [0x92] = 0x006b, [0x93] = 0x006c, [0x94] = 0x006d, [0x95] = 0x006e,
+  [0x96] = 0x006f, [0x97] = 0x0070, [0x98] = 0x0071, [0x99] = 0x0072,
+  [0x9a] = 0xfec9, [0x9b] = 0xfeca, [0x9c] = 0xfecb, [0x9d] = 0xfecc,
+  [0x9e] = 0xfecd, [0x9f] = 0xfece, [0xa0] = 0xfecf, [0xa1] = 0x00a8,
+  [0xa2] = 0x0073, [0xa3] = 0x0074, [0xa4] = 0x0075, [0xa5] = 0x0076,
+  [0xa6] = 0x0077, [0xa7] = 0x0078, [0xa8] = 0x0079, [0xa9] = 0x007a,
+  [0xaa] = 0xfed0, [0xab] = 0xfed1, [0xac] = 0xfed3, [0xad] = 0xfed5,
+  [0xae] = 0xfed7, [0xaf] = 0xfed9, [0xb0] = 0xfedb, [0xb1] = 0xfedd,
+  [0xb2] = 0xfef5, [0xb3] = 0xfef6, [0xb4] = 0xfef7, [0xb5] = 0xfef8,
+  [0xb8] = 0xfefb, [0xb9] = 0xfefc, [0xba] = 0xfedf, [0xbb] = 0xfee1,
+  [0xbc] = 0xfee3, [0xbd] = 0xfee5, [0xbe] = 0xfee7, [0xbf] = 0xfee9,
+  [0xc0] = 0x00e9, [0xc1] = 0x0041, [0xc2] = 0x0042, [0xc3] = 0x0043,
+  [0xc4] = 0x0044, [0xc5] = 0x0045, [0xc6] = 0x0046, [0xc7] = 0x0047,
+  [0xc8] = 0x0048, [0xc9] = 0x0049, [0xca] = 0x00ad, [0xcb] = 0xfeeb,
+  [0xcd] = 0xfeec, [0xcf] = 0xfeed, [0xd0] = 0x00e8, [0xd1] = 0x004a,
+  [0xd2] = 0x004b, [0xd3] = 0x004c, [0xd4] = 0x004d, [0xd5] = 0x004e,
+  [0xd6] = 0x004f, [0xd7] = 0x0050, [0xd8] = 0x0051, [0xd9] = 0x0052,
+  [0xda] = 0xfeef, [0xdb] = 0xfef0, [0xdc] = 0xfef1, [0xdd] = 0xfef2,
+  [0xde] = 0xfef3, [0xe0] = 0x00e7, [0xe1] = 0x2007, [0xe2] = 0x0053,
+  [0xe3] = 0x0054, [0xe4] = 0x0055, [0xe5] = 0x0056, [0xe6] = 0x0057,
+  [0xe7] = 0x0058, [0xe8] = 0x0059, [0xe9] = 0x005a, [0xea] = 0x00f7,
+  [0xeb] = 0x060c, [0xed] = 0x00d7, [0xee] = 0x061f, [0xef] = 0x061b,
+  [0xf0] = 0x0030, [0xf1] = 0x0031, [0xf2] = 0x0032, [0xf3] = 0x0033,
+  [0xf4] = 0x0034, [0xf5] = 0x0035, [0xf6] = 0x0036, [0xf7] = 0x0037,
+  [0xf8] = 0x0038, [0xf9] = 0x0039, [0xff] = 0x009f
+};
+
+static const struct gap from_idx[] =
+{
+  { start: 0x0000, end: 0x00b5, idx:     0 },
+  { start: 0x00d7, end: 0x00d7, idx:   -33 },
+  { start: 0x00e1, end: 0x00e9, idx:   -42 },
+  { start: 0x00f7, end: 0x00fa, idx:   -55 },
+  { start: 0x060c, end: 0x060c, idx: -1352 },
+  { start: 0x061b, end: 0x064a, idx: -1366 },
+  { start: 0x0651, end: 0x0651, idx: -1372 },
+  { start: 0x0660, end: 0x066d, idx: -1386 },
+  { start: 0x2007, end: 0x200b, idx: -7939 },
+  { start: 0xf8f4, end: 0xf8f7, idx: -63467 },
+  { start: 0xfe70, end: 0xfefc, idx: -64867 },
+  { start: 0xffff, end: 0xffff, idx:     0 }
+};
+
+static const char from_ucs4[] =
+{
+  '\x00', '\x01', '\x02', '\x03', '\x37', '\x2d', '\x2e', '\x2f',
+  '\x16', '\x05', '\x25', '\x0b', '\x0c', '\x0d', '\x0e', '\x0f',
+  '\x10', '\x11', '\x12', '\x13', '\x3c', '\x3d', '\x32', '\x26',
+  '\x18', '\x19', '\x3f', '\x27', '\x1c', '\x1d', '\x1e', '\x1f',
+  '\x40', '\x4f', '\x7f', '\x00', '\x5b', '\x6c', '\x50', '\x7d',
+  '\x4d', '\x5d', '\x5c', '\x4e', '\x6b', '\x60', '\x4b', '\x61',
+  '\xf0', '\xf1', '\xf2', '\xf3', '\xf4', '\xf5', '\xf6', '\xf7',
+  '\xf8', '\xf9', '\x7a', '\x5e', '\x4c', '\x7e', '\x6e', '\x6f',
+  '\x00', '\xc1', '\xc2', '\xc3', '\xc4', '\xc5', '\xc6', '\xc7',
+  '\xc8', '\xc9', '\xd1', '\xd2', '\xd3', '\xd4', '\xd5', '\xd6',
+  '\xd7', '\xd8', '\xd9', '\xe2', '\xe3', '\xe4', '\xe5', '\xe6',
+  '\xe7', '\xe8', '\xe9', '\x00', '\x00', '\x00', '\x5f', '\x6d',
+  '\x00', '\x81', '\x82', '\x83', '\x84', '\x85', '\x86', '\x87',
+  '\x88', '\x89', '\x91', '\x92', '\x93', '\x94', '\x95', '\x96',
+  '\x97', '\x98', '\x99', '\xa2', '\xa3', '\xa4', '\xa5', '\xa6',
+  '\xa7', '\xa8', '\xa9', '\x00', '\x00', '\x00', '\x00', '\x07',
+  '\x20', '\x21', '\x22', '\x23', '\x24', '\x15', '\x06', '\x17',
+  '\x28', '\x29', '\x2a', '\x2b', '\x2c', '\x09', '\x0a', '\x1b',
+  '\x30', '\x31', '\x1a', '\x33', '\x34', '\x35', '\x36', '\x08',
+  '\x38', '\x39', '\x3a', '\x3b', '\x04', '\x14', '\x3e', '\xff',
+  '\x41', '\x00', '\x00', '\x79', '\x00', '\x00', '\x00', '\x5a',
+  '\xa1', '\x00', '\x00', '\x00', '\x00', '\xca', '\x00', '\x00',
+  '\x4a', '\x00', '\x00', '\x00', '\x00', '\x7b', '\xed', '\x7c',
+  '\x00', '\x00', '\x00', '\x00', '\x00', '\xe0', '\xd0', '\xc0',
+  '\xea', '\x00', '\x00', '\x6a', '\xeb', '\xef', '\x00', '\x00',
+  '\x00', '\xee', '\x00', '\x46', '\x47', '\x49', '\x52', '\x56',
+  '\x55', '\x56', '\x58', '\x62', '\x63', '\x65', '\x67', '\x69',
+  '\x71', '\x73', '\x74', '\x75', '\x76', '\x77', '\x80', '\x8b',
+  '\x8d', '\x8f', '\x90', '\x9a', '\x9e', '\x00', '\x00', '\x00',
+  '\x00', '\x00', '\x44', '\xab', '\xad', '\xaf', '\xb1', '\xbb',
+  '\xbd', '\xbf', '\xcf', '\xda', '\xdc', '\x42', '\xf0', '\xf1',
+  '\xf2', '\xf3', '\xf4', '\xf5', '\xf6', '\xf7', '\xf8', '\xf9',
+  '\x6c', '\x6b', '\x4b', '\x5c', '\xe1', '\x00', '\x00', '\x00',
+  '\x45', '\x8b', '\x80', '\x77', '\x8d', '\x40', '\x44', '\x40',
+  '\x45', '\x40', '\x00', '\x40', '\x44', '\x40', '\x44', '\x40',
+  '\x44', '\x42', '\x43', '\x40', '\x44', '\x46', '\x47', '\x48',
+  '\x49', '\x51', '\x52', '\x52', '\x56', '\x57', '\x55', '\x55',
+  '\x55', '\x55', '\x56', '\x57', '\x58', '\x58', '\x59', '\x59',
+  '\x62', '\x62', '\x63', '\x63', '\x64', '\x64', '\x65', '\x65',
+  '\x66', '\x66', '\x67', '\x67', '\x68', '\x68', '\x69', '\x69',
+  '\x70', '\x70', '\x71', '\x71', '\x72', '\x72', '\x73', '\x73',
+  '\x74', '\x74', '\x75', '\x75', '\x76', '\x76', '\x77', '\x77',
+  '\x78', '\x78', '\x80', '\x80', '\x8a', '\x8a', '\x8b', '\x8b',
+  '\x8c', '\x8c', '\x8d', '\x8d', '\x8e', '\x8e', '\x8f', '\x8f',
+  '\x8f', '\x8f', '\x90', '\x90', '\x90', '\x90', '\x9a', '\x9b',
+  '\x9c', '\x9d', '\x9e', '\x9f', '\xa0', '\xaa', '\xab', '\xab',
+  '\xac', '\xac', '\xad', '\xad', '\xae', '\xae', '\xaf', '\xaf',
+  '\xb0', '\xb0', '\xb1', '\xb1', '\xba', '\xba', '\xbb', '\xbb',
+  '\xbc', '\xbc', '\xbd', '\xbd', '\xbe', '\xbe', '\xbf', '\xbf',
+  '\xcb', '\xcd', '\xcf', '\xcf', '\xda', '\xdb', '\xdc', '\xdd',
+  '\xde', '\xde', '\xb2', '\xb3', '\xb4', '\xb5', '\xb8', '\xb9',
+  '\xb8', '\xb9'
+};
diff --git a/iconvdata/ibm4899.c b/iconvdata/ibm4899.c
new file mode 100644
index 0000000000..7ee0e8ba34
--- /dev/null
+++ b/iconvdata/ibm4899.c
@@ -0,0 +1,29 @@
+/* Conversion from and to IBM4899.
+   Copyright (C) 2005 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#include <stdint.h>
+
+/* Get the conversion table.  */
+#define TABLES <ibm4899.h>
+
+#define CHARSET_NAME	"IBM4899//"
+#define HAS_HOLES	1	/* Not all 256 character are defined.  */
+
+#include <8bit-gap.c>
diff --git a/iconvdata/ibm4899.h b/iconvdata/ibm4899.h
new file mode 100644
index 0000000000..bb49a8f627
--- /dev/null
+++ b/iconvdata/ibm4899.h
@@ -0,0 +1,102 @@
+/* Tables for conversion from and to IBM4899.
+   Copyright (C) 2005 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+static const uint32_t to_ucs4[256] =
+{
+  [0x00] = 0x0000, [0x01] = 0x0001, [0x02] = 0x0002, [0x03] = 0x0003,
+  [0x04] = 0x009c, [0x05] = 0x0009, [0x06] = 0x0086, [0x07] = 0x007f,
+  [0x08] = 0x0097, [0x09] = 0x008d, [0x0a] = 0x008e, [0x0b] = 0x000b,
+  [0x0c] = 0x000c, [0x0d] = 0x000d, [0x0e] = 0x000e, [0x0f] = 0x000f,
+  [0x10] = 0x0010, [0x11] = 0x0011, [0x12] = 0x0012, [0x13] = 0x0013,
+  [0x14] = 0x009d, [0x15] = 0x0085, [0x16] = 0x0008, [0x17] = 0x0087,
+  [0x18] = 0x0018, [0x19] = 0x0019, [0x1a] = 0x0092, [0x1b] = 0x008f,
+  [0x1c] = 0x001c, [0x1d] = 0x001d, [0x1e] = 0x001e, [0x1f] = 0x001f,
+  [0x20] = 0x0080, [0x21] = 0x0081, [0x22] = 0x0082, [0x23] = 0x0083,
+  [0x24] = 0x0084, [0x25] = 0x000a, [0x26] = 0x0017, [0x27] = 0x001b,
+  [0x28] = 0x0088, [0x29] = 0x0089, [0x2a] = 0x008a, [0x2b] = 0x008b,
+  [0x2c] = 0x008c, [0x2d] = 0x0005, [0x2e] = 0x0006, [0x2f] = 0x0007,
+  [0x30] = 0x0090, [0x31] = 0x0091, [0x32] = 0x0016, [0x33] = 0x0093,
+  [0x34] = 0x0094, [0x35] = 0x0095, [0x36] = 0x0096, [0x37] = 0x0004,
+  [0x38] = 0x0098, [0x39] = 0x0099, [0x3a] = 0x009a, [0x3b] = 0x009b,
+  [0x3c] = 0x0014, [0x3d] = 0x0015, [0x3e] = 0x009e, [0x3f] = 0x001a,
+  [0x40] = 0x0020, [0x4a] = 0x0024, [0x4b] = 0x002e, [0x4c] = 0x003c,
+  [0x4d] = 0x0028, [0x4e] = 0x002b, [0x4f] = 0x007c, [0x50] = 0x05d0,
+  [0x5a] = 0x0021, [0x5b] = 0x00a2, [0x5c] = 0x002a, [0x5d] = 0x0029,
+  [0x5e] = 0x003b, [0x5f] = 0x00ac, [0x60] = 0x002d, [0x61] = 0x002f,
+  [0x6b] = 0x002c, [0x6c] = 0x0025, [0x6d] = 0x005f, [0x6e] = 0x003e,
+  [0x6f] = 0x003f, [0x7a] = 0x003a, [0x7b] = 0x0023, [0x7c] = 0x0040,
+  [0x7d] = 0x0027, [0x7e] = 0x003d, [0x7f] = 0x0022, [0x81] = 0x05d1,
+  [0x82] = 0x05d2, [0x83] = 0x05d3, [0x84] = 0x05d4, [0x85] = 0x05d5,
+  [0x86] = 0x05d6, [0x87] = 0x05d7, [0x88] = 0x05d8, [0x89] = 0x05d9,
+  [0x91] = 0x05da, [0x92] = 0x05db, [0x93] = 0x05dc, [0x94] = 0x05dd,
+  [0x95] = 0x05de, [0x96] = 0x05df, [0x97] = 0x05e0, [0x98] = 0x05e1,
+  [0x99] = 0x05e2, [0x9c] = 0x20ac, [0x9e] = 0x20aa, [0xa2] = 0x05e3,
+  [0xa3] = 0x05e4, [0xa4] = 0x05e5, [0xa5] = 0x05e6, [0xa6] = 0x05e7,
+  [0xa7] = 0x05e8, [0xa8] = 0x05e9, [0xa9] = 0x05ea, [0xc1] = 0x0041,
+  [0xc2] = 0x0042, [0xc3] = 0x0043, [0xc4] = 0x0044, [0xc5] = 0x0045,
+  [0xc6] = 0x0046, [0xc7] = 0x0047, [0xc8] = 0x0048, [0xc9] = 0x0049,
+  [0xd1] = 0x004a, [0xd2] = 0x004b, [0xd3] = 0x004c, [0xd4] = 0x004d,
+  [0xd5] = 0x004e, [0xd6] = 0x004f, [0xd7] = 0x0050, [0xd8] = 0x0051,
+  [0xd9] = 0x0052, [0xdb] = 0x202d, [0xdc] = 0x202e, [0xdd] = 0x202c,
+  [0xe2] = 0x0053, [0xe3] = 0x0054, [0xe4] = 0x0055, [0xe5] = 0x0056,
+  [0xe6] = 0x0057, [0xe7] = 0x0058, [0xe8] = 0x0059, [0xe9] = 0x005a,
+  [0xf0] = 0x0030, [0xf1] = 0x0031, [0xf2] = 0x0032, [0xf3] = 0x0033,
+  [0xf4] = 0x0034, [0xf5] = 0x0035, [0xf6] = 0x0036, [0xf7] = 0x0037,
+  [0xf8] = 0x0038, [0xf9] = 0x0039, [0xfb] = 0x202a, [0xfc] = 0x202b,
+  [0xfd] = 0x200e, [0xfe] = 0x200f, [0xff] = 0x009f
+};
+
+static const struct gap from_idx[] =
+{
+  { start: 0x0000, end: 0x005f, idx:     0 },
+  { start: 0x007c, end: 0x00a2, idx:   -28 },
+  { start: 0x00ac, end: 0x00ac, idx:   -37 },
+  { start: 0x05d0, end: 0x05ea, idx: -1352 },
+  { start: 0x200e, end: 0x200f, idx: -8043 },
+  { start: 0x202a, end: 0x202e, idx: -8069 },
+  { start: 0x20aa, end: 0x20ac, idx: -8192 },
+  { start: 0xffff, end: 0xffff, idx:     0 }
+};
+
+static const char from_ucs4[] =
+{
+  '\x00', '\x01', '\x02', '\x03', '\x37', '\x2d', '\x2e', '\x2f',
+  '\x16', '\x05', '\x25', '\x0b', '\x0c', '\x0d', '\x0e', '\x0f',
+  '\x10', '\x11', '\x12', '\x13', '\x3c', '\x3d', '\x32', '\x26',
+  '\x18', '\x19', '\x3f', '\x27', '\x1c', '\x1d', '\x1e', '\x1f',
+  '\x40', '\x5a', '\x7f', '\x7b', '\x4a', '\x6c', '\x00', '\x7d',
+  '\x4d', '\x5d', '\x5c', '\x4e', '\x6b', '\x60', '\x4b', '\x61',
+  '\xf0', '\xf1', '\xf2', '\xf3', '\xf4', '\xf5', '\xf6', '\xf7',
+  '\xf8', '\xf9', '\x7a', '\x5e', '\x4c', '\x7e', '\x6e', '\x6f',
+  '\x7c', '\xc1', '\xc2', '\xc3', '\xc4', '\xc5', '\xc6', '\xc7',
+  '\xc8', '\xc9', '\xd1', '\xd2', '\xd3', '\xd4', '\xd5', '\xd6',
+  '\xd7', '\xd8', '\xd9', '\xe2', '\xe3', '\xe4', '\xe5', '\xe6',
+  '\xe7', '\xe8', '\xe9', '\x00', '\x00', '\x00', '\x00', '\x6d',
+  '\x4f', '\x00', '\x00', '\x07', '\x20', '\x21', '\x22', '\x23',
+  '\x24', '\x15', '\x06', '\x17', '\x28', '\x29', '\x2a', '\x2b',
+  '\x2c', '\x09', '\x0a', '\x1b', '\x30', '\x31', '\x1a', '\x33',
+  '\x34', '\x35', '\x36', '\x08', '\x38', '\x39', '\x3a', '\x3b',
+  '\x04', '\x14', '\x3e', '\xff', '\x00', '\x00', '\x5b', '\x5f',
+  '\x50', '\x81', '\x82', '\x83', '\x84', '\x85', '\x86', '\x87',
+  '\x88', '\x89', '\x91', '\x92', '\x93', '\x94', '\x95', '\x96',
+  '\x97', '\x98', '\x99', '\xa2', '\xa3', '\xa4', '\xa5', '\xa6',
+  '\xa7', '\xa8', '\xa9', '\xfd', '\xfe', '\xfb', '\xfc', '\xdd',
+  '\xdb', '\xdc', '\x9e', '\x00', '\x9c'
+};
diff --git a/iconvdata/ibm4909.c b/iconvdata/ibm4909.c
new file mode 100644
index 0000000000..da35689eed
--- /dev/null
+++ b/iconvdata/ibm4909.c
@@ -0,0 +1,29 @@
+/* Conversion from and to IBM4909.
+   Copyright (C) 2005 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#include <stdint.h>
+
+/* Get the conversion table.  */
+#define TABLES <ibm4909.h>
+
+#define CHARSET_NAME	"IBM4909//"
+#define HAS_HOLES	1	/* Not all 256 character are defined.  */
+
+#include <8bit-gap.c>
diff --git a/iconvdata/ibm4909.h b/iconvdata/ibm4909.h
new file mode 100644
index 0000000000..3be8932f0a
--- /dev/null
+++ b/iconvdata/ibm4909.h
@@ -0,0 +1,134 @@
+/* Tables for conversion from and to IBM4909.
+   Copyright (C) 2005 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+static const uint32_t to_ucs4[256] =
+{
+  [0x00] = 0x0000, [0x01] = 0x0001, [0x02] = 0x0002, [0x03] = 0x0003,
+  [0x04] = 0x0004, [0x05] = 0x0005, [0x06] = 0x0006, [0x07] = 0x0007,
+  [0x08] = 0x0008, [0x09] = 0x0009, [0x0a] = 0x000a, [0x0b] = 0x000b,
+  [0x0c] = 0x000c, [0x0d] = 0x000d, [0x0e] = 0x000e, [0x0f] = 0x000f,
+  [0x10] = 0x0010, [0x11] = 0x0011, [0x12] = 0x0012, [0x13] = 0x0013,
+  [0x14] = 0x0014, [0x15] = 0x0015, [0x16] = 0x0016, [0x17] = 0x0017,
+  [0x18] = 0x0018, [0x19] = 0x0019, [0x1a] = 0x001a, [0x1b] = 0x001b,
+  [0x1c] = 0x001c, [0x1d] = 0x001d, [0x1e] = 0x001e, [0x1f] = 0x001f,
+  [0x20] = 0x0020, [0x21] = 0x0021, [0x22] = 0x0022, [0x23] = 0x0023,
+  [0x24] = 0x0024, [0x25] = 0x0025, [0x26] = 0x0026, [0x27] = 0x0027,
+  [0x28] = 0x0028, [0x29] = 0x0029, [0x2a] = 0x002a, [0x2b] = 0x002b,
+  [0x2c] = 0x002c, [0x2d] = 0x002d, [0x2e] = 0x002e, [0x2f] = 0x002f,
+  [0x30] = 0x0030, [0x31] = 0x0031, [0x32] = 0x0032, [0x33] = 0x0033,
+  [0x34] = 0x0034, [0x35] = 0x0035, [0x36] = 0x0036, [0x37] = 0x0037,
+  [0x38] = 0x0038, [0x39] = 0x0039, [0x3a] = 0x003a, [0x3b] = 0x003b,
+  [0x3c] = 0x003c, [0x3d] = 0x003d, [0x3e] = 0x003e, [0x3f] = 0x003f,
+  [0x40] = 0x0040, [0x41] = 0x0041, [0x42] = 0x0042, [0x43] = 0x0043,
+  [0x44] = 0x0044, [0x45] = 0x0045, [0x46] = 0x0046, [0x47] = 0x0047,
+  [0x48] = 0x0048, [0x49] = 0x0049, [0x4a] = 0x004a, [0x4b] = 0x004b,
+  [0x4c] = 0x004c, [0x4d] = 0x004d, [0x4e] = 0x004e, [0x4f] = 0x004f,
+  [0x50] = 0x0050, [0x51] = 0x0051, [0x52] = 0x0052, [0x53] = 0x0053,
+  [0x54] = 0x0054, [0x55] = 0x0055, [0x56] = 0x0056, [0x57] = 0x0057,
+  [0x58] = 0x0058, [0x59] = 0x0059, [0x5a] = 0x005a, [0x5b] = 0x005b,
+  [0x5c] = 0x005c, [0x5d] = 0x005d, [0x5e] = 0x005e, [0x5f] = 0x005f,
+  [0x60] = 0x0060, [0x61] = 0x0061, [0x62] = 0x0062, [0x63] = 0x0063,
+  [0x64] = 0x0064, [0x65] = 0x0065, [0x66] = 0x0066, [0x67] = 0x0067,
+  [0x68] = 0x0068, [0x69] = 0x0069, [0x6a] = 0x006a, [0x6b] = 0x006b,
+  [0x6c] = 0x006c, [0x6d] = 0x006d, [0x6e] = 0x006e, [0x6f] = 0x006f,
+  [0x70] = 0x0070, [0x71] = 0x0071, [0x72] = 0x0072, [0x73] = 0x0073,
+  [0x74] = 0x0074, [0x75] = 0x0075, [0x76] = 0x0076, [0x77] = 0x0077,
+  [0x78] = 0x0078, [0x79] = 0x0079, [0x7a] = 0x007a, [0x7b] = 0x007b,
+  [0x7c] = 0x007c, [0x7d] = 0x007d, [0x7e] = 0x007e, [0x7f] = 0x007f,
+  [0x80] = 0x0080, [0x81] = 0x0081, [0x82] = 0x0082, [0x83] = 0x0083,
+  [0x84] = 0x0084, [0x85] = 0x0085, [0x86] = 0x0086, [0x87] = 0x0087,
+  [0x88] = 0x0088, [0x89] = 0x0089, [0x8a] = 0x008a, [0x8b] = 0x008b,
+  [0x8c] = 0x008c, [0x8d] = 0x008d, [0x8e] = 0x008e, [0x8f] = 0x008f,
+  [0x90] = 0x0090, [0x91] = 0x0091, [0x92] = 0x0092, [0x93] = 0x0093,
+  [0x94] = 0x0094, [0x95] = 0x0095, [0x96] = 0x0096, [0x97] = 0x0097,
+  [0x98] = 0x0098, [0x99] = 0x0099, [0x9a] = 0x009a, [0x9b] = 0x009b,
+  [0x9c] = 0x009c, [0x9d] = 0x009d, [0x9e] = 0x009e, [0x9f] = 0x009f,
+  [0xa0] = 0x00a0, [0xa1] = 0x2018, [0xa2] = 0x2019, [0xa3] = 0x00a3,
+  [0xa4] = 0x20ac, [0xa6] = 0x00a6, [0xa7] = 0x00a7, [0xa8] = 0x00a8,
+  [0xa9] = 0x00a9, [0xab] = 0x00ab, [0xac] = 0x00ac, [0xad] = 0x00ad,
+  [0xaf] = 0x2015, [0xb0] = 0x00b0, [0xb1] = 0x00b1, [0xb2] = 0x00b2,
+  [0xb3] = 0x00b3, [0xb4] = 0x00b4, [0xb5] = 0x0385, [0xb6] = 0x0386,
+  [0xb7] = 0x0387, [0xb8] = 0x0388, [0xb9] = 0x0389, [0xba] = 0x038a,
+  [0xbb] = 0x00bb, [0xbc] = 0x038c, [0xbd] = 0x00bd, [0xbe] = 0x038e,
+  [0xbf] = 0x038f, [0xc0] = 0x0390, [0xc1] = 0x0391, [0xc2] = 0x0392,
+  [0xc3] = 0x0393, [0xc4] = 0x0394, [0xc5] = 0x0395, [0xc6] = 0x0396,
+  [0xc7] = 0x0397, [0xc8] = 0x0398, [0xc9] = 0x0399, [0xca] = 0x039a,
+  [0xcb] = 0x039b, [0xcc] = 0x039c, [0xcd] = 0x039d, [0xce] = 0x039e,
+  [0xcf] = 0x039f, [0xd0] = 0x03a0, [0xd1] = 0x03a1, [0xd3] = 0x03a3,
+  [0xd4] = 0x03a4, [0xd5] = 0x03a5, [0xd6] = 0x03a6, [0xd7] = 0x03a7,
+  [0xd8] = 0x03a8, [0xd9] = 0x03a9, [0xda] = 0x03aa, [0xdb] = 0x03ab,
+  [0xdc] = 0x03ac, [0xdd] = 0x03ad, [0xde] = 0x03ae, [0xdf] = 0x03af,
+  [0xe0] = 0x03b0, [0xe1] = 0x03b1, [0xe2] = 0x03b2, [0xe3] = 0x03b3,
+  [0xe4] = 0x03b4, [0xe5] = 0x03b5, [0xe6] = 0x03b6, [0xe7] = 0x03b7,
+  [0xe8] = 0x03b8, [0xe9] = 0x03b9, [0xea] = 0x03ba, [0xeb] = 0x03bb,
+  [0xec] = 0x03bc, [0xed] = 0x03bd, [0xee] = 0x03be, [0xef] = 0x03bf,
+  [0xf0] = 0x03c0, [0xf1] = 0x03c1, [0xf2] = 0x03c2, [0xf3] = 0x03c3,
+  [0xf4] = 0x03c4, [0xf5] = 0x03c5, [0xf6] = 0x03c6, [0xf7] = 0x03c7,
+  [0xf8] = 0x03c8, [0xf9] = 0x03c9, [0xfa] = 0x03ca, [0xfb] = 0x03cb,
+  [0xfc] = 0x03cc, [0xfd] = 0x03cd, [0xfe] = 0x03ce
+};
+
+static const struct gap from_idx[] =
+{
+  { start: 0x0000, end: 0x00bd, idx:     0 },
+  { start: 0x0385, end: 0x03ce, idx:  -711 },
+  { start: 0x03d5, end: 0x03d5, idx:  -717 },
+  { start: 0x2015, end: 0x2019, idx: -7948 },
+  { start: 0x20ac, end: 0x20ac, idx: -8094 },
+  { start: 0xffff, end: 0xffff, idx:     0 }
+};
+
+static const char from_ucs4[] =
+{
+  '\x00', '\x01', '\x02', '\x03', '\x04', '\x05', '\x06', '\x07',
+  '\x08', '\x09', '\x0a', '\x0b', '\x0c', '\x0d', '\x0e', '\x0f',
+  '\x10', '\x11', '\x12', '\x13', '\x14', '\x15', '\x16', '\x17',
+  '\x18', '\x19', '\x1a', '\x1b', '\x1c', '\x1d', '\x1e', '\x1f',
+  '\x20', '\x21', '\x22', '\x23', '\x24', '\x25', '\x26', '\x27',
+  '\x28', '\x29', '\x2a', '\x2b', '\x2c', '\x2d', '\x2e', '\x2f',
+  '\x30', '\x31', '\x32', '\x33', '\x34', '\x35', '\x36', '\x37',
+  '\x38', '\x39', '\x3a', '\x3b', '\x3c', '\x3d', '\x3e', '\x3f',
+  '\x40', '\x41', '\x42', '\x43', '\x44', '\x45', '\x46', '\x47',
+  '\x48', '\x49', '\x4a', '\x4b', '\x4c', '\x4d', '\x4e', '\x4f',
+  '\x50', '\x51', '\x52', '\x53', '\x54', '\x55', '\x56', '\x57',
+  '\x58', '\x59', '\x5a', '\x5b', '\x5c', '\x5d', '\x5e', '\x5f',
+  '\x60', '\x61', '\x62', '\x63', '\x64', '\x65', '\x66', '\x67',
+  '\x68', '\x69', '\x6a', '\x6b', '\x6c', '\x6d', '\x6e', '\x6f',
+  '\x70', '\x71', '\x72', '\x73', '\x74', '\x75', '\x76', '\x77',
+  '\x78', '\x79', '\x7a', '\x7b', '\x7c', '\x7d', '\x7e', '\x7f',
+  '\x80', '\x81', '\x82', '\x83', '\x84', '\x85', '\x86', '\x87',
+  '\x88', '\x89', '\x8a', '\x8b', '\x8c', '\x8d', '\x8e', '\x8f',
+  '\x90', '\x91', '\x92', '\x93', '\x94', '\x95', '\x96', '\x97',
+  '\x98', '\x99', '\x9a', '\x9b', '\x9c', '\x9d', '\x9e', '\x9f',
+  '\xa0', '\x00', '\x00', '\xa3', '\x00', '\x00', '\xa6', '\xa7',
+  '\xa8', '\xa9', '\x00', '\xab', '\xac', '\xad', '\x00', '\x00',
+  '\xb0', '\xb1', '\xb2', '\xb3', '\xb4', '\x00', '\x00', '\xb7',
+  '\x00', '\x00', '\x00', '\xbb', '\x00', '\xbd', '\xb5', '\xb6',
+  '\xb7', '\xb8', '\xb9', '\xba', '\x00', '\xbc', '\x00', '\xbe',
+  '\xbf', '\xc0', '\xc1', '\xc2', '\xc3', '\xc4', '\xc5', '\xc6',
+  '\xc7', '\xc8', '\xc9', '\xca', '\xcb', '\xcc', '\xcd', '\xce',
+  '\xcf', '\xd0', '\xd1', '\x00', '\xd3', '\xd4', '\xd5', '\xd6',
+  '\xd7', '\xd8', '\xd9', '\xda', '\xdb', '\xdc', '\xdd', '\xde',
+  '\xdf', '\xe0', '\xe1', '\xe2', '\xe3', '\xe4', '\xe5', '\xe6',
+  '\xe7', '\xe8', '\xe9', '\xea', '\xeb', '\xec', '\xed', '\xee',
+  '\xef', '\xf0', '\xf1', '\xf2', '\xf3', '\xf4', '\xf5', '\xf6',
+  '\xf7', '\xf8', '\xf9', '\xfa', '\xfb', '\xfc', '\xfd', '\xfe',
+  '\xf6', '\xaf', '\x00', '\x00', '\xa1', '\xa2', '\xa4'
+};
diff --git a/iconvdata/ibm4971.c b/iconvdata/ibm4971.c
new file mode 100644
index 0000000000..0b362b6030
--- /dev/null
+++ b/iconvdata/ibm4971.c
@@ -0,0 +1,29 @@
+/* Conversion from and to IBM4971.
+   Copyright (C) 2005 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#include <stdint.h>
+
+/* Get the conversion table.  */
+#define TABLES <ibm4971.h>
+
+#define CHARSET_NAME	"IBM4971//"
+#define HAS_HOLES	1	/* Not all 256 character are defined.  */
+
+#include <8bit-gap.c>
diff --git a/iconvdata/ibm4971.h b/iconvdata/ibm4971.h
new file mode 100644
index 0000000000..936b3e1f91
--- /dev/null
+++ b/iconvdata/ibm4971.h
@@ -0,0 +1,134 @@
+/* Tables for conversion from and to IBM4971.
+   Copyright (C) 2005 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+static const uint32_t to_ucs4[256] =
+{
+  [0x00] = 0x0000, [0x01] = 0x0001, [0x02] = 0x0002, [0x03] = 0x0003,
+  [0x04] = 0x009c, [0x05] = 0x0009, [0x06] = 0x0086, [0x07] = 0x007f,
+  [0x08] = 0x0097, [0x09] = 0x008d, [0x0a] = 0x008e, [0x0b] = 0x000b,
+  [0x0c] = 0x000c, [0x0d] = 0x000d, [0x0e] = 0x000e, [0x0f] = 0x000f,
+  [0x10] = 0x0010, [0x11] = 0x0011, [0x12] = 0x0012, [0x13] = 0x0013,
+  [0x14] = 0x009d, [0x15] = 0x0085, [0x16] = 0x0008, [0x17] = 0x0087,
+  [0x18] = 0x0018, [0x19] = 0x0019, [0x1a] = 0x0092, [0x1b] = 0x008f,
+  [0x1c] = 0x001c, [0x1d] = 0x001d, [0x1e] = 0x001e, [0x1f] = 0x001f,
+  [0x20] = 0x0080, [0x21] = 0x0081, [0x22] = 0x0082, [0x23] = 0x0083,
+  [0x24] = 0x0084, [0x25] = 0x000a, [0x26] = 0x0017, [0x27] = 0x001b,
+  [0x28] = 0x0088, [0x29] = 0x0089, [0x2a] = 0x008a, [0x2b] = 0x008b,
+  [0x2c] = 0x008c, [0x2d] = 0x0005, [0x2e] = 0x0006, [0x2f] = 0x0007,
+  [0x30] = 0x0090, [0x31] = 0x0091, [0x32] = 0x0016, [0x33] = 0x0093,
+  [0x34] = 0x0094, [0x35] = 0x0095, [0x36] = 0x0096, [0x37] = 0x0004,
+  [0x38] = 0x0098, [0x39] = 0x0099, [0x3a] = 0x009a, [0x3b] = 0x009b,
+  [0x3c] = 0x0014, [0x3d] = 0x0015, [0x3e] = 0x009e, [0x3f] = 0x001a,
+  [0x40] = 0x0020, [0x41] = 0x0391, [0x42] = 0x0392, [0x43] = 0x0393,
+  [0x44] = 0x0394, [0x45] = 0x0395, [0x46] = 0x0396, [0x47] = 0x0397,
+  [0x48] = 0x0398, [0x49] = 0x0399, [0x4a] = 0x005b, [0x4b] = 0x002e,
+  [0x4c] = 0x003c, [0x4d] = 0x0028, [0x4e] = 0x002b, [0x4f] = 0x0021,
+  [0x50] = 0x0026, [0x51] = 0x039a, [0x52] = 0x039b, [0x53] = 0x039c,
+  [0x54] = 0x039d, [0x55] = 0x039e, [0x56] = 0x039f, [0x57] = 0x03a0,
+  [0x58] = 0x03a1, [0x59] = 0x03a3, [0x5a] = 0x005d, [0x5b] = 0x0024,
+  [0x5c] = 0x002a, [0x5d] = 0x0029, [0x5e] = 0x003b, [0x5f] = 0x005e,
+  [0x60] = 0x002d, [0x61] = 0x002f, [0x62] = 0x03a4, [0x63] = 0x03a5,
+  [0x64] = 0x03a6, [0x65] = 0x03a7, [0x66] = 0x03a8, [0x67] = 0x03a9,
+  [0x68] = 0x03aa, [0x69] = 0x03ab, [0x6a] = 0x007c, [0x6b] = 0x002c,
+  [0x6c] = 0x0025, [0x6d] = 0x005f, [0x6e] = 0x003e, [0x6f] = 0x003f,
+  [0x70] = 0x00a8, [0x71] = 0x0386, [0x72] = 0x0388, [0x73] = 0x0389,
+  [0x74] = 0x00a0, [0x75] = 0x038a, [0x76] = 0x038c, [0x77] = 0x038e,
+  [0x78] = 0x038f, [0x79] = 0x0060, [0x7a] = 0x003a, [0x7b] = 0x0023,
+  [0x7c] = 0x0040, [0x7d] = 0x0027, [0x7e] = 0x003d, [0x7f] = 0x0022,
+  [0x80] = 0x0385, [0x81] = 0x0061, [0x82] = 0x0062, [0x83] = 0x0063,
+  [0x84] = 0x0064, [0x85] = 0x0065, [0x86] = 0x0066, [0x87] = 0x0067,
+  [0x88] = 0x0068, [0x89] = 0x0069, [0x8a] = 0x03b1, [0x8b] = 0x03b2,
+  [0x8c] = 0x03b3, [0x8d] = 0x03b4, [0x8e] = 0x03b5, [0x8f] = 0x03b6,
+  [0x90] = 0x00b0, [0x91] = 0x006a, [0x92] = 0x006b, [0x93] = 0x006c,
+  [0x94] = 0x006d, [0x95] = 0x006e, [0x96] = 0x006f, [0x97] = 0x0070,
+  [0x98] = 0x0071, [0x99] = 0x0072, [0x9a] = 0x03b7, [0x9b] = 0x03b8,
+  [0x9c] = 0x03b9, [0x9d] = 0x03ba, [0x9e] = 0x03bb, [0x9f] = 0x03bc,
+  [0xa0] = 0x00b4, [0xa1] = 0x007e, [0xa2] = 0x0073, [0xa3] = 0x0074,
+  [0xa4] = 0x0075, [0xa5] = 0x0076, [0xa6] = 0x0077, [0xa7] = 0x0078,
+  [0xa8] = 0x0079, [0xa9] = 0x007a, [0xaa] = 0x03bd, [0xab] = 0x03be,
+  [0xac] = 0x03bf, [0xad] = 0x03c0, [0xae] = 0x03c1, [0xaf] = 0x03c3,
+  [0xb0] = 0x00a3, [0xb1] = 0x03ac, [0xb2] = 0x03ad, [0xb3] = 0x03ae,
+  [0xb4] = 0x03ca, [0xb5] = 0x03af, [0xb6] = 0x03cc, [0xb7] = 0x03cd,
+  [0xb8] = 0x03cb, [0xb9] = 0x03ce, [0xba] = 0x03c2, [0xbb] = 0x03c4,
+  [0xbc] = 0x03c5, [0xbd] = 0x03c6, [0xbe] = 0x03c7, [0xbf] = 0x03c8,
+  [0xc0] = 0x007b, [0xc1] = 0x0041, [0xc2] = 0x0042, [0xc3] = 0x0043,
+  [0xc4] = 0x0044, [0xc5] = 0x0045, [0xc6] = 0x0046, [0xc7] = 0x0047,
+  [0xc8] = 0x0048, [0xc9] = 0x0049, [0xca] = 0x00ad, [0xcb] = 0x03c9,
+  [0xcc] = 0x0390, [0xcd] = 0x03b0, [0xce] = 0x2018, [0xcf] = 0x2015,
+  [0xd0] = 0x007d, [0xd1] = 0x004a, [0xd2] = 0x004b, [0xd3] = 0x004c,
+  [0xd4] = 0x004d, [0xd5] = 0x004e, [0xd6] = 0x004f, [0xd7] = 0x0050,
+  [0xd8] = 0x0051, [0xd9] = 0x0052, [0xda] = 0x00b1, [0xdb] = 0x00bd,
+  [0xdd] = 0x0387, [0xde] = 0x2019, [0xdf] = 0x00a6, [0xe0] = 0x005c,
+  [0xe2] = 0x0053, [0xe3] = 0x0054, [0xe4] = 0x0055, [0xe5] = 0x0056,
+  [0xe6] = 0x0057, [0xe7] = 0x0058, [0xe8] = 0x0059, [0xe9] = 0x005a,
+  [0xea] = 0x00b2, [0xeb] = 0x00a7, [0xee] = 0x00ab, [0xef] = 0x00ac,
+  [0xf0] = 0x0030, [0xf1] = 0x0031, [0xf2] = 0x0032, [0xf3] = 0x0033,
+  [0xf4] = 0x0034, [0xf5] = 0x0035, [0xf6] = 0x0036, [0xf7] = 0x0037,
+  [0xf8] = 0x0038, [0xf9] = 0x0039, [0xfa] = 0x00b3, [0xfb] = 0x00a9,
+  [0xfc] = 0x20ac, [0xfe] = 0x00bb, [0xff] = 0x009f
+};
+
+static const struct gap from_idx[] =
+{
+  { start: 0x0000, end: 0x00bd, idx:     0 },
+  { start: 0x0385, end: 0x03ce, idx:  -711 },
+  { start: 0x03d5, end: 0x03d5, idx:  -717 },
+  { start: 0x2015, end: 0x2019, idx: -7948 },
+  { start: 0x20ac, end: 0x20ac, idx: -8094 },
+  { start: 0xffff, end: 0xffff, idx:     0 }
+};
+
+static const char from_ucs4[] =
+{
+  '\x00', '\x01', '\x02', '\x03', '\x37', '\x2d', '\x2e', '\x2f',
+  '\x16', '\x05', '\x25', '\x0b', '\x0c', '\x0d', '\x0e', '\x0f',
+  '\x10', '\x11', '\x12', '\x13', '\x3c', '\x3d', '\x32', '\x26',
+  '\x18', '\x19', '\x3f', '\x27', '\x1c', '\x1d', '\x1e', '\x1f',
+  '\x40', '\x4f', '\x7f', '\x7b', '\x5b', '\x6c', '\x50', '\x7d',
+  '\x4d', '\x5d', '\x5c', '\x4e', '\x6b', '\x60', '\x4b', '\x61',
+  '\xf0', '\xf1', '\xf2', '\xf3', '\xf4', '\xf5', '\xf6', '\xf7',
+  '\xf8', '\xf9', '\x7a', '\x5e', '\x4c', '\x7e', '\x6e', '\x6f',
+  '\x7c', '\xc1', '\xc2', '\xc3', '\xc4', '\xc5', '\xc6', '\xc7',
+  '\xc8', '\xc9', '\xd1', '\xd2', '\xd3', '\xd4', '\xd5', '\xd6',
+  '\xd7', '\xd8', '\xd9', '\xe2', '\xe3', '\xe4', '\xe5', '\xe6',
+  '\xe7', '\xe8', '\xe9', '\x4a', '\xe0', '\x5a', '\x5f', '\x6d',
+  '\x79', '\x81', '\x82', '\x83', '\x84', '\x85', '\x86', '\x87',
+  '\x88', '\x89', '\x91', '\x92', '\x93', '\x94', '\x95', '\x96',
+  '\x97', '\x98', '\x99', '\xa2', '\xa3', '\xa4', '\xa5', '\xa6',
+  '\xa7', '\xa8', '\xa9', '\xc0', '\x6a', '\xd0', '\xa1', '\x07',
+  '\x20', '\x21', '\x22', '\x23', '\x24', '\x15', '\x06', '\x17',
+  '\x28', '\x29', '\x2a', '\x2b', '\x2c', '\x09', '\x0a', '\x1b',
+  '\x30', '\x31', '\x1a', '\x33', '\x34', '\x35', '\x36', '\x08',
+  '\x38', '\x39', '\x3a', '\x3b', '\x04', '\x14', '\x3e', '\xff',
+  '\x74', '\x00', '\x00', '\xb0', '\x00', '\x00', '\xdf', '\xeb',
+  '\x70', '\xfb', '\x00', '\xee', '\xef', '\xca', '\x00', '\x00',
+  '\x90', '\xda', '\xea', '\xfa', '\xa0', '\x00', '\x00', '\xdd',
+  '\x00', '\x00', '\x00', '\xfe', '\x00', '\xdb', '\x80', '\x71',
+  '\xdd', '\x72', '\x73', '\x75', '\x00', '\x76', '\x00', '\x77',
+  '\x78', '\xcc', '\x41', '\x42', '\x43', '\x44', '\x45', '\x46',
+  '\x47', '\x48', '\x49', '\x51', '\x52', '\x53', '\x54', '\x55',
+  '\x56', '\x57', '\x58', '\x00', '\x59', '\x62', '\x63', '\x64',
+  '\x65', '\x66', '\x67', '\x68', '\x69', '\xb1', '\xb2', '\xb3',
+  '\xb5', '\xcd', '\x8a', '\x8b', '\x8c', '\x8d', '\x8e', '\x8f',
+  '\x9a', '\x9b', '\x9c', '\x9d', '\x9e', '\x9f', '\xaa', '\xab',
+  '\xac', '\xad', '\xae', '\xba', '\xaf', '\xbb', '\xbc', '\xbd',
+  '\xbe', '\xbf', '\xcb', '\xb4', '\xb8', '\xb6', '\xb7', '\xb9',
+  '\xbd', '\xcf', '\x00', '\x00', '\xce', '\xde', '\xfc'
+};
diff --git a/iconvdata/ibm5347.c b/iconvdata/ibm5347.c
new file mode 100644
index 0000000000..79d4b7f663
--- /dev/null
+++ b/iconvdata/ibm5347.c
@@ -0,0 +1,29 @@
+/* Conversion from and to IBM5347.
+   Copyright (C) 2005 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#include <stdint.h>
+
+/* Get the conversion table.  */
+#define TABLES <ibm5347.h>
+
+#define CHARSET_NAME	"IBM5347//"
+#define HAS_HOLES	0	/* All 256 character are defined.  */
+
+#include <8bit-gap.c>
diff --git a/iconvdata/ibm5347.h b/iconvdata/ibm5347.h
new file mode 100644
index 0000000000..4ef71a8896
--- /dev/null
+++ b/iconvdata/ibm5347.h
@@ -0,0 +1,142 @@
+/* Tables for conversion from and to IBM5347.
+   Copyright (C) 2005 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+static const uint32_t to_ucs4[256] =
+{
+  [0x00] = 0x0000, [0x01] = 0x0001, [0x02] = 0x0002, [0x03] = 0x0003,
+  [0x04] = 0x0004, [0x05] = 0x0005, [0x06] = 0x0006, [0x07] = 0x0007,
+  [0x08] = 0x0008, [0x09] = 0x0009, [0x0a] = 0x000a, [0x0b] = 0x000b,
+  [0x0c] = 0x000c, [0x0d] = 0x000d, [0x0e] = 0x000e, [0x0f] = 0x000f,
+  [0x10] = 0x0010, [0x11] = 0x0011, [0x12] = 0x0012, [0x13] = 0x0013,
+  [0x14] = 0x0014, [0x15] = 0x0015, [0x16] = 0x0016, [0x17] = 0x0017,
+  [0x18] = 0x0018, [0x19] = 0x0019, [0x1a] = 0x001a, [0x1b] = 0x001b,
+  [0x1c] = 0x001c, [0x1d] = 0x001d, [0x1e] = 0x001e, [0x1f] = 0x001f,
+  [0x20] = 0x0020, [0x21] = 0x0021, [0x22] = 0x0022, [0x23] = 0x0023,
+  [0x24] = 0x0024, [0x25] = 0x0025, [0x26] = 0x0026, [0x27] = 0x0027,
+  [0x28] = 0x0028, [0x29] = 0x0029, [0x2a] = 0x002a, [0x2b] = 0x002b,
+  [0x2c] = 0x002c, [0x2d] = 0x002d, [0x2e] = 0x002e, [0x2f] = 0x002f,
+  [0x30] = 0x0030, [0x31] = 0x0031, [0x32] = 0x0032, [0x33] = 0x0033,
+  [0x34] = 0x0034, [0x35] = 0x0035, [0x36] = 0x0036, [0x37] = 0x0037,
+  [0x38] = 0x0038, [0x39] = 0x0039, [0x3a] = 0x003a, [0x3b] = 0x003b,
+  [0x3c] = 0x003c, [0x3d] = 0x003d, [0x3e] = 0x003e, [0x3f] = 0x003f,
+  [0x40] = 0x0040, [0x41] = 0x0041, [0x42] = 0x0042, [0x43] = 0x0043,
+  [0x44] = 0x0044, [0x45] = 0x0045, [0x46] = 0x0046, [0x47] = 0x0047,
+  [0x48] = 0x0048, [0x49] = 0x0049, [0x4a] = 0x004a, [0x4b] = 0x004b,
+  [0x4c] = 0x004c, [0x4d] = 0x004d, [0x4e] = 0x004e, [0x4f] = 0x004f,
+  [0x50] = 0x0050, [0x51] = 0x0051, [0x52] = 0x0052, [0x53] = 0x0053,
+  [0x54] = 0x0054, [0x55] = 0x0055, [0x56] = 0x0056, [0x57] = 0x0057,
+  [0x58] = 0x0058, [0x59] = 0x0059, [0x5a] = 0x005a, [0x5b] = 0x005b,
+  [0x5c] = 0x005c, [0x5d] = 0x005d, [0x5e] = 0x005e, [0x5f] = 0x005f,
+  [0x60] = 0x0060, [0x61] = 0x0061, [0x62] = 0x0062, [0x63] = 0x0063,
+  [0x64] = 0x0064, [0x65] = 0x0065, [0x66] = 0x0066, [0x67] = 0x0067,
+  [0x68] = 0x0068, [0x69] = 0x0069, [0x6a] = 0x006a, [0x6b] = 0x006b,
+  [0x6c] = 0x006c, [0x6d] = 0x006d, [0x6e] = 0x006e, [0x6f] = 0x006f,
+  [0x70] = 0x0070, [0x71] = 0x0071, [0x72] = 0x0072, [0x73] = 0x0073,
+  [0x74] = 0x0074, [0x75] = 0x0075, [0x76] = 0x0076, [0x77] = 0x0077,
+  [0x78] = 0x0078, [0x79] = 0x0079, [0x7a] = 0x007a, [0x7b] = 0x007b,
+  [0x7c] = 0x007c, [0x7d] = 0x007d, [0x7e] = 0x007e, [0x7f] = 0x007f,
+  [0x80] = 0x0402, [0x81] = 0x0403, [0x82] = 0x201a, [0x83] = 0x0453,
+  [0x84] = 0x201e, [0x85] = 0x2026, [0x86] = 0x2020, [0x87] = 0x2021,
+  [0x88] = 0x20ac, [0x89] = 0x2030, [0x8a] = 0x0409, [0x8b] = 0x2039,
+  [0x8c] = 0x040a, [0x8d] = 0x040c, [0x8e] = 0x040b, [0x8f] = 0x040f,
+  [0x90] = 0x0452, [0x91] = 0x2018, [0x92] = 0x2019, [0x93] = 0x201c,
+  [0x94] = 0x201d, [0x95] = 0x2022, [0x96] = 0x2013, [0x97] = 0x2014,
+  [0x98] = 0x0098, [0x99] = 0x2122, [0x9a] = 0x0459, [0x9b] = 0x203a,
+  [0x9c] = 0x045a, [0x9d] = 0x045c, [0x9e] = 0x045b, [0x9f] = 0x045f,
+  [0xa0] = 0x00a0, [0xa1] = 0x040e, [0xa2] = 0x045e, [0xa3] = 0x0408,
+  [0xa4] = 0x00a4, [0xa5] = 0x0490, [0xa6] = 0x00a6, [0xa7] = 0x00a7,
+  [0xa8] = 0x0401, [0xa9] = 0x00a9, [0xaa] = 0x0404, [0xab] = 0x00ab,
+  [0xac] = 0x00ac, [0xad] = 0x00ad, [0xae] = 0x00ae, [0xaf] = 0x0407,
+  [0xb0] = 0x00b0, [0xb1] = 0x00b1, [0xb2] = 0x0406, [0xb3] = 0x0456,
+  [0xb4] = 0x0491, [0xb5] = 0x00b5, [0xb6] = 0x00b6, [0xb7] = 0x00b7,
+  [0xb8] = 0x0451, [0xb9] = 0x2116, [0xba] = 0x0454, [0xbb] = 0x00bb,
+  [0xbc] = 0x0458, [0xbd] = 0x0405, [0xbe] = 0x0455, [0xbf] = 0x0457,
+  [0xc0] = 0x0410, [0xc1] = 0x0411, [0xc2] = 0x0412, [0xc3] = 0x0413,
+  [0xc4] = 0x0414, [0xc5] = 0x0415, [0xc6] = 0x0416, [0xc7] = 0x0417,
+  [0xc8] = 0x0418, [0xc9] = 0x0419, [0xca] = 0x041a, [0xcb] = 0x041b,
+  [0xcc] = 0x041c, [0xcd] = 0x041d, [0xce] = 0x041e, [0xcf] = 0x041f,
+  [0xd0] = 0x0420, [0xd1] = 0x0421, [0xd2] = 0x0422, [0xd3] = 0x0423,
+  [0xd4] = 0x0424, [0xd5] = 0x0425, [0xd6] = 0x0426, [0xd7] = 0x0427,
+  [0xd8] = 0x0428, [0xd9] = 0x0429, [0xda] = 0x042a, [0xdb] = 0x042b,
+  [0xdc] = 0x042c, [0xdd] = 0x042d, [0xde] = 0x042e, [0xdf] = 0x042f,
+  [0xe0] = 0x0430, [0xe1] = 0x0431, [0xe2] = 0x0432, [0xe3] = 0x0433,
+  [0xe4] = 0x0434, [0xe5] = 0x0435, [0xe6] = 0x0436, [0xe7] = 0x0437,
+  [0xe8] = 0x0438, [0xe9] = 0x0439, [0xea] = 0x043a, [0xeb] = 0x043b,
+  [0xec] = 0x043c, [0xed] = 0x043d, [0xee] = 0x043e, [0xef] = 0x043f,
+  [0xf0] = 0x0440, [0xf1] = 0x0441, [0xf2] = 0x0442, [0xf3] = 0x0443,
+  [0xf4] = 0x0444, [0xf5] = 0x0445, [0xf6] = 0x0446, [0xf7] = 0x0447,
+  [0xf8] = 0x0448, [0xf9] = 0x0449, [0xfa] = 0x044a, [0xfb] = 0x044b,
+  [0xfc] = 0x044c, [0xfd] = 0x044d, [0xfe] = 0x044e, [0xff] = 0x044f
+};
+
+static const struct gap from_idx[] =
+{
+  { start: 0x0000, end: 0x007f, idx:     0 },
+  { start: 0x0098, end: 0x0098, idx:   -24 },
+  { start: 0x00a0, end: 0x00bb, idx:   -31 },
+  { start: 0x0401, end: 0x045f, idx:  -868 },
+  { start: 0x0490, end: 0x0491, idx:  -916 },
+  { start: 0x2013, end: 0x2026, idx: -7957 },
+  { start: 0x2030, end: 0x2030, idx: -7966 },
+  { start: 0x2039, end: 0x203a, idx: -7974 },
+  { start: 0x20ac, end: 0x20ac, idx: -8087 },
+  { start: 0x2116, end: 0x2116, idx: -8192 },
+  { start: 0x2122, end: 0x2122, idx: -8203 },
+  { start: 0xffff, end: 0xffff, idx:     0 }
+};
+
+static const char from_ucs4[] =
+{
+  '\x00', '\x01', '\x02', '\x03', '\x04', '\x05', '\x06', '\x07',
+  '\x08', '\x09', '\x0a', '\x0b', '\x0c', '\x0d', '\x0e', '\x0f',
+  '\x10', '\x11', '\x12', '\x13', '\x14', '\x15', '\x16', '\x17',
+  '\x18', '\x19', '\x1a', '\x1b', '\x1c', '\x1d', '\x1e', '\x1f',
+  '\x20', '\x21', '\x22', '\x23', '\x24', '\x25', '\x26', '\x27',
+  '\x28', '\x29', '\x2a', '\x2b', '\x2c', '\x2d', '\x2e', '\x2f',
+  '\x30', '\x31', '\x32', '\x33', '\x34', '\x35', '\x36', '\x37',
+  '\x38', '\x39', '\x3a', '\x3b', '\x3c', '\x3d', '\x3e', '\x3f',
+  '\x40', '\x41', '\x42', '\x43', '\x44', '\x45', '\x46', '\x47',
+  '\x48', '\x49', '\x4a', '\x4b', '\x4c', '\x4d', '\x4e', '\x4f',
+  '\x50', '\x51', '\x52', '\x53', '\x54', '\x55', '\x56', '\x57',
+  '\x58', '\x59', '\x5a', '\x5b', '\x5c', '\x5d', '\x5e', '\x5f',
+  '\x60', '\x61', '\x62', '\x63', '\x64', '\x65', '\x66', '\x67',
+  '\x68', '\x69', '\x6a', '\x6b', '\x6c', '\x6d', '\x6e', '\x6f',
+  '\x70', '\x71', '\x72', '\x73', '\x74', '\x75', '\x76', '\x77',
+  '\x78', '\x79', '\x7a', '\x7b', '\x7c', '\x7d', '\x7e', '\x7f',
+  '\x98', '\xa0', '\x00', '\x00', '\x00', '\xa4', '\x00', '\xa6',
+  '\xa7', '\x00', '\xa9', '\x00', '\xab', '\xac', '\xad', '\xae',
+  '\x00', '\xb0', '\xb1', '\x00', '\x00', '\x00', '\xb5', '\xb6',
+  '\xb7', '\x00', '\x00', '\x00', '\xbb', '\xa8', '\x80', '\x81',
+  '\xaa', '\xbd', '\xb2', '\xaf', '\xa3', '\x8a', '\x8c', '\x8e',
+  '\x8d', '\x00', '\xa1', '\x8f', '\xc0', '\xc1', '\xc2', '\xc3',
+  '\xc4', '\xc5', '\xc6', '\xc7', '\xc8', '\xc9', '\xca', '\xcb',
+  '\xcc', '\xcd', '\xce', '\xcf', '\xd0', '\xd1', '\xd2', '\xd3',
+  '\xd4', '\xd5', '\xd6', '\xd7', '\xd8', '\xd9', '\xda', '\xdb',
+  '\xdc', '\xdd', '\xde', '\xdf', '\xe0', '\xe1', '\xe2', '\xe3',
+  '\xe4', '\xe5', '\xe6', '\xe7', '\xe8', '\xe9', '\xea', '\xeb',
+  '\xec', '\xed', '\xee', '\xef', '\xf0', '\xf1', '\xf2', '\xf3',
+  '\xf4', '\xf5', '\xf6', '\xf7', '\xf8', '\xf9', '\xfa', '\xfb',
+  '\xfc', '\xfd', '\xfe', '\xff', '\x00', '\xb8', '\x90', '\x83',
+  '\xba', '\xbe', '\xb3', '\xbf', '\xbc', '\x9a', '\x9c', '\x9e',
+  '\x9d', '\x00', '\xa2', '\x9f', '\xa5', '\xb4', '\x96', '\x97',
+  '\x00', '\x00', '\x00', '\x91', '\x92', '\x82', '\x00', '\x93',
+  '\x94', '\x84', '\x00', '\x86', '\x87', '\x95', '\x00', '\x00',
+  '\x00', '\x85', '\x89', '\x8b', '\x9b', '\x88', '\xb9', '\x99'
+};
diff --git a/iconvdata/ibm9030.c b/iconvdata/ibm9030.c
new file mode 100644
index 0000000000..f2fd93ea4b
--- /dev/null
+++ b/iconvdata/ibm9030.c
@@ -0,0 +1,29 @@
+/* Conversion from and to IBM9030.
+   Copyright (C) 2005 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#include <stdint.h>
+
+/* Get the conversion table.  */
+#define TABLES <ibm9030.h>
+
+#define CHARSET_NAME	"IBM9030//"
+#define HAS_HOLES	0	/* All 256 character are defined.  */
+
+#include <8bit-gap.c>
diff --git a/iconvdata/ibm9030.h b/iconvdata/ibm9030.h
new file mode 100644
index 0000000000..8c1b10b2d5
--- /dev/null
+++ b/iconvdata/ibm9030.h
@@ -0,0 +1,131 @@
+/* Tables for conversion from and to IBM9030.
+   Copyright (C) 2005 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+static const uint32_t to_ucs4[256] =
+{
+  [0x00] = 0x0000, [0x01] = 0x0001, [0x02] = 0x0002, [0x03] = 0x0003,
+  [0x04] = 0x009c, [0x05] = 0x0009, [0x06] = 0x0086, [0x07] = 0x007f,
+  [0x08] = 0x0097, [0x09] = 0x008d, [0x0a] = 0x008e, [0x0b] = 0x000b,
+  [0x0c] = 0x000c, [0x0d] = 0x000d, [0x0e] = 0x000e, [0x0f] = 0x000f,
+  [0x10] = 0x0010, [0x11] = 0x0011, [0x12] = 0x0012, [0x13] = 0x0013,
+  [0x14] = 0x009d, [0x15] = 0x0085, [0x16] = 0x0008, [0x17] = 0x0087,
+  [0x18] = 0x0018, [0x19] = 0x0019, [0x1a] = 0x0092, [0x1b] = 0x008f,
+  [0x1c] = 0x001c, [0x1d] = 0x001d, [0x1e] = 0x001e, [0x1f] = 0x001f,
+  [0x20] = 0x0080, [0x21] = 0x0081, [0x22] = 0x0082, [0x23] = 0x0083,
+  [0x24] = 0x0084, [0x25] = 0x000a, [0x26] = 0x0017, [0x27] = 0x001b,
+  [0x28] = 0x0088, [0x29] = 0x0089, [0x2a] = 0x008a, [0x2b] = 0x008b,
+  [0x2c] = 0x008c, [0x2d] = 0x0005, [0x2e] = 0x0006, [0x2f] = 0x0007,
+  [0x30] = 0x0090, [0x31] = 0x0091, [0x32] = 0x0016, [0x33] = 0x0093,
+  [0x34] = 0x0094, [0x35] = 0x0095, [0x36] = 0x0096, [0x37] = 0x0004,
+  [0x38] = 0x0098, [0x39] = 0x0099, [0x3a] = 0x009a, [0x3b] = 0x009b,
+  [0x3c] = 0x0014, [0x3d] = 0x0015, [0x3e] = 0x009e, [0x3f] = 0x001a,
+  [0x40] = 0x0020, [0x41] = 0x00a0, [0x42] = 0x0e01, [0x43] = 0x0e02,
+  [0x44] = 0x0e03, [0x45] = 0x0e04, [0x46] = 0x0e05, [0x47] = 0x0e06,
+  [0x48] = 0x0e07, [0x49] = 0x005b, [0x4a] = 0x00a2, [0x4b] = 0x002e,
+  [0x4c] = 0x003c, [0x4d] = 0x0028, [0x4e] = 0x002b, [0x4f] = 0x007c,
+  [0x50] = 0x0026, [0x51] = 0x0e48, [0x52] = 0x0e08, [0x53] = 0x0e09,
+  [0x54] = 0x0e0a, [0x55] = 0x0e0b, [0x56] = 0x0e0c, [0x57] = 0x0e0d,
+  [0x58] = 0x0e0e, [0x59] = 0x005d, [0x5a] = 0x0021, [0x5b] = 0x0024,
+  [0x5c] = 0x002a, [0x5d] = 0x0029, [0x5e] = 0x003b, [0x5f] = 0x00ac,
+  [0x60] = 0x002d, [0x61] = 0x002f, [0x62] = 0x0e0f, [0x63] = 0x0e10,
+  [0x64] = 0x0e11, [0x65] = 0x0e12, [0x66] = 0x0e13, [0x67] = 0x0e14,
+  [0x68] = 0x0e15, [0x69] = 0x005e, [0x6a] = 0x00a6, [0x6b] = 0x002c,
+  [0x6c] = 0x0025, [0x6d] = 0x005f, [0x6e] = 0x003e, [0x6f] = 0x003f,
+  [0x70] = 0x0e3f, [0x71] = 0x0e4e, [0x72] = 0x0e16, [0x73] = 0x0e17,
+  [0x74] = 0x0e18, [0x75] = 0x0e19, [0x76] = 0x0e1a, [0x77] = 0x0e1b,
+  [0x78] = 0x0e1c, [0x79] = 0x0060, [0x7a] = 0x003a, [0x7b] = 0x0023,
+  [0x7c] = 0x0040, [0x7d] = 0x0027, [0x7e] = 0x003d, [0x7f] = 0x0022,
+  [0x80] = 0x0e4f, [0x81] = 0x0061, [0x82] = 0x0062, [0x83] = 0x0063,
+  [0x84] = 0x0064, [0x85] = 0x0065, [0x86] = 0x0066, [0x87] = 0x0067,
+  [0x88] = 0x0068, [0x89] = 0x0069, [0x8a] = 0x0e1d, [0x8b] = 0x0e1e,
+  [0x8c] = 0x0e1f, [0x8d] = 0x0e20, [0x8e] = 0x0e21, [0x8f] = 0x0e22,
+  [0x90] = 0x0e5a, [0x91] = 0x006a, [0x92] = 0x006b, [0x93] = 0x006c,
+  [0x94] = 0x006d, [0x95] = 0x006e, [0x96] = 0x006f, [0x97] = 0x0070,
+  [0x98] = 0x0071, [0x99] = 0x0072, [0x9a] = 0x0e23, [0x9b] = 0x0e24,
+  [0x9c] = 0x0e25, [0x9d] = 0x0e26, [0x9e] = 0x0e27, [0x9f] = 0x0e28,
+  [0xa0] = 0x0e5b, [0xa1] = 0x007e, [0xa2] = 0x0073, [0xa3] = 0x0074,
+  [0xa4] = 0x0075, [0xa5] = 0x0076, [0xa6] = 0x0077, [0xa7] = 0x0078,
+  [0xa8] = 0x0079, [0xa9] = 0x007a, [0xaa] = 0x0e29, [0xab] = 0x0e2a,
+  [0xac] = 0x0e2b, [0xad] = 0x0e2c, [0xae] = 0x0e2d, [0xaf] = 0x0e2e,
+  [0xb0] = 0x0e50, [0xb1] = 0x0e51, [0xb2] = 0x0e52, [0xb3] = 0x0e53,
+  [0xb4] = 0x0e54, [0xb5] = 0x0e55, [0xb6] = 0x0e56, [0xb7] = 0x0e57,
+  [0xb8] = 0x0e58, [0xb9] = 0x0e59, [0xba] = 0x0e2f, [0xbb] = 0x0e30,
+  [0xbc] = 0x0e31, [0xbd] = 0x0e32, [0xbe] = 0x0e33, [0xbf] = 0x0e34,
+  [0xc0] = 0x007b, [0xc1] = 0x0041, [0xc2] = 0x0042, [0xc3] = 0x0043,
+  [0xc4] = 0x0044, [0xc5] = 0x0045, [0xc6] = 0x0046, [0xc7] = 0x0047,
+  [0xc8] = 0x0048, [0xc9] = 0x0049, [0xca] = 0x0e49, [0xcb] = 0x0e35,
+  [0xcc] = 0x0e36, [0xcd] = 0x0e37, [0xce] = 0x0e38, [0xcf] = 0x0e39,
+  [0xd0] = 0x007d, [0xd1] = 0x004a, [0xd2] = 0x004b, [0xd3] = 0x004c,
+  [0xd4] = 0x004d, [0xd5] = 0x004e, [0xd6] = 0x004f, [0xd7] = 0x0050,
+  [0xd8] = 0x0051, [0xd9] = 0x0052, [0xda] = 0x0e3a, [0xdb] = 0x0e40,
+  [0xdc] = 0x0e41, [0xdd] = 0x0e42, [0xde] = 0x0e43, [0xdf] = 0x0e44,
+  [0xe0] = 0x005c, [0xe1] = 0x0e4a, [0xe2] = 0x0053, [0xe3] = 0x0054,
+  [0xe4] = 0x0055, [0xe5] = 0x0056, [0xe6] = 0x0057, [0xe7] = 0x0058,
+  [0xe8] = 0x0059, [0xe9] = 0x005a, [0xea] = 0x0e45, [0xeb] = 0x0e46,
+  [0xec] = 0x0e47, [0xed] = 0x0e48, [0xee] = 0x0e49, [0xef] = 0x0e4a,
+  [0xf0] = 0x0030, [0xf1] = 0x0031, [0xf2] = 0x0032, [0xf3] = 0x0033,
+  [0xf4] = 0x0034, [0xf5] = 0x0035, [0xf6] = 0x0036, [0xf7] = 0x0037,
+  [0xf8] = 0x0038, [0xf9] = 0x0039, [0xfa] = 0x0e4b, [0xfb] = 0x0e4c,
+  [0xfc] = 0x0e4d, [0xfd] = 0x0e4b, [0xfe] = 0x0e4c, [0xff] = 0x009f
+};
+
+static const struct gap from_idx[] =
+{
+  { start: 0x0000, end: 0x00ac, idx:     0 },
+  { start: 0x0e01, end: 0x0e5b, idx: -3412 },
+  { start: 0xffff, end: 0xffff, idx:     0 }
+};
+
+static const char from_ucs4[] =
+{
+  '\x00', '\x01', '\x02', '\x03', '\x37', '\x2d', '\x2e', '\x2f',
+  '\x16', '\x05', '\x25', '\x0b', '\x0c', '\x0d', '\x0e', '\x0f',
+  '\x10', '\x11', '\x12', '\x13', '\x3c', '\x3d', '\x32', '\x26',
+  '\x18', '\x19', '\x3f', '\x27', '\x1c', '\x1d', '\x1e', '\x1f',
+  '\x40', '\x5a', '\x7f', '\x7b', '\x5b', '\x6c', '\x50', '\x7d',
+  '\x4d', '\x5d', '\x5c', '\x4e', '\x6b', '\x60', '\x4b', '\x61',
+  '\xf0', '\xf1', '\xf2', '\xf3', '\xf4', '\xf5', '\xf6', '\xf7',
+  '\xf8', '\xf9', '\x7a', '\x5e', '\x4c', '\x7e', '\x6e', '\x6f',
+  '\x7c', '\xc1', '\xc2', '\xc3', '\xc4', '\xc5', '\xc6', '\xc7',
+  '\xc8', '\xc9', '\xd1', '\xd2', '\xd3', '\xd4', '\xd5', '\xd6',
+  '\xd7', '\xd8', '\xd9', '\xe2', '\xe3', '\xe4', '\xe5', '\xe6',
+  '\xe7', '\xe8', '\xe9', '\x49', '\xe0', '\x59', '\x69', '\x6d',
+  '\x79', '\x81', '\x82', '\x83', '\x84', '\x85', '\x86', '\x87',
+  '\x88', '\x89', '\x91', '\x92', '\x93', '\x94', '\x95', '\x96',
+  '\x97', '\x98', '\x99', '\xa2', '\xa3', '\xa4', '\xa5', '\xa6',
+  '\xa7', '\xa8', '\xa9', '\xc0', '\x4f', '\xd0', '\xa1', '\x07',
+  '\x20', '\x21', '\x22', '\x23', '\x24', '\x15', '\x06', '\x17',
+  '\x28', '\x29', '\x2a', '\x2b', '\x2c', '\x09', '\x0a', '\x1b',
+  '\x30', '\x31', '\x1a', '\x33', '\x34', '\x35', '\x36', '\x08',
+  '\x38', '\x39', '\x3a', '\x3b', '\x04', '\x14', '\x3e', '\xff',
+  '\x41', '\x00', '\x4a', '\x00', '\x00', '\x00', '\x6a', '\x00',
+  '\x00', '\x00', '\x00', '\x00', '\x5f', '\x42', '\x43', '\x44',
+  '\x45', '\x46', '\x47', '\x48', '\x52', '\x53', '\x54', '\x55',
+  '\x56', '\x57', '\x58', '\x62', '\x63', '\x64', '\x65', '\x66',
+  '\x67', '\x68', '\x72', '\x73', '\x74', '\x75', '\x76', '\x77',
+  '\x78', '\x8a', '\x8b', '\x8c', '\x8d', '\x8e', '\x8f', '\x9a',
+  '\x9b', '\x9c', '\x9d', '\x9e', '\x9f', '\xaa', '\xab', '\xac',
+  '\xad', '\xae', '\xaf', '\xba', '\xbb', '\xbc', '\xbd', '\xbe',
+  '\xbf', '\xcb', '\xcc', '\xcd', '\xce', '\xcf', '\xda', '\x00',
+  '\x00', '\x00', '\x00', '\x70', '\xdb', '\xdc', '\xdd', '\xde',
+  '\xdf', '\xea', '\xeb', '\xec', '\xed', '\xee', '\xef', '\xfa',
+  '\xfb', '\xfc', '\x71', '\x80', '\xb0', '\xb1', '\xb2', '\xb3',
+  '\xb4', '\xb5', '\xb6', '\xb7', '\xb8', '\xb9', '\x90', '\xa0'
+};
diff --git a/iconvdata/ibm9066.c b/iconvdata/ibm9066.c
new file mode 100644
index 0000000000..dd14e36f78
--- /dev/null
+++ b/iconvdata/ibm9066.c
@@ -0,0 +1,29 @@
+/* Conversion from and to IBM9066.
+   Copyright (C) 2005 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#include <stdint.h>
+
+/* Get the conversion table.  */
+#define TABLES <ibm9066.h>
+
+#define CHARSET_NAME	"IBM9066//"
+#define HAS_HOLES	1	/* Not all 256 character are defined.  */
+
+#include <8bit-gap.c>
diff --git a/iconvdata/ibm9066.h b/iconvdata/ibm9066.h
new file mode 100644
index 0000000000..b1f2604826
--- /dev/null
+++ b/iconvdata/ibm9066.h
@@ -0,0 +1,120 @@
+/* Tables for conversion from and to IBM9066.
+   Copyright (C) 2005 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+static const uint32_t to_ucs4[256] =
+{
+  [0x00] = 0x0000, [0x01] = 0x0001, [0x02] = 0x0002, [0x03] = 0x0003,
+  [0x04] = 0x0004, [0x05] = 0x0005, [0x06] = 0x0006, [0x07] = 0x0007,
+  [0x08] = 0x0008, [0x09] = 0x0009, [0x0a] = 0x000a, [0x0b] = 0x000b,
+  [0x0c] = 0x000c, [0x0d] = 0x000d, [0x0e] = 0x000e, [0x0f] = 0x000f,
+  [0x10] = 0x0010, [0x11] = 0x0011, [0x12] = 0x0012, [0x13] = 0x0013,
+  [0x14] = 0x0014, [0x15] = 0x0015, [0x16] = 0x0016, [0x17] = 0x0017,
+  [0x18] = 0x0018, [0x19] = 0x0019, [0x1a] = 0x001c, [0x1b] = 0x001b,
+  [0x1c] = 0x007f, [0x1d] = 0x001d, [0x1e] = 0x001e, [0x1f] = 0x001f,
+  [0x20] = 0x0020, [0x21] = 0x0021, [0x22] = 0x0022, [0x23] = 0x0023,
+  [0x24] = 0x0024, [0x25] = 0x0025, [0x26] = 0x0026, [0x27] = 0x0027,
+  [0x28] = 0x0028, [0x29] = 0x0029, [0x2a] = 0x002a, [0x2b] = 0x002b,
+  [0x2c] = 0x002c, [0x2d] = 0x002d, [0x2e] = 0x002e, [0x2f] = 0x002f,
+  [0x30] = 0x0030, [0x31] = 0x0031, [0x32] = 0x0032, [0x33] = 0x0033,
+  [0x34] = 0x0034, [0x35] = 0x0035, [0x36] = 0x0036, [0x37] = 0x0037,
+  [0x38] = 0x0038, [0x39] = 0x0039, [0x3a] = 0x003a, [0x3b] = 0x003b,
+  [0x3c] = 0x003c, [0x3d] = 0x003d, [0x3e] = 0x003e, [0x3f] = 0x003f,
+  [0x40] = 0x0040, [0x41] = 0x0041, [0x42] = 0x0042, [0x43] = 0x0043,
+  [0x44] = 0x0044, [0x45] = 0x0045, [0x46] = 0x0046, [0x47] = 0x0047,
+  [0x48] = 0x0048, [0x49] = 0x0049, [0x4a] = 0x004a, [0x4b] = 0x004b,
+  [0x4c] = 0x004c, [0x4d] = 0x004d, [0x4e] = 0x004e, [0x4f] = 0x004f,
+  [0x50] = 0x0050, [0x51] = 0x0051, [0x52] = 0x0052, [0x53] = 0x0053,
+  [0x54] = 0x0054, [0x55] = 0x0055, [0x56] = 0x0056, [0x57] = 0x0057,
+  [0x58] = 0x0058, [0x59] = 0x0059, [0x5a] = 0x005a, [0x5b] = 0x005b,
+  [0x5c] = 0x005c, [0x5d] = 0x005d, [0x5e] = 0x005e, [0x5f] = 0x005f,
+  [0x60] = 0x0060, [0x61] = 0x0061, [0x62] = 0x0062, [0x63] = 0x0063,
+  [0x64] = 0x0064, [0x65] = 0x0065, [0x66] = 0x0066, [0x67] = 0x0067,
+  [0x68] = 0x0068, [0x69] = 0x0069, [0x6a] = 0x006a, [0x6b] = 0x006b,
+  [0x6c] = 0x006c, [0x6d] = 0x006d, [0x6e] = 0x006e, [0x6f] = 0x006f,
+  [0x70] = 0x0070, [0x71] = 0x0071, [0x72] = 0x0072, [0x73] = 0x0073,
+  [0x74] = 0x0074, [0x75] = 0x0075, [0x76] = 0x0076, [0x77] = 0x0077,
+  [0x78] = 0x0078, [0x79] = 0x0079, [0x7a] = 0x007a, [0x7b] = 0x007b,
+  [0x7c] = 0x007c, [0x7d] = 0x007d, [0x7e] = 0x007e, [0x7f] = 0x001a,
+  [0xa0] = 0x0e48, [0xa1] = 0x0e01, [0xa2] = 0x0e02, [0xa3] = 0x0e03,
+  [0xa4] = 0x0e04, [0xa5] = 0x0e05, [0xa6] = 0x0e06, [0xa7] = 0x0e07,
+  [0xa8] = 0x0e08, [0xa9] = 0x0e09, [0xaa] = 0x0e0a, [0xab] = 0x0e0b,
+  [0xac] = 0x0e0c, [0xad] = 0x0e0d, [0xae] = 0x0e0e, [0xaf] = 0x0e0f,
+  [0xb0] = 0x0e10, [0xb1] = 0x0e11, [0xb2] = 0x0e12, [0xb3] = 0x0e13,
+  [0xb4] = 0x0e14, [0xb5] = 0x0e15, [0xb6] = 0x0e16, [0xb7] = 0x0e17,
+  [0xb8] = 0x0e18, [0xb9] = 0x0e19, [0xba] = 0x0e1a, [0xbb] = 0x0e1b,
+  [0xbc] = 0x0e1c, [0xbd] = 0x0e1d, [0xbe] = 0x0e1e, [0xbf] = 0x0e1f,
+  [0xc0] = 0x0e20, [0xc1] = 0x0e21, [0xc2] = 0x0e22, [0xc3] = 0x0e23,
+  [0xc4] = 0x0e24, [0xc5] = 0x0e25, [0xc6] = 0x0e26, [0xc7] = 0x0e27,
+  [0xc8] = 0x0e28, [0xc9] = 0x0e29, [0xca] = 0x0e2a, [0xcb] = 0x0e2b,
+  [0xcc] = 0x0e2c, [0xcd] = 0x0e2d, [0xce] = 0x0e2e, [0xcf] = 0x0e2f,
+  [0xd0] = 0x0e30, [0xd1] = 0x0e31, [0xd2] = 0x0e32, [0xd3] = 0x0e33,
+  [0xd4] = 0x0e34, [0xd5] = 0x0e35, [0xd6] = 0x0e36, [0xd7] = 0x0e37,
+  [0xd8] = 0x0e38, [0xd9] = 0x0e39, [0xda] = 0x0e3a, [0xdb] = 0x0e49,
+  [0xdc] = 0x0e4a, [0xdd] = 0x0e4b, [0xde] = 0x0e4c, [0xdf] = 0x0e3f,
+  [0xe0] = 0x0e40, [0xe1] = 0x0e41, [0xe2] = 0x0e42, [0xe3] = 0x0e43,
+  [0xe4] = 0x0e44, [0xe5] = 0x0e45, [0xe6] = 0x0e46, [0xe7] = 0x0e47,
+  [0xe8] = 0x0e48, [0xe9] = 0x0e49, [0xea] = 0x0e4a, [0xeb] = 0x0e4b,
+  [0xec] = 0x0e4c, [0xed] = 0x0e4d, [0xee] = 0x0e4e, [0xef] = 0x0e4f,
+  [0xf0] = 0x0e50, [0xf1] = 0x0e51, [0xf2] = 0x0e52, [0xf3] = 0x0e53,
+  [0xf4] = 0x0e54, [0xf5] = 0x0e55, [0xf6] = 0x0e56, [0xf7] = 0x0e57,
+  [0xf8] = 0x0e58, [0xf9] = 0x0e59, [0xfa] = 0x0e5a, [0xfb] = 0x0e5b,
+  [0xfc] = 0x00a2, [0xfd] = 0x00ac, [0xfe] = 0x00a6, [0xff] = 0x00a0
+};
+
+static const struct gap from_idx[] =
+{
+  { start: 0x0000, end: 0x007f, idx:     0 },
+  { start: 0x00a0, end: 0x00ac, idx:   -32 },
+  { start: 0x0e01, end: 0x0e5b, idx: -3444 },
+  { start: 0xffff, end: 0xffff, idx:     0 }
+};
+
+static const char from_ucs4[] =
+{
+  '\x00', '\x01', '\x02', '\x03', '\x04', '\x05', '\x06', '\x07',
+  '\x08', '\x09', '\x0a', '\x0b', '\x0c', '\x0d', '\x0e', '\x0f',
+  '\x10', '\x11', '\x12', '\x13', '\x14', '\x15', '\x16', '\x17',
+  '\x18', '\x19', '\x7f', '\x1b', '\x1a', '\x1d', '\x1e', '\x1f',
+  '\x20', '\x21', '\x22', '\x23', '\x24', '\x25', '\x26', '\x27',
+  '\x28', '\x29', '\x2a', '\x2b', '\x2c', '\x2d', '\x2e', '\x2f',
+  '\x30', '\x31', '\x32', '\x33', '\x34', '\x35', '\x36', '\x37',
+  '\x38', '\x39', '\x3a', '\x3b', '\x3c', '\x3d', '\x3e', '\x3f',
+  '\x40', '\x41', '\x42', '\x43', '\x44', '\x45', '\x46', '\x47',
+  '\x48', '\x49', '\x4a', '\x4b', '\x4c', '\x4d', '\x4e', '\x4f',
+  '\x50', '\x51', '\x52', '\x53', '\x54', '\x55', '\x56', '\x57',
+  '\x58', '\x59', '\x5a', '\x5b', '\x5c', '\x5d', '\x5e', '\x5f',
+  '\x60', '\x61', '\x62', '\x63', '\x64', '\x65', '\x66', '\x67',
+  '\x68', '\x69', '\x6a', '\x6b', '\x6c', '\x6d', '\x6e', '\x6f',
+  '\x70', '\x71', '\x72', '\x73', '\x74', '\x75', '\x76', '\x77',
+  '\x78', '\x79', '\x7a', '\x7b', '\x7c', '\x7d', '\x7e', '\x1c',
+  '\xff', '\x00', '\xfc', '\x00', '\x00', '\x00', '\xfe', '\x00',
+  '\x00', '\x00', '\x00', '\x00', '\xfd', '\xa1', '\xa2', '\xa3',
+  '\xa4', '\xa5', '\xa6', '\xa7', '\xa8', '\xa9', '\xaa', '\xab',
+  '\xac', '\xad', '\xae', '\xaf', '\xb0', '\xb1', '\xb2', '\xb3',
+  '\xb4', '\xb5', '\xb6', '\xb7', '\xb8', '\xb9', '\xba', '\xbb',
+  '\xbc', '\xbd', '\xbe', '\xbf', '\xc0', '\xc1', '\xc2', '\xc3',
+  '\xc4', '\xc5', '\xc6', '\xc7', '\xc8', '\xc9', '\xca', '\xcb',
+  '\xcc', '\xcd', '\xce', '\xcf', '\xd0', '\xd1', '\xd2', '\xd3',
+  '\xd4', '\xd5', '\xd6', '\xd7', '\xd8', '\xd9', '\xda', '\x00',
+  '\x00', '\x00', '\x00', '\xdf', '\xe0', '\xe1', '\xe2', '\xe3',
+  '\xe4', '\xe5', '\xe6', '\xe7', '\xe8', '\xe9', '\xea', '\xeb',
+  '\xec', '\xed', '\xee', '\xef', '\xf0', '\xf1', '\xf2', '\xf3',
+  '\xf4', '\xf5', '\xf6', '\xf7', '\xf8', '\xf9', '\xfa', '\xfb'
+};
diff --git a/iconvdata/ibm9448.c b/iconvdata/ibm9448.c
new file mode 100644
index 0000000000..d3694cae74
--- /dev/null
+++ b/iconvdata/ibm9448.c
@@ -0,0 +1,29 @@
+/* Conversion from and to IBM9448.
+   Copyright (C) 2005 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#include <stdint.h>
+
+/* Get the conversion table.  */
+#define TABLES <ibm9448.h>
+
+#define CHARSET_NAME	"IBM9448//"
+#define HAS_HOLES	0	/* All 256 character are defined.  */
+
+#include <8bit-gap.c>
diff --git a/iconvdata/ibm9448.h b/iconvdata/ibm9448.h
new file mode 100644
index 0000000000..ffedf3ecc6
--- /dev/null
+++ b/iconvdata/ibm9448.h
@@ -0,0 +1,191 @@
+/* Tables for conversion from and to IBM9448.
+   Copyright (C) 2005 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+static const uint32_t to_ucs4[256] =
+{
+  [0x00] = 0x0000, [0x01] = 0x0001, [0x02] = 0x0002, [0x03] = 0x0003,
+  [0x04] = 0x0004, [0x05] = 0x0005, [0x06] = 0x0006, [0x07] = 0x0007,
+  [0x08] = 0x0008, [0x09] = 0x0009, [0x0a] = 0x000a, [0x0b] = 0x000b,
+  [0x0c] = 0x000c, [0x0d] = 0x000d, [0x0e] = 0x000e, [0x0f] = 0x000f,
+  [0x10] = 0x0010, [0x11] = 0x0011, [0x12] = 0x0012, [0x13] = 0x0013,
+  [0x14] = 0x0014, [0x15] = 0x0015, [0x16] = 0x0016, [0x17] = 0x0017,
+  [0x18] = 0x0018, [0x19] = 0x0019, [0x1a] = 0x001a, [0x1b] = 0x001b,
+  [0x1c] = 0x001c, [0x1d] = 0x001d, [0x1e] = 0x001e, [0x1f] = 0x001f,
+  [0x20] = 0x0020, [0x21] = 0x0021, [0x22] = 0x0022, [0x23] = 0x0023,
+  [0x24] = 0x0024, [0x25] = 0x0025, [0x26] = 0x0026, [0x27] = 0x0027,
+  [0x28] = 0x0028, [0x29] = 0x0029, [0x2a] = 0x002a, [0x2b] = 0x002b,
+  [0x2c] = 0x002c, [0x2d] = 0x002d, [0x2e] = 0x002e, [0x2f] = 0x002f,
+  [0x30] = 0x0030, [0x31] = 0x0031, [0x32] = 0x0032, [0x33] = 0x0033,
+  [0x34] = 0x0034, [0x35] = 0x0035, [0x36] = 0x0036, [0x37] = 0x0037,
+  [0x38] = 0x0038, [0x39] = 0x0039, [0x3a] = 0x003a, [0x3b] = 0x003b,
+  [0x3c] = 0x003c, [0x3d] = 0x003d, [0x3e] = 0x003e, [0x3f] = 0x003f,
+  [0x40] = 0x0040, [0x41] = 0x0041, [0x42] = 0x0042, [0x43] = 0x0043,
+  [0x44] = 0x0044, [0x45] = 0x0045, [0x46] = 0x0046, [0x47] = 0x0047,
+  [0x48] = 0x0048, [0x49] = 0x0049, [0x4a] = 0x004a, [0x4b] = 0x004b,
+  [0x4c] = 0x004c, [0x4d] = 0x004d, [0x4e] = 0x004e, [0x4f] = 0x004f,
+  [0x50] = 0x0050, [0x51] = 0x0051, [0x52] = 0x0052, [0x53] = 0x0053,
+  [0x54] = 0x0054, [0x55] = 0x0055, [0x56] = 0x0056, [0x57] = 0x0057,
+  [0x58] = 0x0058, [0x59] = 0x0059, [0x5a] = 0x005a, [0x5b] = 0x005b,
+  [0x5c] = 0x005c, [0x5d] = 0x005d, [0x5e] = 0x005e, [0x5f] = 0x005f,
+  [0x60] = 0x0060, [0x61] = 0x0061, [0x62] = 0x0062, [0x63] = 0x0063,
+  [0x64] = 0x0064, [0x65] = 0x0065, [0x66] = 0x0066, [0x67] = 0x0067,
+  [0x68] = 0x0068, [0x69] = 0x0069, [0x6a] = 0x006a, [0x6b] = 0x006b,
+  [0x6c] = 0x006c, [0x6d] = 0x006d, [0x6e] = 0x006e, [0x6f] = 0x006f,
+  [0x70] = 0x0070, [0x71] = 0x0071, [0x72] = 0x0072, [0x73] = 0x0073,
+  [0x74] = 0x0074, [0x75] = 0x0075, [0x76] = 0x0076, [0x77] = 0x0077,
+  [0x78] = 0x0078, [0x79] = 0x0079, [0x7a] = 0x007a, [0x7b] = 0x007b,
+  [0x7c] = 0x007c, [0x7d] = 0x007d, [0x7e] = 0x007e, [0x7f] = 0x007f,
+  [0x80] = 0x20ac, [0x81] = 0x067e, [0x82] = 0x201a, [0x83] = 0x0192,
+  [0x84] = 0x201e, [0x85] = 0x2026, [0x86] = 0x2020, [0x87] = 0x2021,
+  [0x88] = 0x02c6, [0x89] = 0x2030, [0x8a] = 0x0679, [0x8b] = 0x2039,
+  [0x8c] = 0x0152, [0x8d] = 0x0686, [0x8e] = 0x0698, [0x8f] = 0x0688,
+  [0x90] = 0x06af, [0x91] = 0x2018, [0x92] = 0x2019, [0x93] = 0x201c,
+  [0x94] = 0x201d, [0x95] = 0x2022, [0x96] = 0x2013, [0x97] = 0x2014,
+  [0x98] = 0x06a9, [0x99] = 0x2122, [0x9a] = 0x0691, [0x9b] = 0x203a,
+  [0x9c] = 0x0153, [0x9d] = 0x200c, [0x9e] = 0x200d, [0x9f] = 0x06ba,
+  [0xa0] = 0x00a0, [0xa1] = 0x060c, [0xa2] = 0x00a2, [0xa3] = 0x00a3,
+  [0xa4] = 0x00a4, [0xa5] = 0x00a5, [0xa6] = 0x00a6, [0xa7] = 0x00a7,
+  [0xa8] = 0x00a8, [0xa9] = 0x00a9, [0xaa] = 0x06be, [0xab] = 0x00ab,
+  [0xac] = 0x00ac, [0xad] = 0x00ad, [0xae] = 0x00ae, [0xaf] = 0x00af,
+  [0xb0] = 0x00b0, [0xb1] = 0x00b1, [0xb2] = 0x00b2, [0xb3] = 0x00b3,
+  [0xb4] = 0x00b4, [0xb5] = 0x00b5, [0xb6] = 0x00b6, [0xb7] = 0x00b7,
+  [0xb8] = 0x00b8, [0xb9] = 0x00b9, [0xba] = 0x061b, [0xbb] = 0x00bb,
+  [0xbc] = 0x00bc, [0xbd] = 0x00bd, [0xbe] = 0x00be, [0xbf] = 0x061f,
+  [0xc0] = 0x06c1, [0xc1] = 0x0621, [0xc2] = 0x0622, [0xc3] = 0x0623,
+  [0xc4] = 0x0624, [0xc5] = 0x0625, [0xc6] = 0x0626, [0xc7] = 0x0627,
+  [0xc8] = 0x0628, [0xc9] = 0x0629, [0xca] = 0x062a, [0xcb] = 0x062b,
+  [0xcc] = 0x062c, [0xcd] = 0x062d, [0xce] = 0x062e, [0xcf] = 0x062f,
+  [0xd0] = 0x0630, [0xd1] = 0x0631, [0xd2] = 0x0632, [0xd3] = 0x0633,
+  [0xd4] = 0x0634, [0xd5] = 0x0635, [0xd6] = 0x0636, [0xd7] = 0x00d7,
+  [0xd8] = 0x0637, [0xd9] = 0x0638, [0xda] = 0x0639, [0xdb] = 0x063a,
+  [0xdc] = 0x0640, [0xdd] = 0x0641, [0xde] = 0x0642, [0xdf] = 0x0643,
+  [0xe0] = 0x00e0, [0xe1] = 0x0644, [0xe2] = 0x00e2, [0xe3] = 0x0645,
+  [0xe4] = 0x0646, [0xe5] = 0x0647, [0xe6] = 0x0648, [0xe7] = 0x00e7,
+  [0xe8] = 0x00e8, [0xe9] = 0x00e9, [0xea] = 0x00ea, [0xeb] = 0x00eb,
+  [0xec] = 0x0649, [0xed] = 0x064a, [0xee] = 0x00ee, [0xef] = 0x00ef,
+  [0xf0] = 0x064b, [0xf1] = 0x064c, [0xf2] = 0x064d, [0xf3] = 0x064e,
+  [0xf4] = 0x00f4, [0xf5] = 0x064f, [0xf6] = 0x0650, [0xf7] = 0x00f7,
+  [0xf8] = 0x0651, [0xf9] = 0x00f9, [0xfa] = 0x0652, [0xfb] = 0x00fb,
+  [0xfc] = 0x00fc, [0xfd] = 0x200e, [0xfe] = 0x200f, [0xff] = 0x06d2
+};
+
+static const struct gap from_idx[] =
+{
+  { start: 0x0000, end: 0x007f, idx:     0 },
+  { start: 0x00a0, end: 0x00be, idx:   -32 },
+  { start: 0x00d7, end: 0x00d7, idx:   -56 },
+  { start: 0x00e0, end: 0x00fc, idx:   -64 },
+  { start: 0x0152, end: 0x0153, idx:  -149 },
+  { start: 0x0191, end: 0x0192, idx:  -210 },
+  { start: 0x02c6, end: 0x02cb, idx:  -517 },
+  { start: 0x060c, end: 0x060c, idx: -1349 },
+  { start: 0x061b, end: 0x0652, idx: -1363 },
+  { start: 0x0660, end: 0x066c, idx: -1376 },
+  { start: 0x0679, end: 0x067e, idx: -1388 },
+  { start: 0x0686, end: 0x0688, idx: -1395 },
+  { start: 0x0691, end: 0x0691, idx: -1403 },
+  { start: 0x0698, end: 0x0698, idx: -1409 },
+  { start: 0x06a9, end: 0x06af, idx: -1425 },
+  { start: 0x06ba, end: 0x06c1, idx: -1435 },
+  { start: 0x06cc, end: 0x06d2, idx: -1445 },
+  { start: 0x06f0, end: 0x06f9, idx: -1474 },
+  { start: 0x200c, end: 0x2026, idx: -7892 },
+  { start: 0x2030, end: 0x2030, idx: -7901 },
+  { start: 0x2039, end: 0x203e, idx: -7909 },
+  { start: 0x20ac, end: 0x20ac, idx: -8018 },
+  { start: 0x2122, end: 0x2122, idx: -8135 },
+  { start: 0xfb56, end: 0xfb59, idx: -63994 },
+  { start: 0xfb66, end: 0xfb69, idx: -64006 },
+  { start: 0xfb7a, end: 0xfb7d, idx: -64022 },
+  { start: 0xfb88, end: 0xfb95, idx: -64032 },
+  { start: 0xfb9e, end: 0xfb9f, idx: -64040 },
+  { start: 0xfba6, end: 0xfbaf, idx: -64046 },
+  { start: 0xfe70, end: 0xfef4, idx: -64750 },
+  { start: 0xffff, end: 0xffff, idx:     0 }
+};
+
+static const char from_ucs4[] =
+{
+  '\x00', '\x01', '\x02', '\x03', '\x04', '\x05', '\x06', '\x07',
+  '\x08', '\x09', '\x0a', '\x0b', '\x0c', '\x0d', '\x0e', '\x0f',
+  '\x10', '\x11', '\x12', '\x13', '\x14', '\x15', '\x16', '\x17',
+  '\x18', '\x19', '\x1a', '\x1b', '\x1c', '\x1d', '\x1e', '\x1f',
+  '\x20', '\x21', '\x22', '\x23', '\x24', '\x25', '\x26', '\x27',
+  '\x28', '\x29', '\x2a', '\x2b', '\x2c', '\x2d', '\x2e', '\x2f',
+  '\x30', '\x31', '\x32', '\x33', '\x34', '\x35', '\x36', '\x37',
+  '\x38', '\x39', '\x3a', '\x3b', '\x3c', '\x3d', '\x3e', '\x3f',
+  '\x40', '\x41', '\x42', '\x43', '\x44', '\x45', '\x46', '\x47',
+  '\x48', '\x49', '\x4a', '\x4b', '\x4c', '\x4d', '\x4e', '\x4f',
+  '\x50', '\x51', '\x52', '\x53', '\x54', '\x55', '\x56', '\x57',
+  '\x58', '\x59', '\x5a', '\x5b', '\x5c', '\x5d', '\x5e', '\x5f',
+  '\x60', '\x61', '\x62', '\x63', '\x64', '\x65', '\x66', '\x67',
+  '\x68', '\x69', '\x6a', '\x6b', '\x6c', '\x6d', '\x6e', '\x6f',
+  '\x70', '\x71', '\x72', '\x73', '\x74', '\x75', '\x76', '\x77',
+  '\x78', '\x79', '\x7a', '\x7b', '\x7c', '\x7d', '\x7e', '\x7f',
+  '\xa0', '\x00', '\xa2', '\xa3', '\xa4', '\xa5', '\xa6', '\xa7',
+  '\xa8', '\xa9', '\x00', '\xab', '\xac', '\xad', '\xae', '\xaf',
+  '\xb0', '\xb1', '\xb2', '\xb3', '\xb4', '\xb5', '\xb6', '\xb7',
+  '\xb8', '\xb9', '\x00', '\xbb', '\xbc', '\xbd', '\xbe', '\xd7',
+  '\xe0', '\x00', '\xe2', '\x00', '\x00', '\x00', '\x00', '\xe7',
+  '\xe8', '\xe9', '\xea', '\xeb', '\x00', '\x00', '\xee', '\xef',
+  '\x00', '\x00', '\x00', '\x00', '\xf4', '\x00', '\x00', '\xf7',
+  '\x00', '\xf9', '\x00', '\xfb', '\xfc', '\x8c', '\x9c', '\x46',
+  '\x83', '\x88', '\x00', '\x00', '\x00', '\x00', '\x60', '\xa1',
+  '\xba', '\x00', '\x00', '\x00', '\xbf', '\x00', '\xc1', '\xc2',
+  '\xc3', '\xc4', '\xc5', '\xc6', '\xc7', '\xc8', '\xc9', '\xca',
+  '\xcb', '\xcc', '\xcd', '\xce', '\xcf', '\xd0', '\xd1', '\xd2',
+  '\xd3', '\xd4', '\xd5', '\xd6', '\xd8', '\xd9', '\xda', '\xdb',
+  '\x00', '\x00', '\x00', '\x00', '\x00', '\xdc', '\xdd', '\xde',
+  '\xdf', '\xe1', '\xe3', '\xe4', '\xe5', '\xe6', '\xec', '\xed',
+  '\xf0', '\xf1', '\xf2', '\xf3', '\xf5', '\xf6', '\xf8', '\xfa',
+  '\x30', '\x31', '\x32', '\x33', '\x34', '\x35', '\x36', '\x37',
+  '\x38', '\x39', '\x00', '\x2c', '\x2e', '\x8a', '\x00', '\x00',
+  '\x00', '\x00', '\x81', '\x8d', '\x00', '\x8f', '\x9a', '\x8e',
+  '\x98', '\x00', '\x00', '\x00', '\x00', '\x00', '\x90', '\x9f',
+  '\x00', '\x00', '\x00', '\xaa', '\x00', '\x00', '\xc0', '\xed',
+  '\x00', '\x00', '\x00', '\x00', '\x00', '\xff', '\x30', '\x31',
+  '\x32', '\x33', '\x34', '\x35', '\x36', '\x37', '\x38', '\x39',
+  '\x9d', '\x9e', '\xfd', '\xfe', '\x00', '\x00', '\x00', '\x96',
+  '\x97', '\x00', '\x00', '\x00', '\x91', '\x92', '\x82', '\x00',
+  '\x93', '\x94', '\x84', '\x00', '\x86', '\x87', '\x95', '\x00',
+  '\x00', '\x00', '\x85', '\x89', '\x8b', '\x9b', '\x00', '\x00',
+  '\x00', '\xaf', '\x80', '\x99', '\x81', '\x81', '\x81', '\x81',
+  '\x8a', '\x8a', '\x8a', '\x8a', '\x8d', '\x8d', '\x8d', '\x8d',
+  '\x8f', '\x8f', '\x8e', '\x8e', '\x9a', '\x9a', '\x98', '\x98',
+  '\x98', '\x98', '\x90', '\x90', '\x90', '\x90', '\x9f', '\x9f',
+  '\xc0', '\xc0', '\xc0', '\xc0', '\xaa', '\xaa', '\xaa', '\xaa',
+  '\xff', '\xff', '\xf0', '\xf0', '\xf1', '\x20', '\xf2', '\x00',
+  '\xf3', '\xf3', '\xf5', '\xf5', '\xf6', '\xf6', '\xf8', '\xf8',
+  '\xfa', '\xfa', '\xc1', '\xc2', '\xc2', '\xc3', '\xc3', '\xc4',
+  '\xc4', '\xc5', '\xc5', '\xc6', '\xc6', '\xc6', '\xc6', '\xc7',
+  '\xc7', '\xc8', '\xc8', '\xc8', '\xc8', '\xc9', '\xc9', '\xca',
+  '\xca', '\xca', '\xca', '\xcb', '\xcb', '\xcb', '\xcb', '\xcc',
+  '\xcc', '\xcc', '\xcc', '\xcd', '\xcd', '\xcd', '\xcd', '\xce',
+  '\xce', '\xce', '\xce', '\xcf', '\xcf', '\xd0', '\xd0', '\xd1',
+  '\xd1', '\xd2', '\xd2', '\xd3', '\xd3', '\xd3', '\xd3', '\xd4',
+  '\xd4', '\xd4', '\xd4', '\xd5', '\xd5', '\xd5', '\xd5', '\xd6',
+  '\xd6', '\xd6', '\xd6', '\xd8', '\xd8', '\xd8', '\xd8', '\xd9',
+  '\xd9', '\xd9', '\xd9', '\xda', '\xda', '\xda', '\xda', '\xdb',
+  '\xdb', '\xdb', '\xdb', '\xdd', '\xdd', '\xdd', '\xdd', '\xde',
+  '\xde', '\xde', '\xde', '\xdf', '\xdf', '\xdf', '\xdf', '\xe1',
+  '\xe1', '\xe1', '\xe1', '\xe3', '\xe3', '\xe3', '\xe3', '\xe4',
+  '\xe4', '\xe4', '\xe4', '\xe5', '\xe5', '\xe5', '\xe5', '\xe6',
+  '\xe6', '\xec', '\xec', '\xed', '\xed', '\xed', '\xed'
+};
diff --git a/iconvdata/testdata/IBM1008 b/iconvdata/testdata/IBM1008
new file mode 100644
index 0000000000..11cb306daa
--- /dev/null
+++ b/iconvdata/testdata/IBM1008
Binary files differdiff --git a/iconvdata/testdata/IBM1008..UTF8 b/iconvdata/testdata/IBM1008..UTF8
new file mode 100644
index 0000000000..625f280e61
--- /dev/null
+++ b/iconvdata/testdata/IBM1008..UTF8
Binary files differdiff --git a/iconvdata/testdata/IBM1097 b/iconvdata/testdata/IBM1097
new file mode 100644
index 0000000000..a67fa4ccd3
--- /dev/null
+++ b/iconvdata/testdata/IBM1097
Binary files differdiff --git a/iconvdata/testdata/IBM1097..UTF8 b/iconvdata/testdata/IBM1097..UTF8
new file mode 100644
index 0000000000..66ef4b6f92
--- /dev/null
+++ b/iconvdata/testdata/IBM1097..UTF8
Binary files differdiff --git a/iconvdata/testdata/IBM1112 b/iconvdata/testdata/IBM1112
new file mode 100644
index 0000000000..a67fa4ccd3
--- /dev/null
+++ b/iconvdata/testdata/IBM1112
Binary files differdiff --git a/iconvdata/testdata/IBM1112..UTF8 b/iconvdata/testdata/IBM1112..UTF8
new file mode 100644
index 0000000000..5c09c29789
--- /dev/null
+++ b/iconvdata/testdata/IBM1112..UTF8
Binary files differdiff --git a/iconvdata/testdata/IBM1123 b/iconvdata/testdata/IBM1123
new file mode 100644
index 0000000000..a67fa4ccd3
--- /dev/null
+++ b/iconvdata/testdata/IBM1123
Binary files differdiff --git a/iconvdata/testdata/IBM1123..UTF8 b/iconvdata/testdata/IBM1123..UTF8
new file mode 100644
index 0000000000..f29be512b5
--- /dev/null
+++ b/iconvdata/testdata/IBM1123..UTF8
Binary files differdiff --git a/iconvdata/testdata/IBM1130 b/iconvdata/testdata/IBM1130
new file mode 100644
index 0000000000..a67fa4ccd3
--- /dev/null
+++ b/iconvdata/testdata/IBM1130
Binary files differdiff --git a/iconvdata/testdata/IBM1130..UTF8 b/iconvdata/testdata/IBM1130..UTF8
new file mode 100644
index 0000000000..33aed2e084
--- /dev/null
+++ b/iconvdata/testdata/IBM1130..UTF8
Binary files differdiff --git a/iconvdata/testdata/IBM1140 b/iconvdata/testdata/IBM1140
new file mode 100644
index 0000000000..a67fa4ccd3
--- /dev/null
+++ b/iconvdata/testdata/IBM1140
Binary files differdiff --git a/iconvdata/testdata/IBM1140..UTF8 b/iconvdata/testdata/IBM1140..UTF8
new file mode 100644
index 0000000000..0890f06b2a
--- /dev/null
+++ b/iconvdata/testdata/IBM1140..UTF8
Binary files differdiff --git a/iconvdata/testdata/IBM1141 b/iconvdata/testdata/IBM1141
new file mode 100644
index 0000000000..a67fa4ccd3
--- /dev/null
+++ b/iconvdata/testdata/IBM1141
Binary files differdiff --git a/iconvdata/testdata/IBM1141..UTF8 b/iconvdata/testdata/IBM1141..UTF8
new file mode 100644
index 0000000000..fdda8257c8
--- /dev/null
+++ b/iconvdata/testdata/IBM1141..UTF8
Binary files differdiff --git a/iconvdata/testdata/IBM1142 b/iconvdata/testdata/IBM1142
new file mode 100644
index 0000000000..a67fa4ccd3
--- /dev/null
+++ b/iconvdata/testdata/IBM1142
Binary files differdiff --git a/iconvdata/testdata/IBM1142..UTF8 b/iconvdata/testdata/IBM1142..UTF8
new file mode 100644
index 0000000000..d1e853b26e
--- /dev/null
+++ b/iconvdata/testdata/IBM1142..UTF8
Binary files differdiff --git a/iconvdata/testdata/IBM1143 b/iconvdata/testdata/IBM1143
new file mode 100644
index 0000000000..a67fa4ccd3
--- /dev/null
+++ b/iconvdata/testdata/IBM1143
Binary files differdiff --git a/iconvdata/testdata/IBM1143..UTF8 b/iconvdata/testdata/IBM1143..UTF8
new file mode 100644
index 0000000000..3023e60181
--- /dev/null
+++ b/iconvdata/testdata/IBM1143..UTF8
Binary files differdiff --git a/iconvdata/testdata/IBM1144 b/iconvdata/testdata/IBM1144
new file mode 100644
index 0000000000..a67fa4ccd3
--- /dev/null
+++ b/iconvdata/testdata/IBM1144
Binary files differdiff --git a/iconvdata/testdata/IBM1144..UTF8 b/iconvdata/testdata/IBM1144..UTF8
new file mode 100644
index 0000000000..c9d8e96f18
--- /dev/null
+++ b/iconvdata/testdata/IBM1144..UTF8
Binary files differdiff --git a/iconvdata/testdata/IBM1145 b/iconvdata/testdata/IBM1145
new file mode 100644
index 0000000000..a67fa4ccd3
--- /dev/null
+++ b/iconvdata/testdata/IBM1145
Binary files differdiff --git a/iconvdata/testdata/IBM1145..UTF8 b/iconvdata/testdata/IBM1145..UTF8
new file mode 100644
index 0000000000..b99321e3bb
--- /dev/null
+++ b/iconvdata/testdata/IBM1145..UTF8
Binary files differdiff --git a/iconvdata/testdata/IBM1146 b/iconvdata/testdata/IBM1146
new file mode 100644
index 0000000000..a67fa4ccd3
--- /dev/null
+++ b/iconvdata/testdata/IBM1146
Binary files differdiff --git a/iconvdata/testdata/IBM1146..UTF8 b/iconvdata/testdata/IBM1146..UTF8
new file mode 100644
index 0000000000..6c9181ce85
--- /dev/null
+++ b/iconvdata/testdata/IBM1146..UTF8
Binary files differdiff --git a/iconvdata/testdata/IBM1147 b/iconvdata/testdata/IBM1147
new file mode 100644
index 0000000000..a67fa4ccd3
--- /dev/null
+++ b/iconvdata/testdata/IBM1147
Binary files differdiff --git a/iconvdata/testdata/IBM1147..UTF8 b/iconvdata/testdata/IBM1147..UTF8
new file mode 100644
index 0000000000..5d42f287e4
--- /dev/null
+++ b/iconvdata/testdata/IBM1147..UTF8
Binary files differdiff --git a/iconvdata/testdata/IBM1148 b/iconvdata/testdata/IBM1148
new file mode 100644
index 0000000000..a67fa4ccd3
--- /dev/null
+++ b/iconvdata/testdata/IBM1148
Binary files differdiff --git a/iconvdata/testdata/IBM1148..UTF8 b/iconvdata/testdata/IBM1148..UTF8
new file mode 100644
index 0000000000..2d6e0fb4bd
--- /dev/null
+++ b/iconvdata/testdata/IBM1148..UTF8
Binary files differdiff --git a/iconvdata/testdata/IBM1149 b/iconvdata/testdata/IBM1149
new file mode 100644
index 0000000000..a67fa4ccd3
--- /dev/null
+++ b/iconvdata/testdata/IBM1149
Binary files differdiff --git a/iconvdata/testdata/IBM1149..UTF8 b/iconvdata/testdata/IBM1149..UTF8
new file mode 100644
index 0000000000..2bfeb6d827
--- /dev/null
+++ b/iconvdata/testdata/IBM1149..UTF8
Binary files differdiff --git a/iconvdata/testdata/IBM1166 b/iconvdata/testdata/IBM1166
new file mode 100644
index 0000000000..a67fa4ccd3
--- /dev/null
+++ b/iconvdata/testdata/IBM1166
Binary files differdiff --git a/iconvdata/testdata/IBM1166..UTF8 b/iconvdata/testdata/IBM1166..UTF8
new file mode 100644
index 0000000000..4f90aaa8e2
--- /dev/null
+++ b/iconvdata/testdata/IBM1166..UTF8
Binary files differdiff --git a/iconvdata/testdata/IBM1167 b/iconvdata/testdata/IBM1167
new file mode 100644
index 0000000000..897a3c116b
--- /dev/null
+++ b/iconvdata/testdata/IBM1167
Binary files differdiff --git a/iconvdata/testdata/IBM1167..UTF8 b/iconvdata/testdata/IBM1167..UTF8
new file mode 100644
index 0000000000..61446b0ac5
--- /dev/null
+++ b/iconvdata/testdata/IBM1167..UTF8
Binary files differdiff --git a/iconvdata/testdata/IBM12712 b/iconvdata/testdata/IBM12712
new file mode 100644
index 0000000000..ddfe4a9259
--- /dev/null
+++ b/iconvdata/testdata/IBM12712
Binary files differdiff --git a/iconvdata/testdata/IBM12712..UTF8 b/iconvdata/testdata/IBM12712..UTF8
new file mode 100644
index 0000000000..b541c1257d
--- /dev/null
+++ b/iconvdata/testdata/IBM12712..UTF8
Binary files differdiff --git a/iconvdata/testdata/IBM16804 b/iconvdata/testdata/IBM16804
new file mode 100644
index 0000000000..25864af202
--- /dev/null
+++ b/iconvdata/testdata/IBM16804
Binary files differdiff --git a/iconvdata/testdata/IBM16804..UTF8 b/iconvdata/testdata/IBM16804..UTF8
new file mode 100644
index 0000000000..4442243ca3
--- /dev/null
+++ b/iconvdata/testdata/IBM16804..UTF8
Binary files differdiff --git a/iconvdata/testdata/IBM4517 b/iconvdata/testdata/IBM4517
new file mode 100644
index 0000000000..ba54f83823
--- /dev/null
+++ b/iconvdata/testdata/IBM4517
Binary files differdiff --git a/iconvdata/testdata/IBM4517..UTF8 b/iconvdata/testdata/IBM4517..UTF8
new file mode 100644
index 0000000000..86c4a1ca4f
--- /dev/null
+++ b/iconvdata/testdata/IBM4517..UTF8
Binary files differdiff --git a/iconvdata/testdata/IBM4899 b/iconvdata/testdata/IBM4899
new file mode 100644
index 0000000000..5e0b080367
--- /dev/null
+++ b/iconvdata/testdata/IBM4899
Binary files differdiff --git a/iconvdata/testdata/IBM4899..UTF8 b/iconvdata/testdata/IBM4899..UTF8
new file mode 100644
index 0000000000..9e9966ba23
--- /dev/null
+++ b/iconvdata/testdata/IBM4899..UTF8
Binary files differdiff --git a/iconvdata/testdata/IBM4909 b/iconvdata/testdata/IBM4909
new file mode 100644
index 0000000000..3492eb6132
--- /dev/null
+++ b/iconvdata/testdata/IBM4909
Binary files differdiff --git a/iconvdata/testdata/IBM4909..UTF8 b/iconvdata/testdata/IBM4909..UTF8
new file mode 100644
index 0000000000..7b8c9c96f7
--- /dev/null
+++ b/iconvdata/testdata/IBM4909..UTF8
Binary files differdiff --git a/iconvdata/testdata/IBM4971 b/iconvdata/testdata/IBM4971
new file mode 100644
index 0000000000..96693046d6
--- /dev/null
+++ b/iconvdata/testdata/IBM4971
Binary files differdiff --git a/iconvdata/testdata/IBM4971..UTF8 b/iconvdata/testdata/IBM4971..UTF8
new file mode 100644
index 0000000000..6b1833ccbe
--- /dev/null
+++ b/iconvdata/testdata/IBM4971..UTF8
Binary files differdiff --git a/iconvdata/testdata/IBM5347 b/iconvdata/testdata/IBM5347
new file mode 100644
index 0000000000..897a3c116b
--- /dev/null
+++ b/iconvdata/testdata/IBM5347
Binary files differdiff --git a/iconvdata/testdata/IBM5347..UTF8 b/iconvdata/testdata/IBM5347..UTF8
new file mode 100644
index 0000000000..d494150731
--- /dev/null
+++ b/iconvdata/testdata/IBM5347..UTF8
Binary files differdiff --git a/iconvdata/testdata/IBM803 b/iconvdata/testdata/IBM803
new file mode 100644
index 0000000000..02aa2d57af
--- /dev/null
+++ b/iconvdata/testdata/IBM803
Binary files differdiff --git a/iconvdata/testdata/IBM803..UTF8 b/iconvdata/testdata/IBM803..UTF8
new file mode 100644
index 0000000000..de338b4511
--- /dev/null
+++ b/iconvdata/testdata/IBM803..UTF8
Binary files differdiff --git a/iconvdata/testdata/IBM901 b/iconvdata/testdata/IBM901
new file mode 100644
index 0000000000..897a3c116b
--- /dev/null
+++ b/iconvdata/testdata/IBM901
Binary files differdiff --git a/iconvdata/testdata/IBM901..UTF8 b/iconvdata/testdata/IBM901..UTF8
new file mode 100644
index 0000000000..c64a4a2bee
--- /dev/null
+++ b/iconvdata/testdata/IBM901..UTF8
Binary files differdiff --git a/iconvdata/testdata/IBM902 b/iconvdata/testdata/IBM902
new file mode 100644
index 0000000000..897a3c116b
--- /dev/null
+++ b/iconvdata/testdata/IBM902
Binary files differdiff --git a/iconvdata/testdata/IBM902..UTF8 b/iconvdata/testdata/IBM902..UTF8
new file mode 100644
index 0000000000..a43cadf9ca
--- /dev/null
+++ b/iconvdata/testdata/IBM902..UTF8
Binary files differdiff --git a/iconvdata/testdata/IBM9030 b/iconvdata/testdata/IBM9030
new file mode 100644
index 0000000000..e5e254dc6d
--- /dev/null
+++ b/iconvdata/testdata/IBM9030
Binary files differdiff --git a/iconvdata/testdata/IBM9030..UTF8 b/iconvdata/testdata/IBM9030..UTF8
new file mode 100644
index 0000000000..4acc340989
--- /dev/null
+++ b/iconvdata/testdata/IBM9030..UTF8
Binary files differdiff --git a/iconvdata/testdata/IBM9066 b/iconvdata/testdata/IBM9066
new file mode 100644
index 0000000000..9787fee085
--- /dev/null
+++ b/iconvdata/testdata/IBM9066
Binary files differdiff --git a/iconvdata/testdata/IBM9066..UTF8 b/iconvdata/testdata/IBM9066..UTF8
new file mode 100644
index 0000000000..b07de63305
--- /dev/null
+++ b/iconvdata/testdata/IBM9066..UTF8
Binary files differdiff --git a/iconvdata/testdata/IBM921 b/iconvdata/testdata/IBM921
new file mode 100644
index 0000000000..897a3c116b
--- /dev/null
+++ b/iconvdata/testdata/IBM921
Binary files differdiff --git a/iconvdata/testdata/IBM921..UTF8 b/iconvdata/testdata/IBM921..UTF8
new file mode 100644
index 0000000000..135fc3e859
--- /dev/null
+++ b/iconvdata/testdata/IBM921..UTF8
Binary files differdiff --git a/iconvdata/testdata/IBM9448 b/iconvdata/testdata/IBM9448
new file mode 100644
index 0000000000..42e142e87f
--- /dev/null
+++ b/iconvdata/testdata/IBM9448
Binary files differdiff --git a/iconvdata/testdata/IBM9448..UTF8 b/iconvdata/testdata/IBM9448..UTF8
new file mode 100644
index 0000000000..22bb688808
--- /dev/null
+++ b/iconvdata/testdata/IBM9448..UTF8
Binary files differ