diff --git a/cups-str3254.patch b/cups-str3254.patch
new file mode 100644
index 0000000..6ca2566
--- /dev/null
+++ b/cups-str3254.patch
@@ -0,0 +1,12 @@
+diff -up cups-1.4rc1/scheduler/ipp.c.str3254 cups-1.4rc1/scheduler/ipp.c
+--- cups-1.4rc1/scheduler/ipp.c.str3254	2009-07-15 11:11:32.346008322 +0100
++++ cups-1.4rc1/scheduler/ipp.c	2009-07-15 11:12:14.411132519 +0100
+@@ -11170,7 +11170,7 @@ url_encode_string(const char *s,	/* I - 
+ 
+   while (*s && bufptr < bufend)
+   {
+-    if (*s == ' ' || *s == '%')
++    if (*s == ' ' || *s == '%' || *s == '+')
+     {
+       if (bufptr >= (bufend - 2))
+ 	break;
diff --git a/cups.spec b/cups.spec
index 0214cde..c937e9f 100644
--- a/cups.spec
+++ b/cups.spec
@@ -54,7 +54,8 @@ Patch27: cups-str3244.patch
 Patch28: cups-str3258.patch
 Patch29: cups-str3259.patch
 Patch30: cups-uri-compat.patch
-Patch31: cups-avahi.patch
+Patch31: cups-str3254.patch
+Patch32: cups-avahi.patch
 Patch100: cups-lspp.patch
 Epoch: 1
 Url: http://www.cups.org/
@@ -206,7 +207,8 @@ module.
 %patch28 -p1 -b .str3258
 %patch29 -p1 -b .str3259
 %patch30 -p1 -b .uri-compat
-#%patch31 -p1 -b .avahi
+%patch31 -p1 -b .str3254
+#%patch32 -p1 -b .avahi
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -500,6 +502,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Wed Jul 15 2009 Tim Waugh <twaugh@redhat.com> 1:1.4-0.rc1.10
+- Correctly handle CUPS-Get-PPDs requests for models with '+' in their
+  names (STR #3254, bug #509586).
 - Accept incorrect device URIs in the (non-libusb) usb backend for
   compatibility with Fedora 11 before bug #507244 was fixed.
 - Applied patch to fix incorrect device URIs (STR #3259, bug #507244).