diff --git a/Tools/Java/Source/MigrationTools/org/tianocore/migration/ModuleInfo.java b/Tools/Java/Source/MigrationTools/org/tianocore/migration/ModuleInfo.java
index 69862f67a1..df07f836af 100644
--- a/Tools/Java/Source/MigrationTools/org/tianocore/migration/ModuleInfo.java
+++ b/Tools/Java/Source/MigrationTools/org/tianocore/migration/ModuleInfo.java
@@ -108,15 +108,17 @@ public final class ModuleInfo {
     
     public final void enroll(String filepath) throws Exception {
         String temp = null;
-        if (filepath.contains(".c") || filepath.contains(".C") || filepath.contains(".h") || 
-                filepath.contains(".H") || filepath.contains(".dxs") || filepath.contains(".uni")) {
-        	addSourceFile(filepath.replace(modulepath + File.separator, ""), null);
-        } else if (filepath.contains(".inf") || filepath.contains(".msa")) {
+         if (filepath.contains(".inf") || filepath.contains(".msa")) {
             temp = filepath.replace(modulepath + File.separator, "");
             if (!temp.contains(File.separator)) {                            // .inf in subdirectory is not regarded
                 msaorinf.add(temp);
             }
-        }
+        } else if (filepath.contains(".c") || filepath.contains(".C") || filepath.contains(".h") || 
+                filepath.contains(".H") || filepath.contains(".dxs") || filepath.contains(".uni") ||
+                filepath.contains(".s") || filepath.contains(".S") || filepath.contains(".i") ||
+                filepath.contains(".asm")) {
+        	addSourceFile(filepath.replace(modulepath + File.separator, ""), null);
+        } 
     }
 
     public static final boolean isModule(String path) {
diff --git a/Tools/Java/Source/MigrationTools/org/tianocore/migration/SourceFileReplacer.java b/Tools/Java/Source/MigrationTools/org/tianocore/migration/SourceFileReplacer.java
index 843af37c90..4a4d71cd79 100644
--- a/Tools/Java/Source/MigrationTools/org/tianocore/migration/SourceFileReplacer.java
+++ b/Tools/Java/Source/MigrationTools/org/tianocore/migration/SourceFileReplacer.java
@@ -75,7 +75,9 @@ public final class SourceFileReplacer implements Common.ForDoAll {
         }
         
         public boolean recognize(String filename) {
-            return filename.contains(".h") || filename.contains(".H") || filename.contains(".uni");
+            return filename.contains(".h") || filename.contains(".H") || filename.contains(".uni") ||
+                   filename.contains(".s") || filename.contains(".S") || filename.contains(".asm") ||
+                   (!filename.contains(".inf") && filename.contains(".i"));
         }
 
         public String namechange(String oldname) {