diff --git a/Tools/Java/Source/MigrationTools/org/tianocore/migration/ModuleInfo.java b/Tools/Java/Source/MigrationTools/org/tianocore/migration/ModuleInfo.java
index 29413c4b0a..8f54d81b58 100644
--- a/Tools/Java/Source/MigrationTools/org/tianocore/migration/ModuleInfo.java
+++ b/Tools/Java/Source/MigrationTools/org/tianocore/migration/ModuleInfo.java
@@ -35,6 +35,8 @@ public final class ModuleInfo {
 
 	private MsaOwner msaowner = MsaOwner.initNewMsaOwner();
 
+	public boolean isLibrary = false;
+
 	public String modulename = null;
 
 	public String guidvalue = null;
diff --git a/Tools/Java/Source/MigrationTools/org/tianocore/migration/ModuleReader.java b/Tools/Java/Source/MigrationTools/org/tianocore/migration/ModuleReader.java
index c72399ea2c..f3eb7069eb 100644
--- a/Tools/Java/Source/MigrationTools/org/tianocore/migration/ModuleReader.java
+++ b/Tools/Java/Source/MigrationTools/org/tianocore/migration/ModuleReader.java
@@ -146,6 +146,9 @@ public final class ModuleReader implements Common.ForDoAll {
 					}
 					if (mtrinfequation.group(1).matches("COMPONENT_TYPE")) {
 						mi.moduletype = mtrinfequation.group(2);
+						if (mi.moduletype.matches("LIBRARY")) {
+							mi.isLibrary = true;
+						}
 					}
 				}
 			}
diff --git a/Tools/Java/Source/MigrationTools/org/tianocore/migration/MsaWriter.java b/Tools/Java/Source/MigrationTools/org/tianocore/migration/MsaWriter.java
index 6bc76764c7..deb0ae0b9c 100644
--- a/Tools/Java/Source/MigrationTools/org/tianocore/migration/MsaWriter.java
+++ b/Tools/Java/Source/MigrationTools/org/tianocore/migration/MsaWriter.java
@@ -232,6 +232,12 @@ public class MsaWriter {
 				}
 			}
 		}
+		if (mi.isLibrary) {
+			LibraryClassDocument.LibraryClass lc = libclassdefs
+					.addNewLibraryClass();
+			lc.setKeyword(mi.modulename);
+			lc.setUsage(UsageTypes.ALWAYS_PRODUCED);
+		}
 		it = mi.hashrequiredr9libs.iterator();
 		while (it.hasNext()) {
 			if ((temp = it.next()) != null && !temp.matches("%")