diff --git a/include/boost/current_function.hpp b/include/boost/current_function.hpp
index 66cb729..732fb2d 100644
--- a/include/boost/current_function.hpp
+++ b/include/boost/current_function.hpp
@@ -27,7 +27,7 @@ namespace detail
 inline void current_function_helper()
 {
 
-#if defined(__GNUC__) || (defined(__MWERKS__) && (__MWERKS__ >= 0x3000))
+#if defined(__GNUC__) || (defined(__MWERKS__) && (__MWERKS__ >= 0x3000)) || (defined(__ICC) && (__ICC >= 600))
 
 # define BOOST_CURRENT_FUNCTION __PRETTY_FUNCTION__
 
@@ -35,6 +35,10 @@ inline void current_function_helper()
 
 # define BOOST_CURRENT_FUNCTION __FUNCSIG__
 
+#elif defined(__INTEL_COMPILER) && (__INTEL_COMPILER >= 600)
+
+# define BOOST_CURRENT_FUNCTION __FUNCTION__
+
 #elif defined(__BORLANDC__) && (__BORLANDC__ >= 0x550)
 
 # define BOOST_CURRENT_FUNCTION __FUNC__