diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 5dc439c0f2..eca3b52f06 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2013-03-19  Corinna Vinschen  <vinschen@redhat.com>
+
+	* windows-nat.c (handle_output_debug_string): Change type of n to
+	SIZE_T to avoid crash on 64 bit systems.
+
 2013-03-17  Eli Zaretskii  <eliz@gnu.org>
 
 	* python/python-internal.h (HAVE_SNPRINTF)
diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c
index 977b9680b8..16ee785a26 100644
--- a/gdb/windows-nat.c
+++ b/gdb/windows-nat.c
@@ -973,7 +973,7 @@ handle_output_debug_string (struct target_waitstatus *ourstatus)
       if (gotasig)
 	{
 	  LPCVOID x;
-	  DWORD n;
+	  SIZE_T n;
 	  ourstatus->kind = TARGET_WAITKIND_STOPPED;
 	  retval = strtoul (p, &p, 0);
 	  if (!retval)