diff --git a/ChangeLog b/ChangeLog
index 9288d06..d0b33c4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2012-06-30  Bruno Haible  <bruno@clisp.org>
+
+	Improve ISO-2022-CP-MS versus CP932.
+	* lib/cp50221_0208_ext.h (cp50221_0208_ext_page30): Map U+301D like
+	U+301E.
+	* lib/iso2022_jpms.h (iso2022_jpms_wctomb): Map U+663B to JISX0208
+	0x7A 0x36, U+FFE2 to 0x7C 0x7B, U+FFE4 to 0x7C 0x7C.
+	Reported by Jeff Diehl <diehl.jeff@gmail.com>.
+
 2011-10-23  Bruno Haible  <bruno@clisp.org>
 
 	New encoding ISO-2022-CP-MS.
diff --git a/lib/cp50221_0208_ext.h b/lib/cp50221_0208_ext.h
index 887d2e2..bdbc73f 100644
--- a/lib/cp50221_0208_ext.h
+++ b/lib/cp50221_0208_ext.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1999-2011 Free Software Foundation, Inc.
+ * Copyright (C) 1999-2012 Free Software Foundation, Inc.
  * This file is part of the GNU LIBICONV Library.
  *
  * The GNU LIBICONV Library is free software; you can redistribute it
@@ -83,7 +83,7 @@
   0x11, 0x12, 0x13, 0x14, 0x00, 0x00, 0x00, 0x00, /* 0x70-0x77 */
 };
 static const unsigned char cp50221_0208_ext_page30[8] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x41, /* 0x18-0x1f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x41, /* 0x18-0x1f */
 };
 static const unsigned char cp50221_0208_ext_page32[16] = {
   0x00, 0x4a, 0x4b, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x30-0x37 */
diff --git a/lib/iso2022_jpms.h b/lib/iso2022_jpms.h
index 22fb027..6d49da1 100644
--- a/lib/iso2022_jpms.h
+++ b/lib/iso2022_jpms.h
@@ -338,6 +338,18 @@
         buf[0] = 0x2d;
         buf[1] = i-1 + 0x21;
         ret = 2;
+      } else if (wc == 0x663B) {
+        buf[0] = 0x7a;
+        buf[1] = 0x36;
+        ret = 2;
+      } else if (wc == 0xffe2) {
+        buf[0] = 0x7c;
+        buf[1] = 0x7b;
+        ret = 2;
+      } else if (wc == 0xffe4) {
+        buf[0] = 0x7c;
+        buf[1] = 0x7c;
+        ret = 2;
       }
     }
   }