diff --git a/cups-str3197.patch b/cups-str3197.patch
new file mode 100644
index 0000000..72cb6bf
--- /dev/null
+++ b/cups-str3197.patch
@@ -0,0 +1,13 @@
+diff -up cups-1.4b2-svn8404/cups/ipp.c.str3197 cups-1.4b2-svn8404/cups/ipp.c
+--- cups-1.4b2-svn8404/cups/ipp.c.str3197	2009-02-17 17:45:27.000000000 +0000
++++ cups-1.4b2-svn8404/cups/ipp.c	2009-05-14 16:08:22.329366931 +0100
+@@ -1431,7 +1431,8 @@ ippReadIO(void       *src,		/* I - Data 
+ 	    case IPP_TAG_NOTSETTABLE :
+ 	    case IPP_TAG_DELETEATTR :
+ 	    case IPP_TAG_ADMINDEFINE :
+-	        if (attr->value_tag == IPP_TAG_NOVALUE)
++	        if (attr->value_tag == IPP_TAG_NOVALUE ||
++		    attr->value_tag == IPP_TAG_DELETEATTR)
+ 		{
+ 		  if (n == 0)
+ 		    break;
diff --git a/cups.spec b/cups.spec
index 119c617..12e4eb6 100644
--- a/cups.spec
+++ b/cups.spec
@@ -8,7 +8,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4
-Release: 0.%{pre}.16%{?dist}
+Release: 0.%{pre}.17%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}%{?pre}%{?svn}-source.tar.bz2
@@ -51,6 +51,7 @@ Patch26: cups-avahi.patch
 Patch27: cups-missing-devices.patch
 Patch28: cups-CVE-2009-0163.patch
 Patch29: cups-CVE-2009-0164.patch
+Patch30: cups-str3197.patch
 Patch100: cups-lspp.patch
 Epoch: 1
 Url: http://www.cups.org/
@@ -196,6 +197,7 @@ module.
 %patch27 -p1 -b .missing-devices
 %patch28 -p1 -b .CVE-2009-0163
 %patch29 -p1 -b .CVE-2009-0164
+%patch30 -p1 -b .str3197
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -478,6 +480,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/php/modules/*.so
 
 %changelog
+* Thu May 14 2009 Tim Waugh <twaugh@redhat.com> 1:1.4-0.b2.17
+- Prevent cupsd crash when handling IPP_TAG_DELETEATTR requests
+  (STR #3197, bug #500859).
+
 * Thu May  7 2009 Ville Skyttä <ville.skytta at iki.fi> - 1:1.4-0.b2.16
 - Avoid stripping binaries before rpmbuild creates the -debuginfo subpackage.