diff --git a/.cvsignore b/.cvsignore
index 1692364..92da8b3 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -2,3 +2,4 @@ cups-1.1.21rc2-source.tar.bz2
 postscript.ppd.gz
 cups-1.1.21-source.tar.bz2
 cups-1.1.22rc1-source.tar.bz2
+cups-1.1.22rc2-source.tar.bz2
diff --git a/cups.spec b/cups.spec
index 25b4f0d..1a741a1 100644
--- a/cups.spec
+++ b/cups.spec
@@ -6,10 +6,10 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.1.22
-Release: 0.rc1.8
+Release: 0.rc2.1
 License: GPL
 Group: System Environment/Daemons
-Source: ftp://ftp.easysw.com/pub/cups/test/cups-%{version}rc1-source.tar.bz2
+Source: ftp://ftp.easysw.com/pub/cups/test/cups-%{version}rc2-source.tar.bz2
 Source1: cups.init
 Source2: cupsprinter.png
 Source5: cups-lpd
@@ -42,8 +42,7 @@ Patch30: cups-session-printing.patch
 Patch31: cups-overread.patch
 Patch32: cups-pid.patch
 Patch33: cups-str970.patch
-Patch34: cups-135378.patch
-Patch35: cups-dbus.patch
+Patch34: cups-dbus.patch
 Epoch: 1
 Url: http://www.cups.org/
 BuildRoot: %{_tmppath}/%{name}-root
@@ -95,7 +94,7 @@ The cups-libs package provides libraries used by applications to use CUPS
 natively, without needing the lp/lpr commands.
 
 %prep
-%setup -q -n %{name}-%{version}rc1
+%setup -q -n %{name}-%{version}rc2
 %patch0 -p1 -b .noinit
 %patch1 -p1 -b .doclink
 %patch2 -p1 -b .system-auth
@@ -121,9 +120,8 @@ natively, without needing the lp/lpr commands.
 %patch31 -p1 -b .overread
 %patch32 -p1 -b .pid
 %patch33 -p1 -b .str970
-%patch34 -p1 -b .135378
 %if %use_dbus
-%patch35 -p1 -b .dbus
+%patch34 -p1 -b .dbus
 %endif
 perl -pi -e 's,^#(Printcap\s+/etc/printcap),$1,' conf/cupsd.conf.in
 aclocal -I config-scripts
@@ -345,8 +343,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/cups
 
 %changelog
-* Tue Oct 26 2004 Tim Waugh <twaugh@redhat.com> 1:1.1.22-0.rc1.8
-- Apply patch to fix CAN-2004-0888 (bug #135378).
+* Tue Oct 26 2004 Tim Waugh <twaugh@redhat.com> 1:1.1.22-0.rc2.1
+- 1.1.22rc2.
 
 * Wed Oct 20 2004 Tim Waugh <twaugh@redhat.com> 1:1.1.22-0.rc1.7
 - Prevent filters generating incorrect PS in locales where "," is the
diff --git a/sources b/sources
index 522afc5..99ab614 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 b0bb017098e8e76b8a25e666c41ce540  postscript.ppd.gz
-05a382527b3e1198504b217362ededaa  cups-1.1.22rc1-source.tar.bz2
+8b9a7818b016914d32ba015204ff7311  cups-1.1.22rc2-source.tar.bz2