diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index dc96716e9..b8b1905a0 100644
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,15 @@
+2003-07-31  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* libc/ctype/iswalpha.c: Fix calls to __jp2uc to pass the
+	correct type of conversion when dealing with EUCJP or SJIS.
+	* libc/ctype/iswblank.c: Ditto.
+	* libc/ctype/iswcntrl.c: Ditto.
+	* libc/ctype/iswprint.c: Ditto.
+	* libc/ctype/iswpunct.c: Ditto.
+	* libc/ctype/iswspace.c: Ditto.
+	* libc/ctype/towlower.c: Ditto.
+	* libc/ctype/towupper.c: Ditto.
+
 2003-07-31  Nick Clifton  <nickc@redhat.com>
 
 	* libc/sys/sysnecv850/crt0.S (_start): Allocate 4 slots on stack
diff --git a/newlib/libc/ctype/iswalpha.c b/newlib/libc/ctype/iswalpha.c
index 4fed96c8f..97fda7f17 100644
--- a/newlib/libc/ctype/iswalpha.c
+++ b/newlib/libc/ctype/iswalpha.c
@@ -82,12 +82,12 @@ _DEFUN(iswalpha,(c), wint_t c)
     }
   else if (!strcmp (__lc_ctype, "C-SJIS"))
     {
-      c = __jp2uc (c, JP_JIS);
+      c = __jp2uc (c, JP_SJIS);
       unicode = 1;
     }
   else if (!strcmp (__lc_ctype, "C-EUCJP"))
     {
-      c = __jp2uc (c, JP_JIS);
+      c = __jp2uc (c, JP_EUCJP);
       unicode = 1;
     }
   else if (!strcmp (__lc_ctype, "C-UTF-8"))
diff --git a/newlib/libc/ctype/iswblank.c b/newlib/libc/ctype/iswblank.c
index 069b73703..8834e954d 100644
--- a/newlib/libc/ctype/iswblank.c
+++ b/newlib/libc/ctype/iswblank.c
@@ -78,12 +78,12 @@ _DEFUN(iswblank,(c), wint_t c)
     }
   else if (!strcmp (__lc_ctype, "C-SJIS"))
     {
-      c = __jp2uc (c, JP_JIS);
+      c = __jp2uc (c, JP_SJIS);
       unicode = 1;
     }
   else if (!strcmp (__lc_ctype, "C-EUCJP"))
     {
-      c = __jp2uc (c, JP_JIS);
+      c = __jp2uc (c, JP_EUCJP);
       unicode = 1;
     }
   else if (!strcmp (__lc_ctype, "C-UTF-8"))
diff --git a/newlib/libc/ctype/iswcntrl.c b/newlib/libc/ctype/iswcntrl.c
index 5935431f1..b33af01ee 100644
--- a/newlib/libc/ctype/iswcntrl.c
+++ b/newlib/libc/ctype/iswcntrl.c
@@ -78,12 +78,12 @@ _DEFUN(iswcntrl,(c), wint_t c)
     }
   else if (!strcmp (__lc_ctype, "C-SJIS"))
     {
-      c = __jp2uc (c, JP_JIS);
+      c = __jp2uc (c, JP_SJIS);
       unicode = 1;
     }
   else if (!strcmp (__lc_ctype, "C-EUCJP"))
     {
-      c = __jp2uc (c, JP_JIS);
+      c = __jp2uc (c, JP_EUCJP);
       unicode = 1;
     }
   else if (!strcmp (__lc_ctype, "C-UTF-8"))
diff --git a/newlib/libc/ctype/iswprint.c b/newlib/libc/ctype/iswprint.c
index c30938f2e..5acba9cd7 100644
--- a/newlib/libc/ctype/iswprint.c
+++ b/newlib/libc/ctype/iswprint.c
@@ -82,12 +82,12 @@ _DEFUN(iswprint,(c), wint_t c)
     }
   else if (!strcmp (__lc_ctype, "C-SJIS"))
     {
-      c = __jp2uc (c, JP_JIS);
+      c = __jp2uc (c, JP_SJIS);
       unicode = 1;
     }
   else if (!strcmp (__lc_ctype, "C-EUCJP"))
     {
-      c = __jp2uc (c, JP_JIS);
+      c = __jp2uc (c, JP_EUCJP);
       unicode = 1;
     }
   else if (!strcmp (__lc_ctype, "C-UTF-8"))
