diff --git a/src/tools/features/sanitizers-feature.jam b/src/tools/features/sanitizers-feature.jam
index 8c35d3368..d57d6279f 100644
--- a/src/tools/features/sanitizers-feature.jam
+++ b/src/tools/features/sanitizers-feature.jam
@@ -18,3 +18,7 @@ feature.feature undefined-sanitizer
 feature.feature thread-sanitizer
     : on norecover
     : propagated optional ;
+feature.feature leak-sanitizer
+    : on norecover
+    : propagated optional ;
+
diff --git a/src/tools/gcc.jam b/src/tools/gcc.jam
index ecc45c260..f4a36089c 100644
--- a/src/tools/gcc.jam
+++ b/src/tools/gcc.jam
@@ -733,9 +733,11 @@ toolset.flags gcc.compile.c++ OPTIONS <exception-handling>off : -fno-exceptions
 toolset.flags gcc.compile.c++ OPTIONS <address-sanitizer>on : -fsanitize=address ;
 toolset.flags gcc.compile.c++ OPTIONS <undefined-sanitizer>on : -fsanitize=undefined ;
 toolset.flags gcc.compile.c++ OPTIONS <thread-sanitizer>on : -fsanitize=thread ;
+toolset.flags gcc.compile.c++ OPTIONS <leak-sanitizer>on : -fsanitize=leak ;
 toolset.flags gcc.compile.c++ OPTIONS <address-sanitizer>norecover : -fsanitize=address -fno-sanitize-recover=address ;
 toolset.flags gcc.compile.c++ OPTIONS <undefined-sanitizer>norecover : -fsanitize=undefined -fno-sanitize-recover=undefined ;
 toolset.flags gcc.compile.c++ OPTIONS <thread-sanitizer>norecover : -fsanitize=thread -fno-sanitize-recover=thread ;
+toolset.flags gcc.compile.c++ OPTIONS <leak-sanitizer>norecover : -fsanitize=leak -fno-sanitize-recover=leak ;
 toolset.flags gcc.compile.c++ OPTIONS <coverage>all : --coverage ;
 toolset.flags gcc.compile.c++ OPTIONS <coverage>profile : -fprofile-arcs ;
 toolset.flags gcc.compile.c++ OPTIONS <coverage>test : -ftest-coverage ;
@@ -882,9 +884,11 @@ toolset.flags gcc.link OPTIONS <local-visibility>global : -fvisibility=default ;
 toolset.flags gcc.link OPTIONS <address-sanitizer>on : -fsanitize=address ;
 toolset.flags gcc.link OPTIONS <undefined-sanitizer>on : -fsanitize=undefined ;
 toolset.flags gcc.link OPTIONS <thread-sanitizer>on : -fsanitize=thread ;
+toolset.flags gcc.link OPTIONS <leak-sanitizer>on : -fsanitize=leak ;
 toolset.flags gcc.link OPTIONS <address-sanitizer>norecover : -fsanitize=address -fno-sanitize-recover=address ;
 toolset.flags gcc.link OPTIONS <undefined-sanitizer>norecover : -fsanitize=undefined -fno-sanitize-recover=undefined ;
 toolset.flags gcc.link OPTIONS <thread-sanitizer>norecover : -fsanitize=thread -fno-sanitize-recover=thread ;
+toolset.flags gcc.link OPTIONS <leak-sanitizer>norecover : -fsanitize=leak -fno-sanitize-recover=leak ;
 toolset.flags gcc.link OPTIONS <coverage>all : --coverage ;
 toolset.flags gcc.link OPTIONS <coverage>profile : -fprofile-arcs ;
 toolset.flags gcc.link OPTIONS <coverage>test : -lgcov ;