diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index 2d4f76eef..7b93e69d1 100644
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,7 @@
+2008-07-17  Ken Werner  <ken.werner@de.ibm.com>
+
+	* libc/machine/spu/strcpy.h: Pad null bytes if necessary.
+
 2008-07-08  Kenji Tanaka  <tanaka.ken2@jp.panasonic.com>
 
 	* libc/machine/mn10300/memset.S: Fix bug where return value is
diff --git a/newlib/libc/machine/spu/strcpy.h b/newlib/libc/machine/spu/strcpy.h
index e2ec2b259..946148bd2 100644
--- a/newlib/libc/machine/spu/strcpy.h
+++ b/newlib/libc/machine/spu/strcpy.h
@@ -176,5 +176,9 @@ static inline void * _strncpy(char * __restrict__ dest, const char *
      */
     dest[maxlen - spu_extract(curlen, 0)] = '\0';
   }
+
+  /* Pad null bytes if the length of the "src" is less than "n" (strncpy).  */
+  if (checklen && !lastzero && (maxlen != spu_extract(curlen,0)))
+    memset(dest + spu_extract(curlen, 0), 0, maxlen - spu_extract(curlen, 0));
   return (dest);
 }