diff --git a/meta/recipes-bsp/opensbi/opensbi_1.5.1.bb b/meta/recipes-bsp/opensbi/opensbi_1.6.bb
similarity index 91%
rename from meta/recipes-bsp/opensbi/opensbi_1.5.1.bb
rename to meta/recipes-bsp/opensbi/opensbi_1.6.bb
index 652b81182b..3c16656b39 100644
--- a/meta/recipes-bsp/opensbi/opensbi_1.5.1.bb
+++ b/meta/recipes-bsp/opensbi/opensbi_1.6.bb
@@ -8,11 +8,13 @@ require opensbi-payloads.inc
 
 inherit autotools-brokensep deploy
 
-SRCREV = "43cace6c3671e5172d0df0a8963e552bb04b7b20"
-SRC_URI = "git://github.com/riscv/opensbi.git;branch=release-1.5.x;protocol=https"
+SRCREV = "bd613dd92113f683052acfb23d9dc8ba60029e0a"
+SRC_URI = "git://github.com/riscv/opensbi.git;branch=master;protocol=https"
 
 S = "${WORKDIR}/git"
 
+TARGET_DBGSRC_DIR = "/share/opensbi/*/generic/firmware/"
+
 TARGET_CC_ARCH += "${LDFLAGS}"
 
 RISCV_SBI_FW_TEXT_START ??= "0x80000000"
@@ -45,4 +47,3 @@ FILES:${PN} += "/share/opensbi/*/${RISCV_SBI_PLAT}/firmware/fw_payload.*"
 FILES:${PN} += "/share/opensbi/*/${RISCV_SBI_PLAT}/firmware/fw_dynamic.*"
 
 COMPATIBLE_HOST = "(riscv64|riscv32).*"
-INHIBIT_PACKAGE_STRIP = "1"