diff --git a/src/tools/emscripten.jam b/src/tools/emscripten.jam
index 180dfd302..d6594c5e4 100644
--- a/src/tools/emscripten.jam
+++ b/src/tools/emscripten.jam
@@ -45,6 +45,7 @@ toolset.inherit-rules emscripten : gcc ;
 toolset.inherit-flags emscripten : gcc
         :
         <optimization>off <optimization>speed <optimization>space
+        <optimization>minimal <optimization>debug
         <profiling>off <profiling>on
         <debug-symbols>off <debug-symbols>on
         <rtti>off <rtti>on
diff --git a/src/tools/features/optimization-feature.jam b/src/tools/features/optimization-feature.jam
index a9a89302f..ad1b817a0 100644
--- a/src/tools/features/optimization-feature.jam
+++ b/src/tools/features/optimization-feature.jam
@@ -8,7 +8,7 @@ import feature ;
 #| tag::doc[]
 
 [[bbv2.builtin.features.optimization]]`optimization`::
-*Allowed values:* `off`, `speed`, `space`.
+*Allowed values:* `off`, `speed`, `space`, 'minimal', 'debug'.
 +
 Enables optimization. `speed` optimizes for faster code, `space` optimizes for
 smaller binary.
@@ -16,7 +16,7 @@ smaller binary.
 |# # end::doc[]
 
 feature.feature optimization
-    : off speed space
+    : off speed space minimal debug
     : propagated ;
 
 #| tag::inline-doc[]
diff --git a/src/tools/gcc.jam b/src/tools/gcc.jam
index 3991a9158..4843716a0 100644
--- a/src/tools/gcc.jam
+++ b/src/tools/gcc.jam
@@ -626,6 +626,8 @@ actions compile.c.pch
 toolset.flags gcc.compile OPTIONS <optimization>off   : -O0 ;
 toolset.flags gcc.compile OPTIONS <optimization>speed : -O3 ;
 toolset.flags gcc.compile OPTIONS <optimization>space : -Os ;
+toolset.flags gcc.compile OPTIONS <optimization>minimal : -O1 ;
+toolset.flags gcc.compile OPTIONS <optimization>debug : -Og ;
 
 toolset.flags gcc.compile OPTIONS <inlining>off  : -fno-inline ;
 toolset.flags gcc.compile OPTIONS <inlining>on   : -Wno-inline ;
diff --git a/src/tools/intel-darwin.jam b/src/tools/intel-darwin.jam
index 63f2b5d0f..adb0b9658 100644
--- a/src/tools/intel-darwin.jam
+++ b/src/tools/intel-darwin.jam
@@ -31,6 +31,7 @@ generators.override intel-darwin.searched-lib-generator : searched-lib-generator
 toolset.inherit-rules intel-darwin : gcc ;
 toolset.inherit-flags intel-darwin : gcc
         : <inlining>off <inlining>on <inlining>full <optimization>space
+        <optimization>minimal <optimization>debug
           <warnings>off <warnings>all <warnings>on
           <warnings>extra <warnings>pedantic
           <warnings-as-errors>off <warnings-as-errors>on
diff --git a/src/tools/intel-linux.jam b/src/tools/intel-linux.jam
index 5405ff55a..f1a881a4a 100644
--- a/src/tools/intel-linux.jam
+++ b/src/tools/intel-linux.jam
@@ -38,6 +38,7 @@ toolset.inherit-rules intel-linux : gcc ;
 toolset.inherit-flags intel-linux : gcc
         : <inlining>off <inlining>on <inlining>full
           <optimization>space <optimization>speed
+          <optimization>minimal <optimization>debug
           <warnings>off <warnings>all <warnings>on
           <warnings>extra <warnings>pedantic
           <warnings-as-errors>off <warnings-as-errors>on
diff --git a/src/tools/intel-vxworks.jam b/src/tools/intel-vxworks.jam
index 9ec050fc1..e9d51b766 100644
--- a/src/tools/intel-vxworks.jam
+++ b/src/tools/intel-vxworks.jam
@@ -30,6 +30,7 @@ generators.override intel-vxworks.searched-lib-generator : searched-lib-generato
 toolset.inherit-rules intel-vxworks : gcc ;
 toolset.inherit-flags intel-vxworks : gcc
         : <inlining>off <inlining>on <inlining>full <optimization>space
+          <optimization>minimal <optimization>debug
           <warnings>off <warnings>all <warnings>on
           <warnings>extra <warnings>pedantic
           <warnings-as-errors>off <warnings-as-errors>on