diff --git a/tools/elog-gen.py b/tools/elog-gen.py
index 168e1fd..fe4807e 100755
--- a/tools/elog-gen.py
+++ b/tools/elog-gen.py
@@ -57,9 +57,10 @@
 
 
 def get_error_yaml_files(i_yaml_dir):
-    yaml_files = filter(
-        lambda file: file.endswith('.errors.yaml'),
-        os.listdir(i_yaml_dir))
+    yaml_files = []
+    for root, dirs, files in os.walk(i_yaml_dir):
+        for files in filter(lambda file: file.endswith('.errors.yaml'), files):
+            yaml_files.append(os.path.join(root, files))
     return yaml_files
 
 
@@ -110,7 +111,6 @@
 
     for error_yaml in error_yamls:
         # Verify the error yaml file
-        error_yaml = "/".join((i_yaml_dir, error_yaml))
         if (not (os.path.isfile(error_yaml))):
             print("Can not find input yaml file " + error_yaml)
             exit(1)