diff --git a/BaseTools/Bin/Win32/build.exe b/BaseTools/Bin/Win32/build.exe
index a773e18742..e79f4bd7b1 100755
Binary files a/BaseTools/Bin/Win32/build.exe and b/BaseTools/Bin/Win32/build.exe differ
diff --git a/BaseTools/Conf/build_rule.template b/BaseTools/Conf/build_rule.template
index 1fa5228438..bca246c3e0 100644
--- a/BaseTools/Conf/build_rule.template
+++ b/BaseTools/Conf/build_rule.template
@@ -17,14 +17,14 @@
 # "*" is used to indicate that the source files will be processed at the same time.
 # "?" is used to indicate that the source files will be processed one by one.
 #
-# "[" Build.<File-Type>[.<version>][, Build.<File-Type>[.<version>]] "]"
-#   <InputFile[.<ToolChainFamily>]>
+# "[" Build.<File-Type>[.<version>][, Build.<File-Type>[.<version>]] "]" <EOL>
+#   <InputFile[.<ToolChainFamily>]> <EOL>
 #       [File-Type =] (?|*).<File-Extension> [(\n|,|;) (?|*).<File-Extension>]
 #
-#   <OutputFile[.<ToolChainFamily>]>
+#   <OutputFile[.<ToolChainFamily>]> <EOL>
 #       <FileFullPath>
 #
-#   <Command[.<ToolChainFamily>]>
+#   <Command[.<ToolChainFamily>]> <EOL>
 #       <Command1>
 #       [<Command2>]
 #
@@ -196,6 +196,7 @@
 [Build.Static-Library-File]
     <InputFile>
         ?.lib
+        $(LIBS)
 
     <OutputFile>
         $(DEBUG_DIR)(+)$(MODULE_NAME).dll