diff --git a/ChangeLog b/ChangeLog
index 9ae6b8b6db..82299e5ebe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2015-02-23  Andreas Schwab  <schwab@suse.de>
+
+	* elf/Makefile (CFLAGS-tst-audit2.c): Define.
+
 2015-02-22  Paul Pluzhnikov  <ppluzhnikov@google.com>
 
 	[BZ #17269]
diff --git a/elf/Makefile b/elf/Makefile
index b43b48ed95..f78642ed09 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -1017,6 +1017,8 @@ $(objpfx)tst-audit1.out: $(objpfx)tst-auditmod1.so
 tst-audit1-ENV = LD_AUDIT=$(objpfx)tst-auditmod1.so
 
 $(objpfx)tst-audit2.out: $(objpfx)tst-auditmod1.so
+# Prevent GCC-5 from translating a malloc/memset pair into calloc
+CFLAGS-tst-audit2.c += -fno-builtin
 tst-audit2-ENV = LD_AUDIT=$(objpfx)tst-auditmod1.so
 
 $(objpfx)tst-audit9: $(libdl)