diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 96439a38a..f4bda5579 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2000-05-06  Mumit Khan  <khan@xraylith.wisc.edu>
+
+	* include/wchar.h (wcscmp, wcslen): Fix prototypes.
+	* syscalls.cc (wcslen, wcscmp): Adjust.
+
 Fri May  5 23:32:07 2000  Christopher Faylor <cgf@cygnus.com>
 
 	* errno.cc (errmap): Correct DIRECTORY mapping to ENOTDIR.
diff --git a/winsup/cygwin/include/wchar.h b/winsup/cygwin/include/wchar.h
index 8c7c94dca..986db9881 100644
--- a/winsup/cygwin/include/wchar.h
+++ b/winsup/cygwin/include/wchar.h
@@ -19,8 +19,8 @@ details. */
 
 __BEGIN_DECLS
 
-int wcscmp (wchar_t *__s1, wchar_t *__s2);
-int wcslen (wchar_t *__s1);
+int wcscmp (const wchar_t *__s1, const wchar_t *__s2);
+size_t wcslen (const wchar_t *__s1);
 
 __END_DECLS
 
diff --git a/winsup/cygwin/syscalls.cc b/winsup/cygwin/syscalls.cc
index 51b37b457..c1d7071f2 100644
--- a/winsup/cygwin/syscalls.cc
+++ b/winsup/cygwin/syscalls.cc
@@ -1836,7 +1836,7 @@ putw (int w, FILE *fp)
 
 extern "C"
 int
-wcscmp (wchar_t *s1, wchar_t *s2)
+wcscmp (const wchar_t *s1, const wchar_t *s2)
 {
   while (*s1  && *s1 == *s2)
     {
@@ -1848,8 +1848,8 @@ wcscmp (wchar_t *s1, wchar_t *s2)
 }
 
 extern "C"
-int
-wcslen (wchar_t *s1)
+size_t
+wcslen (const wchar_t *s1)
 {
   int l = 0;
   while (s1[l])