diff --git a/configure b/configure
index 94804bd8dd..f39a860dc3 100755
--- a/configure
+++ b/configure
@@ -2211,6 +2211,10 @@ case "$toolchain" in
         add_cflags  -fsanitize=thread -pie
         add_ldflags -fsanitize=thread -pie
     ;;
+    valgrind-massif)
+        target_exec_default="valgrind"
+        target_exec_args="--alloc-fn=av_malloc --alloc-fn=av_mallocz"
+    ;;
     valgrind-memcheck)
         target_exec_default="valgrind"
         target_exec_args="--track-origins=yes --leak-check=full"
diff --git a/doc/developer.texi b/doc/developer.texi
index c3d0f2065c..58635f808f 100644
--- a/doc/developer.texi
+++ b/doc/developer.texi
@@ -578,9 +578,10 @@ new test.
 
 The configure script provides a shortcut for using valgrind to spot bugs
 related to memory handling. Just add the option
-@code{--toolchain=valgrind-memcheck} to your configure line, and
-reasonable defaults will be set for running FATE under the supervision
-of the @strong{memcheck} tool of the valgrind suite.
+@code{--toolchain=valgrind-memcheck} or @code{--toolchain=valgrind-massif}
+to your configure line, and reasonable defaults will be set for running
+FATE under the supervision of either the @strong{memcheck} or the
+@strong{massif} tool of the valgrind suite.
 
 In case you need finer control over how valgrind is invoked, use the
 @code{--target-exec='valgrind <your_custom_valgrind_options>} option in