diff --git a/waflib/Tools/asm.py b/waflib/Tools/asm.py
index 520626d0..8619c460 100644
--- a/waflib/Tools/asm.py
+++ b/waflib/Tools/asm.py
@@ -45,7 +45,7 @@ class asm(Task.Task):
 	Compile asm files by gas/nasm/yasm/...
 	"""
 	color = 'BLUE'
-	run_str = '${AS} ${ASFLAGS} ${CPPPATH_ST:INCPATHS} ${AS_SRC_F}${SRC} ${AS_TGT_F}${TGT}'
+	run_str = '${AS} ${ASFLAGS} ${ASMPATH_ST:INCPATHS} ${AS_SRC_F}${SRC} ${AS_TGT_F}${TGT}'
 
 @extension('.s', '.S', '.asm', '.ASM', '.spp', '.SPP')
 def asm_hook(self, node):
@@ -71,3 +71,5 @@ class asmstlib(stlink_task):
 	"Link object files into a c static library"
 	pass # do not remove
 
+def configure(conf):
+	conf.env['ASMPATH_ST'] = '-I%s'
diff --git a/waflib/Tools/gas.py b/waflib/Tools/gas.py
index 9c3dfb59..c97b373f 100644
--- a/waflib/Tools/gas.py
+++ b/waflib/Tools/gas.py
@@ -15,3 +15,4 @@ def configure(conf):
 	conf.env.AS_TGT_F = ['-c', '-o']
 	conf.env.ASLNK_TGT_F = ['-o']
 	conf.find_ar()
+	conf.load('asm')
diff --git a/waflib/Tools/nasm.py b/waflib/Tools/nasm.py
index 7fc3277e..96f0e713 100644
--- a/waflib/Tools/nasm.py
+++ b/waflib/Tools/nasm.py
@@ -21,3 +21,4 @@ def configure(conf):
 	nasm = conf.find_program(['nasm', 'yasm'], var='AS')
 	conf.env.AS_TGT_F = ['-o']
 	conf.env.ASLNK_TGT_F = ['-o']
+	conf.load('asm')