diff --git a/ChangeLog b/ChangeLog
index b8b700226..52014f744 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-09-16  Tor Lillqvist  <tml@novell.com>
+
+	* glib/gbacktrace.h: Define G_BREAKPOINT() also for 64-bit MSVC,
+	using the __debugbreak() intrinsic.
+
 2008-09-15  Behdad Esfahbod  <behdad@gnome.org>
 
 	* configure.in: Fix description of module shared library suffix.
diff --git a/glib/gbacktrace.h b/glib/gbacktrace.h
index 740ee55f9..274cdac41 100644
--- a/glib/gbacktrace.h
+++ b/glib/gbacktrace.h
@@ -54,6 +54,8 @@ void g_on_error_stack_trace (const gchar *prg_name);
 #  define G_BREAKPOINT()	G_STMT_START{ __asm__ __volatile__ ("int $03"); }G_STMT_END
 #elif (defined (_MSC_VER) || defined (__DMC__)) && defined (_M_IX86)
 #  define G_BREAKPOINT()	G_STMT_START{ __asm int 3h }G_STMT_END
+#elif defined (_MSC_VER)
+#  define G_BREAKPOINT()	G_STMT_START{ __debugbreak(); }G_STMT_END
 #elif defined (__alpha__) && !defined(__osf__) && defined (__GNUC__) && __GNUC__ >= 2
 #  define G_BREAKPOINT()	G_STMT_START{ __asm__ __volatile__ ("bpt"); }G_STMT_END
 #else	/* !__i386__ && !__alpha__ */