1 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index b5fd436ba0..3edcce4d9d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2016-08-02  Florian Weimer  <fweimer@redhat.com>
+
+	[BZ #19469]
+	* malloc/Makefile (CPPFLAGS): Compile tests with
+	-DTEST_NO_MALLOPT.
+	* test-skeleton.c (main): Only call mallopt if !TEST_NO_MALLOPT.
+
 2016-08-02  Andrew Senkevich  <andrew.senkevich@intel.com>
 
 	[BZ #20033]