diff --git a/newlib/libc/ctype/iswpunct.c b/newlib/libc/ctype/iswpunct.c
index 3e577d6a6..716fe5f62 100644
--- a/newlib/libc/ctype/iswpunct.c
+++ b/newlib/libc/ctype/iswpunct.c
@@ -82,12 +82,12 @@ _DEFUN(iswpunct,(c), wint_t c)
     }
   else if (!strcmp (__lc_ctype, "C-SJIS"))
     {
-      c = __jp2uc (c, JP_JIS);
+      c = __jp2uc (c, JP_SJIS);
       unicode = 1;
     }
   else if (!strcmp (__lc_ctype, "C-EUCJP"))
     {
-      c = __jp2uc (c, JP_JIS);
+      c = __jp2uc (c, JP_EUCJP);
       unicode = 1;
     }
   else if (!strcmp (__lc_ctype, "C-UTF-8"))
diff --git a/newlib/libc/ctype/iswspace.c b/newlib/libc/ctype/iswspace.c
index d8f6b5868..cd3d85a7c 100644
--- a/newlib/libc/ctype/iswspace.c
+++ b/newlib/libc/ctype/iswspace.c
@@ -78,12 +78,12 @@ _DEFUN(iswspace,(c), wint_t c)
     }
   else if (!strcmp (__lc_ctype, "C-SJIS"))
     {
-      c = __jp2uc (c, JP_JIS);
+      c = __jp2uc (c, JP_SJIS);
       unicode = 1;
     }
   else if (!strcmp (__lc_ctype, "C-EUCJP"))
     {
-      c = __jp2uc (c, JP_JIS);
+      c = __jp2uc (c, JP_EUCJP);
       unicode = 1;
     }
   else if (!strcmp (__lc_ctype, "C-UTF-8"))
diff --git a/newlib/libc/ctype/towlower.c b/newlib/libc/ctype/towlower.c
index 5520e3720..a0b03b8c5 100644
--- a/newlib/libc/ctype/towlower.c
+++ b/newlib/libc/ctype/towlower.c
@@ -83,12 +83,12 @@ _DEFUN(towlower,(c), wint_t c)
     }
   else if (!strcmp (__lc_ctype, "C-SJIS"))
     {
-      c = __jp2uc (c, JP_JIS);
+      c = __jp2uc (c, JP_SJIS);
       unicode = 1;
     }
   else if (!strcmp (__lc_ctype, "C-EUCJP"))
     {
-      c = __jp2uc (c, JP_JIS);
+      c = __jp2uc (c, JP_EUCJP);
       unicode = 1;
     }
   else if (!strcmp (__lc_ctype, "C-UTF-8"))
diff --git a/newlib/libc/ctype/towupper.c b/newlib/libc/ctype/towupper.c
index 8fc2848e5..b14e5aa07 100644
--- a/newlib/libc/ctype/towupper.c
+++ b/newlib/libc/ctype/towupper.c
@@ -83,12 +83,12 @@ _DEFUN(towupper,(c), wint_t c)
     }
   else if (!strcmp (__lc_ctype, "C-SJIS"))
     {
-      c = __jp2uc (c, JP_JIS);
+      c = __jp2uc (c, JP_SJIS);
       unicode = 1;
     }
   else if (!strcmp (__lc_ctype, "C-EUCJP"))
     {
-      c = __jp2uc (c, JP_JIS);
+      c = __jp2uc (c, JP_EUCJP);
       unicode = 1;
     }
   else if (!strcmp (__lc_ctype, "C-UTF-8"))