diff --git a/include/boost/mpl/aux_/config/compiler.hpp b/include/boost/mpl/aux_/config/compiler.hpp
index 9fd6d14..a7779d9 100644
--- a/include/boost/mpl/aux_/config/compiler.hpp
+++ b/include/boost/mpl/aux_/config/compiler.hpp
@@ -27,7 +27,7 @@
 #elif defined(BOOST_MSVC) && BOOST_MSVC == 1300
 #   define BOOST_MPL_COMPILER_DIR msvc70
 
-#elif defined(__GNUC__)
+#elif defined(__GNUC__) && !defined(__EDG_VERSION__)
 #   define BOOST_MPL_COMPILER_DIR gcc
 
 #elif defined(__BORLANDC__) 
diff --git a/include/boost/mpl/aux_/config/dependent_nttp.hpp b/include/boost/mpl/aux_/config/dependent_nttp.hpp
index 517226f..90c9b40 100644
--- a/include/boost/mpl/aux_/config/dependent_nttp.hpp
+++ b/include/boost/mpl/aux_/config/dependent_nttp.hpp
@@ -27,7 +27,7 @@
 #if    !defined(BOOST_NO_DEPENDENT_NON_TYPE_PARAMETER_IN_PARTIAL_SPECIALIZATION) \
     && !defined(BOOST_MPL_PREPROCESSING_MODE) \
     && (   defined(__EDG__) && (__EDG_VERSION__ <= 300 || !defined(BOOST_STRICT_CONFIG)) \
-        || defined(__GNUC__) && (__GNUC__ < 3 || __GNUC__ == 3 && __GNUC_MINOR__ <= 2 \
+        || defined(__GNUC__) && !defined(__EDG_VERSION__) && (__GNUC__ < 3 || __GNUC__ == 3 && __GNUC_MINOR__ <= 2 \
         || !defined(BOOST_STRICT_CONFIG)) \
         )
 
diff --git a/include/boost/mpl/aux_/config/ttp.hpp b/include/boost/mpl/aux_/config/ttp.hpp
index 319be29..ba285ef 100644
--- a/include/boost/mpl/aux_/config/ttp.hpp
+++ b/include/boost/mpl/aux_/config/ttp.hpp
@@ -29,7 +29,7 @@
 
 #if    !defined(BOOST_EXTENDED_TEMPLATE_PARAMETERS_MATCHING) \
     && !defined(BOOST_MPL_PREPROCESSING_MODE) \
-    && (   defined(__GNUC__) && (__GNUC__ < 3 || __GNUC__ == 3 && __GNUC_MINOR__ <= 2 \
+    && (   defined(__GNUC__)  && !defined(__EDG_VERSION__) && (__GNUC__ < 3 || __GNUC__ == 3 && __GNUC_MINOR__ <= 2 \
             || !defined(BOOST_STRICT_CONFIG)) \
         || defined(__BORLANDC__) && (__BORLANDC__ <= 0x561 || !defined(BOOST_STRICT_CONFIG)) \
         )