diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 3d788d0be..05ca04660 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,7 @@
+2008-04-03  Corinna Vinschen  <corinna@vinschen.de>
+
+	* dcrt0.cc (insert_file): Fix potential buffer overflow.
+
 2008-04-03  Corinna Vinschen  <corinna@vinschen.de>
 
 	* path.cc (mount_info::from_fstab): Get module path name of the Cygwin
diff --git a/winsup/cygwin/dcrt0.cc b/winsup/cygwin/dcrt0.cc
index cd2ac1eae..5464cce57 100644
--- a/winsup/cygwin/dcrt0.cc
+++ b/winsup/cygwin/dcrt0.cc
@@ -165,7 +165,7 @@ insert_file (char *name, char *&cmd)
   tmp_pathbuf tp;
 
   PWCHAR wname = tp.w_get ();
-  sys_mbstowcs (wname, NT_MAX_PATH + 1, name + 1);
+  sys_mbstowcs (wname, NT_MAX_PATH, name + 1);
   f = CreateFileW (wname,
 		   GENERIC_READ,	 /* open for reading	*/
 		   FILE_SHARE_READ,      /* share for reading	*/