diff --git a/cups.changes b/cups.changes
index f976ac5..0c99de3 100644
--- a/cups.changes
+++ b/cups.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Wed Apr 18 13:44:46 CEST 2018 - jsmeix@suse.de
+
+- issue5296_fix_policy_limits_using_All.patch fixes
+  https://github.com/apple/cups/issues/5296
+  by only the actually relevant part of
+  https://github.com/apple/cups/commit/0873f681e43c04972b3d6bc90bdbdedb29e6e913
+  (follow-up of boo#936309 and bsc#577936 starting at comment 13)
+
 -------------------------------------------------------------------
 Wed Mar 28 13:58:32 CEST 2018 - jsmeix@suse.de
 
diff --git a/cups.spec b/cups.spec
index 2d68fbb..96947c0 100644
--- a/cups.spec
+++ b/cups.spec
@@ -47,6 +47,10 @@ Source106:      Postscript-level2.ppd.gz
 Source108:      cups-client.conf
 Source109:      baselibs.conf
 # Patch0...Patch9 is for patches from upstream:
+# Patch1 fixes CUPS upstream isssue https://github.com/apple/cups/issues/5296
+# by only the actually relevant part of CUPS upstream commit
+# https://github.com/apple/cups/commit/0873f681e43c04972b3d6bc90bdbdedb29e6e913
+Patch1:         issue5296_fix_policy_limits_using_All.patch
 # Source10...Source99 is for sources from SUSE which are intended for upstream:
 # Patch10...Patch99 is for patches from SUSE which are intended for upstream:
 # Patch10 cups-2.1.0-choose-uri-template.patch adds 'smb://...' URIs to templates/choose-uri.tmpl:
@@ -296,6 +300,10 @@ printer drivers for CUPS.
 %prep
 %setup -q
 # Patch0...Patch9 is for patches from upstream:
+# Patch1 fixes CUPS upstream isssue https://github.com/apple/cups/issues/5296
+# by only the actually relevant part of CUPS upstream commit
+# https://github.com/apple/cups/commit/0873f681e43c04972b3d6bc90bdbdedb29e6e913
+%patch1 -b issue5296_fix_policy_limits_using_All.orig
 # Patch10...Patch99 is for patches from SUSE which are intended for upstream:
 # Patch10 cups-2.1.0-choose-uri-template.patch adds 'smb://...' URIs to templates/choose-uri.tmpl:
 %patch10 -b choose-uri-template.orig
diff --git a/issue5296_fix_policy_limits_using_All.patch b/issue5296_fix_policy_limits_using_All.patch
new file mode 100644
index 0000000..5325863
--- /dev/null
+++ b/issue5296_fix_policy_limits_using_All.patch
@@ -0,0 +1,11 @@
+--- scheduler/conf.c.orig	2018-03-23 21:39:17.000000000 +0100
++++ scheduler/conf.c	2018-04-18 13:38:45.000000000 +0200
+@@ -3853,7 +3853,7 @@ read_policy(cups_file_t *fp,		/* I - Con
+         if (num_ops < (int)(sizeof(ops) / sizeof(ops[0])))
+ 	{
+ 	  if (!_cups_strcasecmp(value, "All"))
+-	    ops[num_ops] = IPP_ANY_OPERATION;
++	    ops[num_ops ++] = IPP_ANY_OPERATION;
+ 	  else if ((ops[num_ops] = ippOpValue(value)) == IPP_BAD_OPERATION)
+ 	    cupsdLogMessage(CUPSD_LOG_ERROR,
+ 	                    "Bad IPP operation name \"%s\" on line %d of %s.",