diff --git a/s390-tools-sles15sp3-zkey-Fix-APQN-property-names.patch b/s390-tools-sles15sp3-zkey-Fix-APQN-property-names.patch
new file mode 100644
index 0000000..b2c523a
--- /dev/null
+++ b/s390-tools-sles15sp3-zkey-Fix-APQN-property-names.patch
@@ -0,0 +1,49 @@
+Subject: [PATCH] [BZ 189965] zkey: Fix APQN property names
+From: Ingo Franzki <ifranzki@linux.ibm.com>
+
+Description:   zkey: Fix KMS plugin configuration to store APQNs correctly.
+Symptom:       When a KMS plugin is configured with APQNs, the set of 
+               APQNs is stored per card type, i.e. the set of CCA APQNs and
+               the set of EP11 APQNs is stored separately in the KMS
+               plugin configuration file. Unfortunately, the names of the
+               configuration properties are swapped, so that CCA APQNs are
+               stored as EP11 APQNs, and vice versa.
+               This does not cause any malfunction as of today, however 
+               if this is fixed later, while a KMS plugin configuration
+               already exists, then the KMS plugin will fail to work once
+               the fix is applied. A KMS plugin reconfiguration would then
+               be needed to make the plugin work again.
+Problem:       The KMS configuration property names to store the CCA and
+               EP11 APQNs are incorrect, i.e. swapped.
+Solution:      Correct the KMS configuration property names.
+Reproduction:  Configure a KMS plugin with APQNs and check the KMS config
+               file.
+Upstream-ID:   07d181e29b484108bce5ea07c1561ffb62a1b56e
+Problem-ID:    189965
+
+Upstream-Description:
+
+              zkey: Fix APQN property names
+
+              Signed-off-by: Ingo Franzki <ifranzki@linux.ibm.com>
+              Signed-off-by: Jan Hoeppner <hoeppner@linux.ibm.com>
+
+
+Signed-off-by: Ingo Franzki <ifranzki@linux.ibm.com>
+---
+ zkey/kms.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/zkey/kms.c
++++ b/zkey/kms.c
+@@ -46,8 +46,8 @@
+ #define KMS_CONFIG_PROP_KMS		"kms"
+ #define KMS_CONFIG_PROP_KMS_CONFIG	"config"
+ #define KMS_CONFIG_PROP_APQNS		"apqns"
+-#define KMS_CONFIG_PROP_CCA_APQNS	"ep11_apqns"
+-#define KMS_CONFIG_PROP_EP11_APQNS	"cca_apqns"
++#define KMS_CONFIG_PROP_CCA_APQNS	"cca_apqns"
++#define KMS_CONFIG_PROP_EP11_APQNS	"ep11_apqns"
+ #define KMS_CONFIG_LOCAL		"local"
+ 
+ #define KMS_KEY_PROP_NAME		"zkey-name"
diff --git a/s390-tools.changes b/s390-tools.changes
index c598e43..a2291ef 100644
--- a/s390-tools.changes
+++ b/s390-tools.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Wed Feb 17 20:47:26 UTC 2021 - Mark Post <mpost@suse.com>
+
+- Added s390-tools-sles15sp3-zkey-Fix-APQN-property-names.patch
+  (bsc#1182113)
+  Problem:  The KMS configuration property names to store the CCA and
+            EP11 APQNs are incorrect, i.e. swapped.
+  Solution: Correct the KMS configuration property names.
+
 -------------------------------------------------------------------
 Thu Jan 28 21:23:35 UTC 2021 - Mark Post <mpost@suse.com>
 
diff --git a/s390-tools.spec b/s390-tools.spec
index df96452..d01c8d4 100644
--- a/s390-tools.spec
+++ b/s390-tools.spec
@@ -97,6 +97,7 @@ Patch7:         s390-tools-sles15sp3-01-genprotimg-abort-if-one-of-the-recursive
 Patch8:         s390-tools-sles15sp3-02-genprotimg-fix-two-memory-leaks.patch
 Patch9:         s390-tools-sles15sp3-03-genprotimg-require-argument-for-ramdisk-and-parmfile.patch
 Patch10:        s390-tools-sles15sp3-04-genprotimg-add-host-key-document-verification-suppor.patch
+Patch11:        s390-tools-sles15sp3-zkey-Fix-APQN-property-names.patch
 
 # SUSE patches
 Patch900:       s390-tools-sles12-zipl_boot_msg.patch