diff --git a/intel-linux-tools.jam b/intel-linux-tools.jam
index 976d3967c..5587dd3a9 100644
--- a/intel-linux-tools.jam
+++ b/intel-linux-tools.jam
@@ -12,12 +12,15 @@ if ! $(IA32ROOT)
     # Compiler version
     INTEL_LINUX_VERSION ?= "50" ;
 }
+
+flags intel-linux INTEL_LINUX_VERSION : $(INTEL_LINUX_VERSION) ;
+
 # Root directory
-INTEL_LINUX_ROOT = "/opt/intel/compiler"$(INTEL_LINUX_VERSION) ;
+flags intel-linux INTEL_LINUX_ROOT : "/opt/intel/compiler"$(INTEL_LINUX_VERSION) ;
 # Setup script
-INTEL_LINUX_SETUP = ". "$(INTEL_LINUX_ROOT)"/ia32/bin/iccvars.sh" ;
+flags intel-linux INTEL_LINUX_SETUP : ". "$(INTEL_LINUX_ROOT)"/ia32/bin/iccvars.sh" ;
 # Additional DLL directory
-INTEL_LINUX_RUN_LD_LIBRARY_PATH = $(INTEL_LINUX_ROOT)"/ia32/lib" ;
+flags intel-linux INTEL_LINUX_RUN_LD_LIBRARY_PATH : $(INTEL_LINUX_ROOT)"/ia32/lib" ;
 
 #### compiler and linker switches ####
 
diff --git a/v1/intel-linux-tools.jam b/v1/intel-linux-tools.jam
index 976d3967c..5587dd3a9 100644
--- a/v1/intel-linux-tools.jam
+++ b/v1/intel-linux-tools.jam
@@ -12,12 +12,15 @@ if ! $(IA32ROOT)
     # Compiler version
     INTEL_LINUX_VERSION ?= "50" ;
 }
+
+flags intel-linux INTEL_LINUX_VERSION : $(INTEL_LINUX_VERSION) ;
+
 # Root directory
-INTEL_LINUX_ROOT = "/opt/intel/compiler"$(INTEL_LINUX_VERSION) ;
+flags intel-linux INTEL_LINUX_ROOT : "/opt/intel/compiler"$(INTEL_LINUX_VERSION) ;
 # Setup script
-INTEL_LINUX_SETUP = ". "$(INTEL_LINUX_ROOT)"/ia32/bin/iccvars.sh" ;
+flags intel-linux INTEL_LINUX_SETUP : ". "$(INTEL_LINUX_ROOT)"/ia32/bin/iccvars.sh" ;
 # Additional DLL directory
-INTEL_LINUX_RUN_LD_LIBRARY_PATH = $(INTEL_LINUX_ROOT)"/ia32/lib" ;
+flags intel-linux INTEL_LINUX_RUN_LD_LIBRARY_PATH : $(INTEL_LINUX_ROOT)"/ia32/lib" ;
 
 #### compiler and linker switches ####