diff --git a/ChangeLog b/ChangeLog
index 11c315607e..d45f715a55 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2016-02-11  Szabolcs Nagy  <szabolcs.nagy@arm.com>
+
+	[BZ #19529]
+	* stdlib/Makefile (CFLAGS-tst-makecontext.c): Add -funwind-tables.
+
 2016-02-04  Rajalakshmi Srinivasaraghavan  <raji@linux.vnet.ibm.com>
 
 	* sysdeps/powerpc/fpu/libm-test-ulps: Regenerated.
diff --git a/stdlib/Makefile b/stdlib/Makefile
index e406856f99..26fe67ad95 100644
--- a/stdlib/Makefile
+++ b/stdlib/Makefile
@@ -112,6 +112,7 @@ CFLAGS-strfmon_l.c = $(libio-mtsafe)
 
 CFLAGS-tst-bsearch.c = $(stack-align-test-flags)
 CFLAGS-tst-qsort.c = $(stack-align-test-flags)
+CFLAGS-tst-makecontext.c += -funwind-tables
 CFLAGS-tst-makecontext2.c = $(stack-align-test-flags)
 
 # Run a test on the header files we use.