diff --git a/.cvsignore b/.cvsignore
index 7f256fa..031f5f9 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -30,3 +30,4 @@ cups-1.3.2-source.tar.bz2
 cups-1.3.3-source.tar.bz2
 cups-1.3.4-source.tar.bz2
 cups-1.3.5-source.tar.bz2
+cups-1.3.6-source.tar.bz2
diff --git a/cups-lspp.patch b/cups-lspp.patch
index 2d7edba..e699817 100644
--- a/cups-lspp.patch
+++ b/cups-lspp.patch
@@ -1297,7 +1297,7 @@
 +	    {
 +	      if (getfilecon(con->filename, &spoolcon) == -1)
 +	      {
-+		cupsdSendError(con, HTTP_SERVER_ERROR, AUTH_NONE);
++		cupsdSendError(con, HTTP_SERVER_ERROR, CUPSD_AUTH_NONE);
 +		return (cupsdCloseClient(con));
 +	      }
 +	      clicon = context_new(con->scon);
@@ -1305,7 +1305,7 @@
 +	      freecon(spoolcon);
 +	      if (!clicon || !tmpcon)
 +	      {
-+		cupsdSendError(con, HTTP_SERVER_ERROR, AUTH_NONE);
++		cupsdSendError(con, HTTP_SERVER_ERROR, CUPSD_AUTH_NONE);
 +		if (clicon)
 +		  context_free(clicon);
 +		if (tmpcon)
@@ -1320,7 +1320,7 @@
 +		{
 +		  if (context_range_set(tmpcon, cliclearance) == -1)
 +		  {
-+		    cupsdSendError(con, HTTP_SERVER_ERROR, AUTH_NONE);
++		    cupsdSendError(con, HTTP_SERVER_ERROR, CUPSD_AUTH_NONE);
 +		    free(clirange);
 +		    context_free(tmpcon);
 +		    context_free(clicon);
@@ -1331,7 +1331,7 @@
 +		{
 +		  if (context_range_set(tmpcon, (context_range_get(clicon))) == -1)
 +		  {
-+		    cupsdSendError(con, HTTP_SERVER_ERROR, AUTH_NONE);
++		    cupsdSendError(con, HTTP_SERVER_ERROR, CUPSD_AUTH_NONE);
 +		    free(clirange);
 +		    context_free(tmpcon);
 +		    context_free(clicon);
@@ -1342,7 +1342,7 @@
 +	      }
 +	      if (setfilecon(con->filename, context_str(tmpcon)) == -1)
 +	      {
-+		cupsdSendError(con, HTTP_SERVER_ERROR, AUTH_NONE);
++		cupsdSendError(con, HTTP_SERVER_ERROR, CUPSD_AUTH_NONE);
 +		context_free(tmpcon);
 +		context_free(clicon);
 +		return (cupsdCloseClient(con));
diff --git a/cups-str2650.patch b/cups-str2650.patch
deleted file mode 100644
index 695806c..0000000
--- a/cups-str2650.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -up cups-1.3.5/cups/adminutil.c.str2650 cups-1.3.5/cups/adminutil.c
---- cups-1.3.5/cups/adminutil.c.str2650	2007-11-30 07:00:59.000000000 +0000
-+++ cups-1.3.5/cups/adminutil.c	2008-01-09 12:14:45.000000000 +0000
-@@ -1057,7 +1057,7 @@ _cupsAdminGetServerSettings(
- 	in_admin_location = 0;
- 	in_location       = 0;
-       }
--      else if (!strcasecmp(line, "Allow") && in_admin_location &&
-+      else if (!strcasecmp(line, "Allow") &&
-                strcasecmp(value, "localhost") && strcasecmp(value, "127.0.0.1")
- #ifdef AF_LOCAL
- 	       && *value != '/'
-@@ -1067,9 +1067,9 @@ _cupsAdminGetServerSettings(
- #endif /* AF_INET6 */
- 	       )
-       {
--	remote_admin = 1;
--
--	if (!strcasecmp(value, "all"))
-+        if (in_admin_location)
-+	  remote_admin = 1;
-+        else if (!strcasecmp(value, "all"))
- 	  remote_any = 1;
-       }
-       else if (line[0] != '<' && !in_location && !in_policy)
diff --git a/cups-str2664.patch b/cups-str2664.patch
deleted file mode 100644
index 8ca7ee9..0000000
--- a/cups-str2664.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up cups-1.3.5/backend/runloop.c~ cups-1.3.5/backend/runloop.c
---- cups-1.3.5/backend/runloop.c~	2007-08-22 19:34:34.000000000 +0100
-+++ cups-1.3.5/backend/runloop.c	2008-01-09 15:37:44.000000000 +0000
-@@ -216,7 +216,7 @@ backendRunLoop(
-       FD_SET(CUPS_SC_FD, &input);
- 
-     FD_ZERO(&output);
--    if (print_bytes || !use_bc)
-+    if (print_bytes || (!use_bc && !side_cb))
-       FD_SET(device_fd, &output);
- 
-     if (use_bc || side_cb)
diff --git a/cups-str2703.patch b/cups-str2703.patch
deleted file mode 100644
index ed07607..0000000
--- a/cups-str2703.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -up cups-1.3.5/cgi-bin/admin.c.str2703 cups-1.3.5/cgi-bin/admin.c
---- cups-1.3.5/cgi-bin/admin.c.str2703	2007-11-30 07:00:59.000000000 +0000
-+++ cups-1.3.5/cgi-bin/admin.c	2008-02-12 16:31:37.000000000 +0000
-@@ -1373,13 +1373,16 @@ do_config_server(http_t *http)		/* I - H
-     */
- 
-     if (cgiGetVariable("KERBEROS"))
--      default_auth_type = "Negotiate";
-+      default_auth_type = strdup ("Negotiate");
-     else
-     {
--      default_auth_type = cupsGetOption("DefaultAuthType", num_settings,
--                                        settings);
-+      default_auth_type = strdup (cupsGetOption("DefaultAuthType", num_settings,
-+						settings));
-       if (!strcasecmp(default_auth_type, "Negotiate"))
--        default_auth_type = "Basic";
-+      {
-+	free (default_auth_type);
-+        default_auth_type = strdup ("Basic");
-+      }
-     }
- 
-     fprintf(stderr, "DEBUG: DefaultAuthType %s\n", default_auth_type);
-@@ -1429,6 +1432,7 @@ do_config_server(http_t *http)		/* I - H
- #ifdef HAVE_GSSAPI
-       num_settings = cupsAddOption("DefaultAuthType", default_auth_type,
-                                    num_settings, &settings);
-+      free (default_auth_type);
- #endif /* HAVE_GSSAPI */
- 
-       if (!cupsAdminSetServerSettings(http, num_settings, settings))
diff --git a/cups.spec b/cups.spec
index e5e4a64..6d7dfc1 100644
--- a/cups.spec
+++ b/cups.spec
@@ -5,8 +5,8 @@
 
 Summary: Common Unix Printing System
 Name: cups
-Version: 1.3.5
-Release: 3%{?dist}
+Version: 1.3.6
+Release: 1%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}-source.tar.bz2
@@ -41,13 +41,10 @@ Patch14: cups-lpr-help.patch
 Patch15: cups-undo-str2537.patch
 Patch16: cups-pid.patch
 Patch17: cups-foomatic-recommended.patch
-Patch18: cups-str2650.patch
 Patch19: cups-eggcups.patch
 Patch20: cups-getpass.patch
 Patch21: cups-driverd-timeout.patch
 Patch22: cups-strict-ppd-line-length.patch
-Patch23: cups-str2664.patch
-Patch24: cups-str2703.patch
 Patch25: cups-usb-paperout.patch
 Patch100: cups-lspp.patch
 Epoch: 1
@@ -156,13 +153,10 @@ lpd emulation.
 %patch15 -p1 -b .undo-str2537
 %patch16 -p1 -b .pid
 %patch17 -p1 -b .foomatic-recommended
-%patch18 -p1 -b .str2650
 %patch19 -p1 -b .eggcups
 %patch20 -p1 -b .getpass
 %patch21 -p1 -b .driverd-timeout
 %patch22 -p1 -b .strict-ppd-line-length
-%patch23 -p1 -b .str2664
-%patch24 -p1 -b .str2703
 %patch25 -p1 -b .usb-paperout
 
 %if %lspp
@@ -186,6 +180,7 @@ export CFLAGS="-DLDAP_DEPRECATED=1"
 	--enable-lspp \
 %endif
 	--with-log-file-perm=0600 --enable-pie --enable-relro \
+	--with-dbusdir=%{_sysconfdir}/dbus-1 \
 	localedir=%{_datadir}/locale
 
 # If we got this far, all prerequisite libraries must be here.
@@ -455,6 +450,9 @@ rm -rf $RPM_BUILD_ROOT
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Wed Feb 20 2008 Tim Waugh <twaugh@redhat.com> 1.3.6-1
+- 1.3.6.  No longer need str2650, str2664, or str2703 patches.
+
 * Tue Feb 12 2008 Tim Waugh <twaugh@redhat.com> 1.3.5-3
 - Fixed admin.cgi handling of DefaultAuthType (bug #432478, STR #2703).
 
diff --git a/sources b/sources
index 57f13e6..0be8b39 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 b0bb017098e8e76b8a25e666c41ce540  postscript.ppd.gz
-355705c528e9a8d0d439da15454d79a6  cups-1.3.5-source.tar.bz2
+642f9f6d879999bff1b51aeee57a3ce1  cups-1.3.6-source.tar.bz2