diff --git a/BaseTools/Conf/build_rule.template b/BaseTools/Conf/build_rule.template
index de142de4bb..496fd666b1 100644
--- a/BaseTools/Conf/build_rule.template
+++ b/BaseTools/Conf/build_rule.template
@@ -170,6 +170,21 @@
         # For RVCTCYGWIN ASM_FLAGS must be first to work around pathing issues
         "$(ASM)" $(ASM_FLAGS) -o ${dst} $(INC) ${d_path}(+)${s_base}.iii
 
+[Nasm-Assembly-Code-File.COMMON.COMMON]
+    <InputFile>
+        ?.nasm, ?.Nasm, ?.NASM
+
+    <ExtraDependency>
+        $(MAKE_FILE)
+
+    <OutputFile>
+        $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj
+
+    <Command>
+        "$(PP)" $(PP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i
+        Trim --trim-long --source-code -o ${d_path}(+)${s_base}.iii ${d_path}(+)${s_base}.i
+        "$(NASM)" -I${s_path}(+) $(NASM_FLAGS) -o $dst ${d_path}(+)${s_base}.iii
+
 [Assembly-Code-File.COMMON.IPF]
     <InputFile>
         ?.s
diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
index 824bc056b8..15993ddf01 100644
--- a/BaseTools/Conf/tools_def.template
+++ b/BaseTools/Conf/tools_def.template
@@ -671,8 +671,6 @@ DEFINE SOURCERY_CYGWIN_TOOLS = /cygdrive/c/Program Files/CodeSourcery/Sourcery G
 # Other Supported Tools
 # =====================
 #   NASM                 2.0.3   http://www.nasm.us/
-#                        Note: Converts NASM source to .bin. Object linking to
-#                              EDK II driver modules is not currently supported.
 #
 ####################################################################################
 ####################################################################################