diff --git a/ChangeLog b/ChangeLog
index 11b88cb0f..ac25e9e7a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-04-08  Carl Worth  <cworth@cworth.org>
+
+	* src/cairo-matrix.c (cairo_matrix_init_identity): Don't try to
+	return a value (even a void value) from a void function. Closes
+	bug #2931.
+
 2005-04-07  Carl Worth  <cworth@cworth.org>
 
 	* src/cairo-wideint.h: Remove broken code for defining
diff --git a/src/cairo-matrix.c b/src/cairo-matrix.c
index ff3aebc03..838de3093 100644
--- a/src/cairo-matrix.c
+++ b/src/cairo-matrix.c
@@ -117,10 +117,10 @@ slim_hidden_def(cairo_matrix_copy);
 void
 cairo_matrix_init_identity (cairo_matrix_t *matrix)
 {
-    return cairo_matrix_init (matrix,
-			      1, 0,
-			      0, 1,
-			      0, 0);
+    cairo_matrix_init (matrix,
+		       1, 0,
+		       0, 1,
+		       0, 0);
 }
 slim_hidden_def(cairo_matrix_init_identity);
 DEPRECATE(cairo_matrix_set_identity, cairo_matrix_init_identity);