diff --git a/cups-str2600.patch b/cups-str2600.patch
new file mode 100644
index 0000000..e9b030b
--- /dev/null
+++ b/cups-str2600.patch
@@ -0,0 +1,13 @@
+diff -up cups-1.3.4/scheduler/ipp.c.str2600 cups-1.3.4/scheduler/ipp.c
+--- cups-1.3.4/scheduler/ipp.c.str2600	2007-11-20 12:24:33.000000000 +0000
++++ cups-1.3.4/scheduler/ipp.c	2007-11-20 12:24:35.000000000 +0000
+@@ -1280,7 +1280,8 @@ add_job(cupsd_client_t  *con,		/* I - Cl
+ 
+   cupsdLogMessage(CUPSD_LOG_DEBUG2, "add_job(%p[%d], %p(%s), %p(%s/%s))",
+                   con, con->http.fd, printer, printer->name,
+-		  filetype, filetype->super, filetype->type);
++		  filetype, filetype ? filetype->super : "?",
++		  filetype ? filetype->type : "?");
+ 
+  /*
+   * Check remote printing to non-shared printer...
diff --git a/cups.spec b/cups.spec
index df495b8..5e086c7 100644
--- a/cups.spec
+++ b/cups.spec
@@ -6,7 +6,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.3.4
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}-source.tar.bz2
@@ -41,6 +41,7 @@ Patch14: cups-lpr-help.patch
 Patch15: cups-undo-str2537.patch
 Patch16: cups-pid.patch
 Patch17: cups-foomatic-recommended.patch
+Patch18: cups-str2600.patch
 Patch19: cups-eggcups.patch
 Patch20: cups-getpass.patch
 Patch21: cups-driverd-timeout.patch
@@ -154,6 +155,7 @@ lpd emulation.
 %patch15 -p1 -b .undo-str2537
 %patch16 -p1 -b .pid
 %patch17 -p1 -b .foomatic-recommended
+%patch18 -p1 -b .str2600
 %patch19 -p1 -b .eggcups
 %patch20 -p1 -b .getpass
 %patch21 -p1 -b .driverd-timeout
@@ -451,6 +453,10 @@ rm -rf $RPM_BUILD_ROOT
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Tue Nov 20 2007 Tim Waugh <twaugh@redhat.com> 1:1.3.4-4
+- Added fix for STR #2600 in which cupsd can crash from a NULL dereference
+  with LogLevel debug2 (bug #385631).
+
 * Mon Nov 12 2007 Tim Waugh <twaugh@redhat.com> 1:1.3.4-3
 - Fixed CVE-2007-4045 patch; has no effect with shipped packages since they
   are linked with gnutls.