diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index 01f34774f..e624880ee 100644
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,8 @@
+2008-11-25  Corinna Vinschen  <corinna@vinschen.de>
+
+	* libc/stdio/gets.c (_gets_r): Lock stdin here and call
+	__sgetc_r instead of _getchar_r.
+
 2008-11-24  Craig Howland  <howland@LGSInnovations.com>
 
 	* libc/stdlib/wcstoull_r.c:  Add EINVAL return for bad base value,
diff --git a/newlib/libc/stdio/gets.c b/newlib/libc/stdio/gets.c
index b90271fb9..17d144316 100644
--- a/newlib/libc/stdio/gets.c
+++ b/newlib/libc/stdio/gets.c
@@ -79,15 +79,20 @@ _DEFUN(_gets_r, (ptr, buf),
   register int c;
   register char *s = buf;
 
-  while ((c = _getchar_r (ptr)) != '\n')
+  _flockfile (stdin);
+  while ((c = __sgetc_r (ptr, stdin)) != '\n')
     if (c == EOF)
       if (s == buf)
-	return NULL;
+	{
+	  _funlockfile (stdin);
+	  return NULL;
+	}
       else
 	break;
     else
       *s++ = c;
   *s = 0;
+  _funlockfile (stdin);
   return buf;
 }