diff --git a/v2/tools/gcc.jam b/v2/tools/gcc.jam
index 254f74aa5..c6ef6dae6 100644
--- a/v2/tools/gcc.jam
+++ b/v2/tools/gcc.jam
@@ -66,6 +66,7 @@ if [ os.name ] = NT
 
 generators.register-c-compiler gcc.compile.c++ : CPP : OBJ : <toolset>gcc ;
 generators.register-c-compiler gcc.compile.c : C : OBJ : <toolset>gcc ;
+generators.register-c-compiler gcc.compile.asm : ASM : OBJ : <toolset>gcc ;
 
 
 # Declare flags and action for compilation
@@ -153,6 +154,16 @@ actions compile.c
     "$(CONFIG_COMMAND)" $(LANG) -Wall $(OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -c -o "$(<)" "$(>)" 
 }
 
+rule compile.asm
+{
+    LANG on $(<) = "-x assembler-with-cpp" ;
+}
+
+actions compile.asm
+{
+    "$(CONFIG_COMMAND)" $(LANG) -Wall $(OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -c -o "$(<)" "$(>)" 
+}
+
 # The class which check that we don't try to use
 # the <runtime-link>static property while creating or using shared library,
 # since it's not supported by gcc/libc.
diff --git a/v2/tools/types/asm.jam b/v2/tools/types/asm.jam
new file mode 100644
index 000000000..d728ecc96
--- /dev/null
+++ b/v2/tools/types/asm.jam
@@ -0,0 +1,4 @@
+# Copyright Craig Rodrigues 2005. Distributed under the Boost
+# Software License, Version 1.0. (See accompanying
+# file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+type ASM : s S ;