diff --git a/build/Jamfile.v2 b/build/Jamfile.v2
index 1b22a16..c591e24 100644
--- a/build/Jamfile.v2
+++ b/build/Jamfile.v2
@@ -49,12 +49,12 @@ project boost/chrono
         <toolset>clang:<cxxflags>-pedantic
         <toolset>clang:<cxxflags>-Wno-long-long
         <toolset>clang:<cxxflags>-Wno-variadic-macros
-        <toolset>gcc-mingw-4.4.0:<cxxflags>-fdiagnostics-show-option
-        <toolset>gcc-mingw-4.5.0:<cxxflags>-fdiagnostics-show-option
-        <toolset>gcc-mingw-4.6.0:<cxxflags>-fdiagnostics-show-option
-        <toolset>gcc-mingw-4.6.3:<cxxflags>-fdiagnostics-show-option
-        <toolset>gcc-mingw-4.7.0:<cxxflags>-fdiagnostics-show-option
-        <toolset>gcc-mingw-4.8.0:<cxxflags>-fdiagnostics-show-option
+        <toolset>gcc-4.4.0,<target-os>windows:<cxxflags>-fdiagnostics-show-option
+        <toolset>gcc-4.5.0,<target-os>windows:<cxxflags>-fdiagnostics-show-option
+        <toolset>gcc-4.6.0,<target-os>windows:<cxxflags>-fdiagnostics-show-option
+        <toolset>gcc-4.6.3,<target-os>windows:<cxxflags>-fdiagnostics-show-option
+        <toolset>gcc-4.7.0,<target-os>windows:<cxxflags>-fdiagnostics-show-option
+        <toolset>gcc-4.8.0,<target-os>windows:<cxxflags>-fdiagnostics-show-option
         <toolset>msvc:<cxxflags>/wd4512
 
 # Note: Some of the remarks from the Intel compiler are disabled
@@ -97,8 +97,8 @@ project boost/chrono
         <link>static:<define>BOOST_CHRONO_STATIC_LINK=1
         <toolset>gcc-3.4.4:<linkflags>--enable-auto-import
         <toolset>gcc-4.3.4:<linkflags>--enable-auto-import
-        <toolset>gcc-mingw-4.4.0:<linkflags>--enable-auto-import
-        <toolset>gcc-mingw-4.5.0:<linkflags>--enable-auto-import
+        <toolset>gcc-4.4.0,<target-os>windows:<linkflags>--enable-auto-import
+        <toolset>gcc-4.5.0,<target-os>windows:<linkflags>--enable-auto-import
     ;
 
 SOURCES = chrono thread_clock process_cpu_clocks ;
diff --git a/perf/Jamfile.v2 b/perf/Jamfile.v2
index 20f048e..c0891ed 100644
--- a/perf/Jamfile.v2
+++ b/perf/Jamfile.v2
@@ -34,8 +34,8 @@ project
         <toolset>clang:<cxxflags>-Wextra
         <toolset>clang:<cxxflags>-pedantic
         <toolset>clang:<cxxflags>-Wno-long-long
-        <toolset>gcc-mingw-4.5.0:<cxxflags>-Wno-missing-field-initializers
-        <toolset>gcc-mingw-4.5.0:<cxxflags>-fdiagnostics-show-option
+        <toolset>gcc-4.5.0,<target-os>windows:<cxxflags>-Wno-missing-field-initializers
+        <toolset>gcc-4.5.0,<target-os>windows:<cxxflags>-fdiagnostics-show-option
         <toolset>msvc:<cxxflags>/wd4127
 # Note: Some of the remarks from the Intel compiler are disabled
 # remark #304: access control not specified ("public" by default)
diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
index 0cd79bb..5b47568 100644
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -40,8 +40,8 @@ project
         <toolset>clang:<cxxflags>-pedantic
         <toolset>clang:<cxxflags>-Wno-long-long
         <toolset>clang:<cxxflags>-Wno-variadic-macros
-        <toolset>gcc-mingw-4.5.0:<cxxflags>-Wno-missing-field-initializers
-        <toolset>gcc-mingw-4.5.0:<cxxflags>-fdiagnostics-show-option
+        <toolset>gcc-4.5.0,<target-os>windows:<cxxflags>-Wno-missing-field-initializers
+        <toolset>gcc-4.5.0,<target-os>windows:<cxxflags>-fdiagnostics-show-option
         <toolset>msvc:<cxxflags>/wd4127
         <toolset>msvc:<cxxflags>/wd4512
 # Note: Some of the remarks from the Intel compiler are disabled