diff --git a/ChangeLog b/ChangeLog
index 848bdaef02..b85cc3fa94 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Apr  2 17:19:00 BST 2008 Richard W.M. Jones <rjones@redhat.com>
+
+	C99 initializer on __lastErr
+	* src/virterror.c: Use C99 initializers to make initialization
+	  of __lastErr clearer (Guido Günther).
+
 Tue Apr  1 15:00:03 CEST 2008 Daniel Veillard <veillard@redhat.com>
 
 	* src/lxc_conf.c: patch from Dave Leskovec fixing an freed memory
diff --git a/src/virterror.c b/src/virterror.c
index 92ccf67d93..21109f2cb3 100644
--- a/src/virterror.c
+++ b/src/virterror.c
@@ -19,7 +19,9 @@
 #include "internal.h"
 
 virError __lastErr =       /* the last error */
-{ 0, 0, NULL, VIR_ERR_NONE, NULL, NULL, NULL, NULL, NULL, 0, 0, NULL };
+  { .code = 0, .domain = 0, .message = NULL, .level = VIR_ERR_NONE,
+    .conn = NULL, .dom = NULL, .str1 = NULL, .str2 = NULL, .str3 = NULL,
+    .int1 = 0, .int2 = 0, .net = NULL };
 static virErrorFunc virErrorHandler = NULL;     /* global error handler */
 static void *virUserData = NULL;        /* associated data */