diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/Critic.java b/Tools/Source/MigrationTools/org/tianocore/migration/Critic.java
index 2d9bb7b14c..c987b9fe87 100644
--- a/Tools/Source/MigrationTools/org/tianocore/migration/Critic.java
+++ b/Tools/Source/MigrationTools/org/tianocore/migration/Critic.java
@@ -191,7 +191,9 @@ public final class Critic {
 			}
 			wholeline = templine.toString();
 			//
-
+			// Remove trailing blanks.
+			// 
+			wholeline = wholeline.replaceAll (" +\n", "\n");
 			Common.string2file(wholeline, filepath);
 		}
 	}