diff --git a/src/tools/intel-linux.jam b/src/tools/intel-linux.jam
index ea1eec3ff..8a69cefc3 100644
--- a/src/tools/intel-linux.jam
+++ b/src/tools/intel-linux.jam
@@ -27,7 +27,12 @@ toolset.inherit-flags intel-linux : gcc
         : <inlining>off <inlining>on <inlining>full <optimization>space 
           <warnings>off <warnings>all <warnings>on
         ;
-               
+        
+if [ MATCH (--debug-configuration) : [ modules.peek : ARGV ] ]
+{
+    .debug-configuration = true ;
+}
+                       
 # Initializes the intel-linux toolset
 #   version in mandatory
 #   name (default icc) is used to invoke the specified intellinux complier
@@ -46,12 +51,12 @@ rule init ( version ? :  command * : options * )
     
     local root = [ feature.get-values <root> : $(options) ] ;
     local bin ;
-    if $(command)
+    if $(command) || $(root)
     {
         bin ?= [ common.get-absolute-tool-path $(command[-1]) ] ;
         root ?= $(bin:D) ;
     
-        if $(command)
+        if $(root)
         {
             local lib_path = $(root)/lib ;
             if $(.debug-configuration)
diff --git a/src/tools/intel-win.jam b/src/tools/intel-win.jam
index 1d24755cc..cfe82b284 100644
--- a/src/tools/intel-win.jam
+++ b/src/tools/intel-win.jam
@@ -117,11 +117,15 @@ rule init ( version ? :     # the compiler version
     {
         C++FLAGS += 
           -Qoption,cpp,--arg_dep_lookup
-          -Qoption,cpp,--const_string_literals
-          -Qoption,cpp,--new_for_init
-          -Qoption,cpp,--no_implicit_typename
-          -Qoption,cpp,--no_friend_injection
-          -Qoption,cpp,--no_microsoft_bugs
+          # The following options were intended to disable
+          # 'bug-emulation' mode of intel compiler, but later
+          # were reported to case ICE with Intel-Win 9.0
+          # It's not yet clear which options can be safely used.
+          # -Qoption,cpp,--const_string_literals
+          # -Qoption,cpp,--new_for_init
+          # -Qoption,cpp,--no_implicit_typename
+          # -Qoption,cpp,--no_friend_injection
+          # -Qoption,cpp,--no_microsoft_bugs
           ;
     }