diff --git a/tools/tcg_rim_tool/src/main/java/hirs/swid/Main.java b/tools/tcg_rim_tool/src/main/java/hirs/swid/Main.java
index b5da4d61..bf03b3dc 100644
--- a/tools/tcg_rim_tool/src/main/java/hirs/swid/Main.java
+++ b/tools/tcg_rim_tool/src/main/java/hirs/swid/Main.java
@@ -21,8 +21,12 @@ public class Main {
             if (!commander.getVerifyFile().isEmpty()) {
                 System.out.println(commander.toString());
                 String verifyFile = commander.getVerifyFile();
+                String rimel = commander.getRimEventLog();
                 //String publicCertificate = commander.getPublicCertificate();
                 if (!verifyFile.isEmpty()) {
+                    if (!rimel.isEmpty()) {
+                        gateway.setRimEventLog(rimel);
+                    }
                     try {
                         gateway.validateSwidTag(verifyFile);
                     } catch (IOException e) {
diff --git a/tools/tcg_rim_tool/src/main/java/hirs/swid/SwidTagGateway.java b/tools/tcg_rim_tool/src/main/java/hirs/swid/SwidTagGateway.java
index f57e875d..14a9175d 100644
--- a/tools/tcg_rim_tool/src/main/java/hirs/swid/SwidTagGateway.java
+++ b/tools/tcg_rim_tool/src/main/java/hirs/swid/SwidTagGateway.java
@@ -437,7 +437,12 @@ public class SwidTagGateway {
      * This method validates a hirs.swid.xjc.File from an indirect payload
      */
     private boolean validateFile(Element file) {
-        String filepath = file.getAttribute(SwidTagConstants.NAME);
+        String filepath;
+        if (rimEventLog.isEmpty()) {
+            filepath = file.getAttribute(SwidTagConstants.NAME);
+        } else {
+            filepath = rimEventLog;
+        }
         System.out.println("Support rim found at " + filepath);
         if (HashSwid.get256Hash(filepath).equals(file.getAttribute(_SHA256_HASH.getPrefix() + ":" + _SHA256_HASH.getLocalPart()))) {
             System.out.println("Support RIM hash verified!");