diff --git a/ChangeLog b/ChangeLog
index a608cf4ca6..f84ef7dd0f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+1999-06-20  Ulrich Drepper  <drepper@cygnus.com>
+
+	* libio/libio.h (_IO_putwc): Correct type of first argument.
+	* wcsmbs/wchar.h: (fputwc, putwc, putwchar, fputwc_unlocked,
+	putwc_unlocked, putwchar_unlocked): Likewise.
+	* libio/fputwc.c: Likewise.
+	* libio/fputwc_unlocked.c: Likewise.
+	* libio/putwc.c: Likewise.
+	* libio/putwc_unlocked.c: Likewise.
+	* libio/putwchar.c: Likewise.
+	* libio/putwchar_unlocked.c: Likewise.
+
 1999-06-19  Roland McGrath  <roland@baalperazim.frob.com>
 
 	* sysdeps/gnu/siglist.h: File moved to ...
diff --git a/wcsmbs/wchar.h b/wcsmbs/wchar.h
index 8be3f10c2d..4639cb2799 100644
--- a/wcsmbs/wchar.h
+++ b/wcsmbs/wchar.h
@@ -597,20 +597,20 @@ extern wint_t fgetwc_unlocked __P ((FILE *__stream));
 
 
 /* Write a character to STREAM.  */
-extern wint_t fputwc __P ((wint_t __wc, FILE *__stream));
-extern wint_t putwc __P ((wint_t __wc, FILE *__stream));
+extern wint_t fputwc __P ((wchar_t __wc, FILE *__stream));
+extern wint_t putwc __P ((wchar_t __wc, FILE *__stream));
 
 /* Write a character to stdout.  */
-extern wint_t putwchar __P ((wint_t __wc));
+extern wint_t putwchar __P ((wchar_t __wc));
 
 #ifdef __USE_GNU
 /* Faster version when locking is not necessary.  */
-extern wint_t fputwc_unlocked __P ((wint_t __wc, FILE *__stream));
+extern wint_t fputwc_unlocked __P ((wchar_t __wc, FILE *__stream));
 
 /* These are defined to be equivalent to the `char' functions defined
    in POSIX.1:1996.  */
-extern wint_t putwc_unlocked __P ((wint_t __wc, FILE *__stream));
-extern wint_t putwchar_unlocked __P ((wint_t __wc));
+extern wint_t putwc_unlocked __P ((wchar_t __wc, FILE *__stream));
+extern wint_t putwchar_unlocked __P ((wchar_t __wc));
 #endif