diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 9d04a7b3fa..440a844bd9 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,7 @@
+2013-11-20  Paul Pluzhnikov  <ppluzhnikov@google.com
+
+	* Makefile (tst-cleanup2, tst-cleanupx2): Add -fno-builtin
+
 2013-10-30  Mike Frysinger  <vapier@gentoo.org>
 
 	* sysdeps/pthread/configure.in: Moved to ...
diff --git a/nptl/Makefile b/nptl/Makefile
index cd601e5f5a..82f2d0a4f4 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -278,6 +278,10 @@ gen-as-const-headers = pthread-errnos.sym
 
 LDFLAGS-pthread.so = -Wl,--enable-new-dtags,-z,nodelete,-z,initfirst
 
+# GCC-4.9 compiles 'sprintf(NULL, ...)' into UD2 on x86_64 without -fno-builtin
+CFLAGS-tst-cleanup2.c = -fno-builtin
+CFLAGS-tst-cleanupx2.c = -fno-builtin
+
 include ../Makeconfig
 
 ifeq ($(have-forced-unwind),yes)