diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index defc350a7..4f9193cd1 100644
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,6 +1,10 @@
+2005-07-08  Ola Hugosson   <Ola.Hugosson@anoto.com>
+
+	* libc/string/wcsspn.c (wcsspn): Add missing increment of q.
+
 2005-07-07  Shaun Jackman  <sjackman@gmail.com>
 
-	* newlib/libc/unix/ttyname.c (ttyname): Avoid calling _closedir
+	* libc/unix/ttyname.c (ttyname): Avoid calling _closedir
 	twice for the same directory. _closedir calls free, and freeing
 	the same pointer twice may cause a crash.
 
diff --git a/newlib/libc/string/wcsspn.c b/newlib/libc/string/wcsspn.c
index f0b2fb99f..b54804c45 100644
--- a/newlib/libc/string/wcsspn.c
+++ b/newlib/libc/string/wcsspn.c
@@ -75,6 +75,7 @@ _DEFUN (wcsspn, (s, set),
 	{
 	  if (*p == *q)
 	    break;
+	  q++;
 	}
       if (!*q)
 	goto done;