diff --git a/ChangeLog b/ChangeLog
index 73740d83f..ef51ae142 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-08-15 12:41:26  Tim Janik  <timj@imendio.com>
+
+	* glib/gtestutils.c: changed assertion messages, so older emacsen
+	can also detect failing source file and line, fixes:
+	Bug 502498 – Test framework assertion failures should follow gcc error format
+
 2008-08-14  Matthias Clasen  <mclasen@redhat.com>
 
 	Bug 547832 – gtk+-2.12.11 fails to build - AC_PROG_MMAP too strict,
diff --git a/glib/gtestutils.c b/glib/gtestutils.c
index b042714eb..8c0eb1ff3 100644
--- a/glib/gtestutils.c
+++ b/glib/gtestutils.c
@@ -1267,10 +1267,10 @@ g_assertion_message (const char     *domain,
     message = "code should not be reached";
   g_snprintf (lstr, 32, "%d", line);
   s = g_strconcat (domain ? domain : "", domain && domain[0] ? ":" : "",
-                   "ERROR:(", file, ":", lstr, "):",
+                   "ERROR:", file, ":", lstr, ":",
                    func, func[0] ? ":" : "",
                    " ", message, NULL);
-  g_printerr ("**\n** %s\n", s);
+  g_printerr ("**\n%s\n", s);
   g_test_log (G_TEST_LOG_ERROR, s, NULL, 0, NULL);
   g_free (s);
   abort();