diff --git a/recipes-phosphor/configuration/entity-manager/0001-fru-device-Increase-Fru-scan-timeout-to-30-seconds.patch b/recipes-phosphor/configuration/entity-manager/0001-fru-device-Increase-Fru-scan-timeout-to-30-seconds.patch
new file mode 100644
index 0000000..25a7895
--- /dev/null
+++ b/recipes-phosphor/configuration/entity-manager/0001-fru-device-Increase-Fru-scan-timeout-to-30-seconds.patch
@@ -0,0 +1,39 @@
+From 70e21738e9c3f7c0bc2915257c98f1877bf8024b Mon Sep 17 00:00:00 2001
+From: Jinliang Wang <jinliangw@google.com>
+Date: Fri, 25 Aug 2023 13:29:19 -0700
+Subject: [PATCH] fru-device: Increase Fru scan timeout to 30 seconds
+
+We need more time to drain the MCTP packet queue for i2c bus which
+has MCTP device during warm-reboot.
+
+Tested:
+warm-rebot host for over 10 times without missing FRU device
+b/295395609#comment13
+
+Patch Tracking Bug: b/297571697
+Upstream info / review: N/A
+Upstream-Status: Pending
+Justification:
+
+Change-Id: I907d9526f1aa1524ac0deb89d321a423353e02e0
+Signed-off-by: Jinliang Wang <jinliangw@google.com>
+---
+ src/fru_device.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/fru_device.cpp b/src/fru_device.cpp
+index 94c0cde..d6bf882 100644
+--- a/src/fru_device.cpp
++++ b/src/fru_device.cpp
+@@ -63,7 +63,7 @@ namespace fs = std::filesystem;
+ static constexpr bool debug = false;
+ constexpr size_t maxFruSize = 512;
+ constexpr size_t maxEepromPageIndex = 255;
+-constexpr size_t busTimeoutSeconds = 10;
++constexpr size_t busTimeoutSeconds = 30;
+ 
+ constexpr const char* blocklistPath = PACKAGE_DIR "blacklist.json";
+ 
+-- 
+2.43.0.rc2.451.g8631bc7472-goog
+