diff --git a/src/tools/common.jam b/src/tools/common.jam
index df2a7bee5..f2cef95fb 100644
--- a/src/tools/common.jam
+++ b/src/tools/common.jam
@@ -674,7 +674,14 @@ local rule toolset-tag ( name : type ? : property-set )
         case cw : tag += cw ;
         case darwin* : tag += ;
         case edg* : tag += edg ;
-        case gcc* : tag += gcc ;
+        case gcc* :
+        {
+            switch [ $(property-set).get <toolset-gcc:flavor> ]
+            {
+                case *mingw* : tag += mgw ;
+                case * : tag += gcc ;
+            }
+        }
         case intel : 
         if [ $(property-set).get <toolset-intel:platform> ] = win
         {