diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc
index 4a253dd4..0b2af130 100644
--- a/rootdir/etc/init.qcom.rc
+++ b/rootdir/etc/init.qcom.rc
@@ -189,6 +189,11 @@ on boot
     # Allow access for CCID command/response timeout configuration
     chown system system /sys/module/ccid_bridge/parameters/bulk_msg_timeout
 
+    # Mark the copy complete flag to not completed
+    write /data/misc/radio/copy_complete 0
+    chown radio radio /data/misc/radio/copy_complete
+    chmod 0660 /data/misc/radio/copy_complete
+
 # msm specific files that need to be created on /data
 on post-fs-data
     # Create directory for TZ Apps
diff --git a/rootdir/etc/init.qcom.sh b/rootdir/etc/init.qcom.sh
index 04cd3d02..5c7de24f 100644
--- a/rootdir/etc/init.qcom.sh
+++ b/rootdir/etc/init.qcom.sh
@@ -247,3 +247,13 @@ case "$emmc_boot"
         fi
     ;;
 esac
+
+#
+# Make modem config folder and copy firmware config to that folder
+#
+rm -rf /data/misc/radio/modem_config
+mkdir /data/misc/radio/modem_config
+chmod 660 /data/misc/radio/modem_config
+cp -r /firmware/image/modem_pr/mcfg/configs/* /data/misc/radio/modem_config
+chown -hR radio.radio /data/misc/radio/modem_config
+echo 1 > /data/misc/radio/copy_complete