diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index b25cde3e6..a887b9b77 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-28  Corinna Vinschen  <corinna@vinschen.de>
+
+	* exceptions.cc (open_stackdumpfile): Use NtCreateFile to create
+	stackdump file.
+
 2008-02-27  Corinna Vinschen  <corinna@vinschen.de>
 
 	* exceptions.cc (stack_info::walk): Fix typo.
diff --git a/winsup/cygwin/exceptions.cc b/winsup/cygwin/exceptions.cc
index 4c569b4d9..a903852ee 100644
--- a/winsup/cygwin/exceptions.cc
+++ b/winsup/cygwin/exceptions.cc
@@ -32,6 +32,7 @@ details. */
 #include "dtable.h"
 #include "cygheap.h"
 #include "child_info.h"
+#include "ntdll.h"
 
 #define CALL_HANDLER_RETRY 20
 
@@ -140,11 +141,28 @@ open_stackdumpfile ()
 	p++;
       else
 	p = myself->progname;
-      char corefile[strlen (p) + sizeof (".stackdump")];
-      __small_sprintf (corefile, "%s.stackdump", p);
-      HANDLE h = CreateFile (corefile, GENERIC_WRITE, 0, &sec_none_nih,
-			     CREATE_ALWAYS, 0, 0);
-      if (h != INVALID_HANDLE_VALUE)
+
+      WCHAR corefile[strlen (p) + sizeof (".stackdump")];
+      UNICODE_STRING ucore;
+      OBJECT_ATTRIBUTES attr;
+      RtlInitEmptyUnicodeString (&ucore, corefile,
+				 sizeof corefile - sizeof (WCHAR));
+      ucore.Length = sys_mbstowcs (ucore.Buffer,
+				   ucore.MaximumLength / sizeof (WCHAR),
+				   p, strlen (p)) * sizeof (WCHAR);
+      RtlAppendUnicodeToString (&ucore, L".stackdump");
+      InitializeObjectAttributes (&attr, &ucore, OBJ_CASE_INSENSITIVE,
+				  cygheap->cwd.get_handle (), NULL);
+      HANDLE h;
+      IO_STATUS_BLOCK io;
+      NTSTATUS status;
+
+      status = NtCreateFile (&h, GENERIC_WRITE | SYNCHRONIZE, &attr, &io,
+			     NULL, FILE_ATTRIBUTE_NORMAL, 0, FILE_OVERWRITE_IF,
+			     FILE_SYNCHRONOUS_IO_NONALERT
+			     | FILE_OPEN_FOR_BACKUP_INTENT
+			     | FILE_OPEN_FOR_RECOVERY, NULL, 0);
+      if (NT_SUCCESS (status))
 	{
 	  if (!myself->cygstarted)
 	    system_printf ("Dumping stack trace to %s", corefile);