diff --git a/Added-Power11-support-for-diag_nvme.patch b/Added-Power11-support-for-diag_nvme.patch
new file mode 100644
index 0000000..10ff24c
--- /dev/null
+++ b/Added-Power11-support-for-diag_nvme.patch
@@ -0,0 +1,63 @@
+From 6bfa2ec7a7f424b018fd2e21a70e9d2f04041832 Mon Sep 17 00:00:00 2001
+From: Barnali Guha Thakurata <barnali@linux.ibm.com>
+Date: Tue, 22 Oct 2024 12:05:39 +0530
+Subject: [PATCH] Added Power11 support for diag_nvme
+
+Git-commit: 6bfa2ec7a7f424b018fd2e21a70e9d2f04041832
+
+Without Patch:
+# diag_nvme nvme0
+diag_nvme is only supported in PowerVM LPARs and at least Power10 processors
+
+With Patch:
+# diag_nvme nvme0
+Running diagnostics for nvme0
+
+NVMe diag command completed successfully
+
+Signed-off-by: Barnali Guha Thakurata <barnali@linux.ibm.com>
+Signed-off-by: Nilay Shroff <nilay@linux.ibm.com>
+Reviewed-by: Sathvika Vasireddy <sv@linux.ibm.com>
+Tested-by: Sathvika Vasireddy <sv@linux.ibm.com>
+---
+ common/platform.c | 3 +++
+ common/platform.h | 2 ++
+ 2 files changed, 5 insertions(+)
+
+diff --git a/common/platform.c b/common/platform.c
+index 1359adb82101..801b9247be2a 100644
+--- a/common/platform.c
++++ b/common/platform.c
+@@ -96,6 +96,9 @@ get_processor(void)
+ 	case PVR_POWER10:
+ 		rc = POWER10;
+ 		break;
++	case PVR_POWER11:
++		rc = POWER11;
++		break;
+ 	default:
+ 		rc = PROCESSOR_UNKNOWN;
+ 		break;
+diff --git a/common/platform.h b/common/platform.h
+index b265d1e0937b..ae3ea21d80ed 100644
+--- a/common/platform.h
++++ b/common/platform.h
+@@ -36,6 +36,7 @@
+ #define PVR_POWER8	0x004D
+ #define PVR_POWER9	0x004E
+ #define PVR_POWER10	0x0080
++#define PVR_POWER11	0x0082
+ 
+ enum {
+ 	PLATFORM_UNKNOWN = 0,
+@@ -56,6 +57,7 @@ enum {
+ 	POWER8,
+ 	POWER9,
+ 	POWER10,
++	POWER11,
+ };
+ 
+ extern const char *__platform_name[];
+-- 
+2.47.1
+
diff --git a/ppc64-diag.changes b/ppc64-diag.changes
index 2a32edf..2b6848a 100644
--- a/ppc64-diag.changes
+++ b/ppc64-diag.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Jan 21 14:09:50 UTC 2025 - Michal Suchanek <msuchanek@suse.de>
+
+- Add support for Power11 in diag_nvme (bsc#1234980 ltc#210823)
+  * Added-Power11-support-for-diag_nvme.patch
+
 -------------------------------------------------------------------
 Tue Sep 17 14:28:38 UTC 2024 - Michal Suchanek <msuchanek@suse.com>
 
diff --git a/ppc64-diag.spec b/ppc64-diag.spec
index 66815dd..7691ca3 100644
--- a/ppc64-diag.spec
+++ b/ppc64-diag.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package ppc64-diag
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -30,6 +30,8 @@ Source3:        ppc64-diag-nvme.service
 Source4:        ppc64-diag-nvme.timer
 #PATCH-FIX-OPENSUSE - ppc64-diag.varunused.patch - fix unused variables
 Patch1:         ppc64-diag.varunused.patch
+#PATCH-FIX-UPSTREAM - Added-Power11-support-for-diag_nvme.patch
+Patch2:         Added-Power11-support-for-diag_nvme.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  bison