diff --git a/boilerplate/Makefile.am b/boilerplate/Makefile.am
index 9733b5b35..b47b06129 100644
--- a/boilerplate/Makefile.am
+++ b/boilerplate/Makefile.am
@@ -8,8 +8,9 @@ libcairoboilerplate_la_SOURCES =	\
 	cairo-boilerplate-getopt.c	\
 	cairo-boilerplate-getopt.h	\
 	cairo-boilerplate-scaled-font.h	\
-	xmalloc.c			\
-	xmalloc.h
+	cairo-boilerplate-system.c	\
+	cairo-boilerplate-system.h	\
+	$(NULL)
 libcairoboilerplate_la_LIBADD = $(top_builddir)/src/libcairo.la $(CAIRO_LDADD)
 
 if CAIRO_HAS_BEOS_SURFACE
diff --git a/boilerplate/xmalloc.c b/boilerplate/cairo-boilerplate-system.c
similarity index 98%
rename from boilerplate/xmalloc.c
rename to boilerplate/cairo-boilerplate-system.c
index 12f12e9eb..af0768151 100644
--- a/boilerplate/xmalloc.c
+++ b/boilerplate/cairo-boilerplate-system.c
@@ -26,7 +26,7 @@
 #define _GNU_SOURCE 1 /* for vasprintf */
 
 #include "cairo-boilerplate.h"
-#include "xmalloc.h"
+#include "cairo-boilerplate-system.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/boilerplate/xmalloc.h b/boilerplate/cairo-boilerplate-system.h
similarity index 100%
rename from boilerplate/xmalloc.h
rename to boilerplate/cairo-boilerplate-system.h
diff --git a/boilerplate/cairo-boilerplate.h b/boilerplate/cairo-boilerplate.h
index d2fa4708f..b5c729514 100644
--- a/boilerplate/cairo-boilerplate.h
+++ b/boilerplate/cairo-boilerplate.h
@@ -187,6 +187,6 @@ cairo_boilerplate_version (void);
 const char*
 cairo_boilerplate_version_string (void);
 
-#include "xmalloc.h"
+#include "cairo-boilerplate-system.h"
 
 #endif