--- gconv-modules.orig	Fri Feb  6 10:21:27 2004
+++ gconv-modules	Fri Feb  6 10:34:42 2004
@@ -430,12 +430,12 @@
 module	INTERNAL		ISO_6937-2//		ISO_6937-2	1
 
 #	from			to			module		cost
-alias	SHIFT-JIS//		SJIS//
-alias	SHIFT_JIS//		SJIS//
-alias	MS_KANJI//		SJIS//
-alias	CSSHIFTJIS//		SJIS//
-module	SJIS//			INTERNAL		SJIS		1
-module	INTERNAL		SJIS//			SJIS		1
+#alias	SHIFT-JIS//		SJIS//
+#alias	SHIFT_JIS//		SJIS//
+#alias	MS_KANJI//		SJIS//
+#alias	CSSHIFTJIS//		SJIS//
+#module	SJIS//			INTERNAL		SJIS		1
+#module	INTERNAL		SJIS//			SJIS		1
 
 #	from			to			module		cost
 alias	WINDOWS-31J//		CP932//
@@ -443,6 +443,11 @@
 alias	SJIS-OPEN//		CP932//
 alias	SJIS-WIN//		CP932//
 alias	CSWINDOWS31J//		CP932//
+alias	SJIS//			CP932//
+alias	SHIFT-JIS//		CP932//
+alias	SHIFT_JIS//		CP932//
+alias	MS_KANJI//		CP932//
+alias	CSSHIFTJIS//		CP932//
 module	CP932//			INTERNAL		CP932		1
 module	INTERNAL		CP932//			CP932		1
 
@@ -1090,16 +1095,21 @@
 alias	EUCJP-MS//		EUC-JP-MS//
 alias	EUCJP-OPEN//		EUC-JP-MS//
 alias	EUCJP-WIN//		EUC-JP-MS//
+alias	EUC-JP//		EUC-JP-MS//
+alias	EUCJP//			EUC-JP-MS//
+alias	CSEUCPKDFMTJAPANESE//	EUC-JP-MS//
+alias	OSF00030010//		EUC-JP-MS//
+alias	UJIS//			EUC-JP-MS//
 module	EUC-JP-MS//		INTERNAL		EUC-JP-MS	1
 module	INTERNAL		EUC-JP-MS//		EUC-JP-MS	1
 
 #	from			to			module		cost
-alias	EUCJP//			EUC-JP//
-alias	CSEUCPKDFMTJAPANESE//	EUC-JP//
-alias	OSF00030010//		EUC-JP//
-alias	UJIS//			EUC-JP//
-module	EUC-JP//		INTERNAL		EUC-JP		1
-module	INTERNAL		EUC-JP//		EUC-JP		1
+#alias	EUCJP//			EUC-JP//
+#alias	CSEUCPKDFMTJAPANESE//	EUC-JP//
+#alias	OSF00030010//		EUC-JP//
+#alias	UJIS//			EUC-JP//
+#module	EUC-JP//		INTERNAL		EUC-JP		1
+#module	INTERNAL		EUC-JP//		EUC-JP		1
 
 #	from			to			module		cost
 alias	EUCCN//			EUC-CN//