diff --git a/.cvsignore b/.cvsignore
index 76e711e..a421d8b 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-cups-1.1.21rc1-source.tar.bz2
+cups-1.1.21rc2-source.tar.bz2
 postscript.ppd.gz
diff --git a/cups-1.1.15-initscript.patch b/cups-1.1.15-initscript.patch
index 4edaf3a..1a4683c 100644
--- a/cups-1.1.15-initscript.patch
+++ b/cups-1.1.15-initscript.patch
@@ -1,16 +1,16 @@
---- cups-1.1.19rc4/systemv/Makefile.noinit	2002-12-20 19:39:48.000000000 +0000
-+++ cups-1.1.19rc4/systemv/Makefile	2003-05-08 15:37:32.000000000 +0100
-@@ -78,7 +78,7 @@
+--- cups-1.1.21rc2/systemv/Makefile.noinit	2004-08-11 15:10:22.000000000 +0100
++++ cups-1.1.21rc2/systemv/Makefile	2004-08-24 12:30:31.868411346 +0100
+@@ -77,7 +77,7 @@
+ 	$(INSTALL_BIN) lp $(BINDIR)
  	$(INSTALL_BIN) lpoptions $(BINDIR)
  	$(INSTALL_BIN) lpstat $(BINDIR)
- 	$(INSTALL_BIN) lppasswd $(BINDIR)
 -	-$(INSTALL_BIN) -m 4755 -o $(CUPS_USER) -g $(CUPS_GROUP) lppasswd $(BINDIR)
 +	-$(INSTALL_BIN) -m 4755 lppasswd $(BINDIR)
- 
- 
- #
---- cups-1.1.19rc4/Makefile.noinit	2003-03-06 16:36:00.000000000 +0000
-+++ cups-1.1.19rc4/Makefile	2003-05-08 15:39:38.000000000 +0100
+ 	if test ! -x $(BINDIR)/lppasswd; then \
+ 		chmod 755 $(BINDIR)/lppasswd; \
+ 	fi
+--- cups-1.1.21rc2/Makefile.noinit	2004-02-25 20:14:50.000000000 +0000
++++ cups-1.1.21rc2/Makefile	2004-08-24 12:28:17.704029413 +0100
 @@ -89,30 +89,6 @@
  	echo Installing cups-config script...
  	$(INSTALL_DIR) $(BINDIR)
@@ -42,8 +42,8 @@
  
  #
  # Install source and header files...
---- cups-1.1.19rc4/Makedefs.in.noinit	2003-04-17 15:20:47.000000000 +0100
-+++ cups-1.1.19rc4/Makedefs.in	2003-05-08 15:37:32.000000000 +0100
+--- cups-1.1.21rc2/Makedefs.in.noinit	2004-06-29 04:14:19.000000000 +0100
++++ cups-1.1.21rc2/Makedefs.in	2004-08-24 12:28:17.713027695 +0100
 @@ -47,7 +47,7 @@
  # Installation programs...
  #
diff --git a/cups.spec b/cups.spec
index d276807..29e51d7 100644
--- a/cups.spec
+++ b/cups.spec
@@ -3,14 +3,13 @@
 %define use_dbus 1
 %define build_as_pie 1
 
-%define rc1 rc1
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.1.21
-Release: 1.rc1.9
+Release: 1.rc2.1
 License: GPL
 Group: System Environment/Daemons
-Source: ftp://ftp.easysw.com/pub/cups/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
@@ -36,11 +35,10 @@ Patch18: cups-language.patch
 Patch19: cups-gcc34.patch
 Patch24: cups-maxlogsize.patch
 Patch25: cups-enabledisable.patch
-Patch26: cups-state.patch
-Patch27: cups-str743.patch
 Patch28: cups-no-propagate-ipp-port.patch
-Patch29: cups-1.1.21-reload-timeout.patch
-Patch30: cups-dbus.patch
+Patch30: cups-session-printing.patch
+Patch31: cups-overread.patch
+Patch32: cups-dbus.patch
 Epoch: 1
 Url: http://www.cups.org/
 BuildRoot: %{_tmppath}/%{name}-root
@@ -92,7 +90,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
@@ -111,12 +109,11 @@ natively, without needing the lp/lpr commands.
 %patch19 -p1 -b .gcc34
 %patch24 -p1 -b .maxlogsize
 %patch25 -p1 -b .enabledisable
-%patch26 -p1 -b .state
-%patch27 -p1 -b .str743
 %patch28 -p1 -b .no-propagate-ipp-port
-%patch29 -p1 -b .reload-timeout
+#%patch30 -p1 -b .session-printing
+%patch31 -p1 -b .overread
 %if %use_dbus
-%patch30 -p1 -b .dbus
+%patch32 -p1 -b .dbus
 %endif
 perl -pi -e 's,^#(Printcap\s+/etc/printcap),$1,' conf/cupsd.conf.in
 aclocal -I config-scripts
@@ -329,6 +326,19 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/cups
 
 %changelog
+* Tue Aug 24 2004 Tim Waugh <twaugh@redhat.com> 1:1.1.21-1.rc2.1
+- 1.1.21rc2.
+- No longer need state, reload-timeout or str743 patches.
+- httpnBase64 patch no longer applies; alternate method implemented
+  upstream.
+- Fix single byte overread in usersys.c (spotted by Colin Walters).
+
+* Wed Aug 18 2004 Tim Waugh <twaugh@redhat.com>
+- Applied httpnEncode64 patch from Colin Walters.
+
+* Sun Aug 15 2004 Tim Waugh <twaugh@redhat.com>
+- Session printing patch (Colin Walters).  Disabled for now.
+
 * Sun Aug 15 2004 Tim Waugh <twaugh@redhat.com> 1:1.1.21-1.rc1.9
 - Shorter reload timeout (Colin Walters).
 - Updated DBUS patch from Colin Walters.
diff --git a/sources b/sources
index 581d6d0..865cae9 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-3cf609727cbf8d8c097d16100be58a28  cups-1.1.21rc1-source.tar.bz2
+7532f7dc5ef7870bb49d65299f99906d  cups-1.1.21rc2-source.tar.bz2
 b0bb017098e8e76b8a25e666c41ce540  postscript.ppd.gz