diff --git a/ChangeLog b/ChangeLog
index 7ead32bbbb..6fb579a9f8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 1999-03-31  Ulrich Drepper  <drepper@cygnus.com>
 
+	* iconvdata/testdata/CP1258: New file.
+	* iconvdata/testdata/CP1258..UTF8: New file.
+	* iconvdata/TESTS: Add CP1258 entry.
+
 	* iconvdata/cp874.h (to_ucs4): Add Euro sign.
 
 	* timezone/africa: Update from tzdata1999d.
diff --git a/iconvdata/TESTS b/iconvdata/TESTS
index 71808af5c6..ef44c45303 100644
--- a/iconvdata/TESTS
+++ b/iconvdata/TESTS
@@ -1,5 +1,5 @@
 # Available tests for iconv(1) (and therefore iconv(3)) in GNU libc.
-# Copyright (C) 1998 Free Software Foundation, Inc.
+# Copyright (C) 1998, 1999 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 # Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
 #
@@ -73,5 +73,6 @@ CP1254			CP1254			Y	UTF8
 CP1255			CP1255			Y	UTF8
 CP1256			CP1256			Y	UTF8
 CP1257			CP1257			Y	UTF8
+CP1258			CP1258			Y	UTF8
 ISO-2022-KR		ISO-2022-KR		N	UTF8
 EUC-KR			EUC-KR			Y	UTF8
diff --git a/iconvdata/testdata/CP1258 b/iconvdata/testdata/CP1258
new file mode 100644
index 0000000000..19cfbb3355
--- /dev/null
+++ b/iconvdata/testdata/CP1258
@@ -0,0 +1,14 @@
+   ! " # $ % & ' ( ) * + , - . /
+ 0 1 2 3 4 5 6 7 8 9 : ; < = > ?
+ @ A B C D E F G H I J K L M N O
+ P Q R S T U V W X Y Z [ \ ] ^ _
+ ` a b c d e f g h i j k l m n o
+ p q r s t u v w x y z { | } ~ 
+ �   � � � � � � � �   � �      
+   � � � � � � � � �   � �     �
+ � � � � � � � � � � � � � � � �
+ � � � � � � � � � � � � � � � �
+ � � � � � � � � � � � � � � � �
+ � � � � � � � � � � � � � � � �
+ � � � � � � � � � � � �   � � �
+ � � � � � � � � � � � � � � � �
diff --git a/iconvdata/testdata/CP1258..UTF8 b/iconvdata/testdata/CP1258..UTF8
new file mode 100644
index 0000000000..665a5a4ad8
--- /dev/null
+++ b/iconvdata/testdata/CP1258..UTF8
@@ -0,0 +1,14 @@
+   ! " # $ % & ' ( ) * + , - . /
+ 0 1 2 3 4 5 6 7 8 9 : ; < = > ?
+ @ A B C D E F G H I J K L M N O
+ P Q R S T U V W X Y Z [ \ ] ^ _
+ ` a b c d e f g h i j k l m n o
+ p q r s t u v w x y z { | } ~ 
+ €   ‚ ƒ „ … † ‡ ˆ ‰   ‹ Œ      
+   ‘ ’ “ ” • – — ˜ ™   › œ     Ÿ
+   ¡ ¢ £ ¤ ¥ ¦ § ¨ © ª « ¬ ­ ® ¯
+ ° ± ² ³ ´ µ ¶ · ¸ ¹ º » ¼ ½ ¾ ¿
+ À Á Â Ă Ä Å Æ Ç È É Ê Ë ̀ Í Î Ï
+ Đ Ñ ̉ Ó Ô Ơ Ö × Ø Ù Ú Û Ü Ư ̃ ß
+ à á â ă ä å æ ç è é ê ë   í î ï
+ đ ñ ̣ ó ô ơ ö ÷ ø ù ú û ü ư ₫ ÿ