diff --git a/WHENCE b/WHENCE
index 7f26034e..ed9ac486 100644
--- a/WHENCE
+++ b/WHENCE
@@ -5632,7 +5632,7 @@ Licence: Redistributable. See LICENSE.qcom and qcom/NOTICE.txt for details
 
 Binary files supplied originally from
 http://releases.linaro.org/96boards/dragonboard410c/qualcomm/firmware/linux-board-support-package-r1036.1.zip
-http://releases.linaro.org/96boards/dragonboard845c/qualcomm/firmware/RB3_firmware_20190529180356-v4.zip
+http://releases.linaro.org/96boards/dragonboard845c/qualcomm/firmware/RB3_firmware_20221121000000-v5.zip
 http://releases.linaro.org/96boards/rb5/qualcomm/firmware/RB5_firmware_20210331-v4.zip
 
 adsp.mbn has been converted from 20-adsp_split/firmware/adsp.* using
@@ -5646,13 +5646,14 @@ https://github.com/andersson/pil-squasher
 Driver: qcom_q6v5_mss - Qualcomm modem subsystem firmware
 
 File: qcom/sdm845/mba.mbn
-File: qcom/sdm845/modem.mbn
+File: qcom/sdm845/modem_nm.mbn
 File: qcom/sdm845/modemuw.jsn
+Link: qcom/sdm845/modem.mbn -> modem_nm.mbn
 
 Licence: Redistributable. See LICENSE.qcom and qcom/NOTICE.txt for details
 
 Binary files supplied originally from
-http://releases.linaro.org/96boards/dragonboard845c/qualcomm/firmware/RB3_firmware_20190529180356-v4.zip
+http://releases.linaro.org/96boards/dragonboard845c/qualcomm/firmware/RB3_firmware_20221121000000-v5.zip
 
 modem.mbn has been converted from 28-modem/modem.* using
 https://github.com/andersson/pil-squasher
diff --git a/qcom/a630_sqe.fw b/qcom/a630_sqe.fw
index 4e2937db..907445d9 100644
Binary files a/qcom/a630_sqe.fw and b/qcom/a630_sqe.fw differ
diff --git a/qcom/sdm845/a630_zap.mbn b/qcom/sdm845/a630_zap.mbn
index 9e6f2ade..399a81f7 100644
Binary files a/qcom/sdm845/a630_zap.mbn and b/qcom/sdm845/a630_zap.mbn differ
diff --git a/qcom/sdm845/adsp.mbn b/qcom/sdm845/adsp.mbn
index 271da7f7..339c0285 100644
Binary files a/qcom/sdm845/adsp.mbn and b/qcom/sdm845/adsp.mbn differ
diff --git a/qcom/sdm845/cdsp.mbn b/qcom/sdm845/cdsp.mbn
index a115cc8a..8158d622 100644
Binary files a/qcom/sdm845/cdsp.mbn and b/qcom/sdm845/cdsp.mbn differ
diff --git a/qcom/sdm845/mba.mbn b/qcom/sdm845/mba.mbn
index 18e5883e..b33324d3 100644
Binary files a/qcom/sdm845/mba.mbn and b/qcom/sdm845/mba.mbn differ
diff --git a/qcom/sdm845/modem.mbn b/qcom/sdm845/modem_nm.mbn
similarity index 73%
rename from qcom/sdm845/modem.mbn
rename to qcom/sdm845/modem_nm.mbn
index e172a46a..50539fec 100644
Binary files a/qcom/sdm845/modem.mbn and b/qcom/sdm845/modem_nm.mbn differ