diff --git a/ChangeLog b/ChangeLog
index 9d27c1a79b..718e17636a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2018-04-16  Andreas Schwab  <schwab@suse.de>
+
+	[BZ #19527]
+	* iconvdata/gconv-modules (ARMSCII8//, ShiftJISX0213//): New aliases.
+
 2018-04-15  Patrick McGehearty <patrick.mcgehearty@oracle.com>
 
 	* sysdeps/ieee754/dbl-64/e_exp.c: faster __ieee754_exp()
diff --git a/iconvdata/gconv-modules b/iconvdata/gconv-modules
index 924eefface..81687c1619 100644
--- a/iconvdata/gconv-modules
+++ b/iconvdata/gconv-modules
@@ -1563,6 +1563,7 @@ module	MAC-SAMI//		INTERNAL		MAC-SAMI	1
 module	INTERNAL		MAC-SAMI//		MAC-SAMI	1
 
 #	from			to			module		cost
+alias	ARMSCII8//		ARMSCII-8//
 module	ARMSCII-8//		INTERNAL		ARMSCII-8	1
 module	INTERNAL		ARMSCII-8//		ARMSCII-8	1
 
@@ -1578,6 +1579,7 @@ module	EUC-JISX0213//		INTERNAL		EUC-JISX0213	1
 module	INTERNAL		EUC-JISX0213//		EUC-JISX0213	1
 
 #	from			to			module		cost
+alias	ShiftJISX0213//		Shift_JISX0213//
 module	Shift_JISX0213//	INTERNAL		SHIFT_JISX0213	1
 module	INTERNAL		Shift_JISX0213//	SHIFT_JISX0213	1