diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index 0ca046676..531a695c6 100644
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,7 @@
+2005-08-25  Christopher Faylor  <cgf@timesys.com>
+
+	* libc/include/string.h: For Cygwin, Define strerror_r as per ISO C.
+
 2005-08-22  Shaun Jackman  <sjackman@gmail.com>
 
 	* libc/include/_syslist.h: If HAVE_OPENDIR is not defined,
diff --git a/newlib/libc/include/string.h b/newlib/libc/include/string.h
index 30756b7ca..7b1863403 100644
--- a/newlib/libc/include/string.h
+++ b/newlib/libc/include/string.h
@@ -62,7 +62,11 @@ char 	*_EXFUN(strdup,(const char *));
 char 	*_EXFUN(_strdup_r,(struct _reent *, const char *));
 char 	*_EXFUN(strndup,(const char *, size_t));
 char 	*_EXFUN(_strndup_r,(struct _reent *, const char *, size_t));
+#ifdef __CYGWIN__
+int	_EXFUN(strerror_r,(int, char *, size_t));
+#else
 char 	*_EXFUN(strerror_r,(int, char *, size_t));
+#endif
 size_t	 _EXFUN(strlcat,(char *, const char *, size_t));
 size_t	 _EXFUN(strlcpy,(char *, const char *, size_t));
 int	 _EXFUN(strncasecmp,(const char *, const char *, size_t));