diff --git a/meson.build b/meson.build
index c8590f7..17232b1 100644
--- a/meson.build
+++ b/meson.build
@@ -122,11 +122,13 @@
     ]
     extra_scripts += [
         'mmc/obmc-flash-bios',
+        'mmc/recover_pnor_files',
     ]
     extra_unit_files += [
         'mmc/obmc-flash-bios-init.service',
         'mmc/obmc-flash-bios-patch.service',
         'mmc/openpower-bios-factory-reset.service',
+        'mmc/obmc-recover-pnor.service',
     ]
 endif
 
diff --git a/mmc/obmc-recover-pnor.service b/mmc/obmc-recover-pnor.service
new file mode 100644
index 0000000..fea7f32
--- /dev/null
+++ b/mmc/obmc-recover-pnor.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Recover Host%i PHAL devtree and lid files
+After=obmc-host-reset-running@%i.target
+Before=phal-import-devtree@0.service
+After=openpower-update-bios-attr-table.service
+
+[Service]
+RemainAfterExit=yes
+Type=oneshot
+ExecStart=/usr/bin/recover_pnor_files
+
+[Install]
+WantedBy=multi-user.target
diff --git a/mmc/recover_pnor_files b/mmc/recover_pnor_files
new file mode 100644
index 0000000..20a2fe5
--- /dev/null
+++ b/mmc/recover_pnor_files
@@ -0,0 +1,46 @@
+#!/bin/sh
+
+base_dir="/var/lib/phosphor-software-manager/hostfw"
+ro_dir="/media/hostfw/running-ro"
+running_dir="${base_dir}/running"
+file_recovered=0
+
+if [ -f "${ro_dir}/81e00994.lid" ]; then
+    #look for the DEVTREE and the preserved files
+    filesList=$(grep 'PRESERVED\|DEVTREE' "${ro_dir}/81e00994.lid")
+    for eachFile in ${filesList}; do
+        eachFile=${eachFile##partition*=}
+        eachFile=$(echo "${eachFile}" | cut -d "," -f 1)
+        #check if it is a symbolic link
+        if [ -L "${running_dir}/${eachFile}" ]; then
+            # get the symlink target file
+            eachFile="$(readlink "${running_dir}/${eachFile}")"
+            if [ -f "${running_dir}/${eachFile}" ] && [ -f "${ro_dir}/${eachFile}" ]; then
+                runsize="$(stat -c '%s' "${running_dir}/${eachFile}")"
+                rosize="$(stat -c '%s' "${ro_dir}/${eachFile}")"
+                # Partition size may have changed or became corrupted
+                # restoring the file from the readonly copy
+                if [ "$runsize" != "$rosize" ]; then
+                    cp -p ${ro_dir}/"${eachFile}" ${running_dir}/"${eachFile}"
+                    # Log PEL to indicate such
+                    busctl call xyz.openbmc_project.Logging \
+                        /xyz/openbmc_project/logging \
+                        xyz.openbmc_project.Logging.Create Create "ssa{ss}" \
+                        xyz.openbmc_project.Software.Version.Error.HostFile \
+                        xyz.openbmc_project.Logging.Entry.Level.Error 3 "FILE_NAME" \
+                        "${eachFile}" "CURRENT_FILE_SIZE" "${runsize}" "EXPECTED_FILE_SIZE" \
+                        "${rosize}"
+
+                    file_recovered=1
+                fi
+            fi
+        fi
+    done
+    #one or more files could be recovered. So trigger dump outside the while loop
+    if [ $file_recovered -eq 1 ]; then
+        # Initiate dump
+        busctl call xyz.openbmc_project.Dump.Manager \
+            /xyz/openbmc_project/dump/bmc xyz.openbmc_project.Dump.Create \
+            CreateDump "a{sv}" 0
+    fi
+fi
\ No newline at end of file