diff --git a/cups-str2650.patch b/cups-str2650.patch
new file mode 100644
index 0000000..695806c
--- /dev/null
+++ b/cups-str2650.patch
@@ -0,0 +1,25 @@
+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.spec b/cups.spec
index a2972a8..9905ed4 100644
--- a/cups.spec
+++ b/cups.spec
@@ -40,6 +40,7 @@ Patch13: cups-direct-usb.patch
 Patch14: cups-lpr-help.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
@@ -150,6 +151,7 @@ lpd emulation.
 %patch14 -p1 -b .lpr-help
 %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
@@ -445,6 +447,9 @@ rm -rf $RPM_BUILD_ROOT
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Wed Jan  9 2008 Tim Waugh <twaugh@redhat.com>
+- Applied upstream patch to fix cupsctl --remote-any (bug #421411, STR #2650).
+
 * Thu Jan  3 2008 Tim Waugh <twaugh@redhat.com>
 - Efficiency fix for pstoraster (bug #416871).