diff --git a/ChangeLog b/ChangeLog
index b5d380e65f..0c95ed93b0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2017-04-01  Wladimir van der Laan  <laanwj@gmail.com>
+
+	[BZ# 21338]
+	* malloc/malloc.c: Call do_set_arena_max for M_ARENA_MAX
+	instead of incorrect do_set_arena_test
+
 2017-03-31  Gabriel F. T. Gomes  <gftg@linux.vnet.ibm.com>
 
 	* math/math.h: Fix check for __MATH_DECLARE_LDOUBLE.
diff --git a/malloc/malloc.c b/malloc/malloc.c
index 994a23248e..4c40e2ea19 100644
--- a/malloc/malloc.c
+++ b/malloc/malloc.c
@@ -4904,7 +4904,7 @@ __libc_mallopt (int param_number, int value)
 
     case M_ARENA_MAX:
       if (value > 0)
-	do_set_arena_test (value);
+	do_set_arena_max (value);
       break;
     }
   __libc_lock_unlock (av->mutex);