diff --git a/.cvsignore b/.cvsignore
index 8f28fa0..76e711e 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-cups-1.1.20-source.tar.bz2
+cups-1.1.21rc1-source.tar.bz2
 postscript.ppd.gz
diff --git a/cups-1.1.16-system-auth.patch b/cups-1.1.16-system-auth.patch
index fa645f0..82d051a 100644
--- a/cups-1.1.16-system-auth.patch
+++ b/cups-1.1.16-system-auth.patch
@@ -1,22 +1,20 @@
-only in patch2:
---- cups-1.1.16/conf/cups.system-auth	1970-01-01 01:00:00.000000000 +0100
-+++ cups-1.1.16/conf/cups.system-auth	2002-11-20 12:44:44.000000000 +0000
+--- /dev/null	2004-02-23 21:02:56.000000000 +0000
++++ cups-1.1.21rc1/conf/cups.system-auth	2004-06-03 15:14:55.795385144 +0100
 @@ -0,0 +1,3 @@
 +#%PAM-1.0
 +auth	required	pam_stack.so service=system-auth
 +account	required	pam_stack.so service=system-auth
-only in patch2:
---- cups-1.1.16/conf/Makefile.system-auth	2002-11-20 12:45:05.000000000 +0000
-+++ cups-1.1.16/conf/Makefile	2002-11-20 12:47:23.000000000 +0000
+--- cups-1.1.21rc1/conf/Makefile.system-auth	2004-02-26 16:51:59.000000000 +0000
++++ cups-1.1.21rc1/conf/Makefile	2004-06-03 15:32:52.108540894 +0100
 @@ -67,7 +67,11 @@
  	done
  	-if test x$(PAMDIR) != x$(BUILDROOT); then \
  		$(INSTALL_DIR) $(PAMDIR); \
--		$(INSTALL_DATA) pam.conf $(PAMDIR)/cups; \
+-		$(INSTALL_DATA) $(PAMFILE) $(PAMDIR)/cups; \
 +		if test -f /etc/pam.d/system-auth; then \
 +		  $(INSTALL_DATA) cups.system-auth $(PAMDIR)/cups ; \
 +		else \
-+		  $(INSTALL_DATA) pam.conf $(PAMDIR)/cups; \
++		  $(INSTALL_DATA) $(PAMFILE) $(PAMDIR)/cups; \
 +		fi \
  	fi
  
diff --git a/cups.spec b/cups.spec
index 3aa4a5b..f91ef91 100644
--- a/cups.spec
+++ b/cups.spec
@@ -3,13 +3,14 @@
 %define use_dbus 1
 %define build_as_pie 1
 
+%define rc1 rc1
 Summary: Common Unix Printing System
 Name: cups
-Version: 1.1.20
-Release: 15
+Version: 1.1.21
+Release: 0.rc1.1
 License: GPL
 Group: System Environment/Daemons
-Source: ftp://ftp.easysw.com/pub/cups/cups-%{version}-source.tar.bz2
+Source: ftp://ftp.easysw.com/pub/cups/cups-%{version}%{rc1}-source.tar.bz2
 Source1: cups.init
 Source2: cupsprinter.png
 Source5: cups-lpd
@@ -33,10 +34,6 @@ Patch16: cups-pie.patch
 Patch17: cups-1.1.19-no_rpath.patch
 Patch18: cups-language.patch
 Patch19: cups-gcc34.patch
-Patch20: cups-str716.patch
-Patch21: cups-encryption.patch
-Patch22: cups-str718.patch
-Patch23: cups-authtype.patch
 Patch24: cups-maxlogsize.patch
 Patch25: cups-enabledisable.patch
 Patch26: cups-dbus.patch
@@ -91,7 +88,7 @@ The cups-libs package provides libraries used by applications to use CUPS
 natively, without needing the lp/lpr commands.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}%{rc1}
 %patch0 -p1 -b .noinit
 %patch1 -p1 -b .doclink
 %patch2 -p1 -b .system-auth
@@ -108,10 +105,6 @@ natively, without needing the lp/lpr commands.
 %patch17 -p1 -b .no_rpath
 %patch18 -p1 -b .language
 %patch19 -p1 -b .gcc34
-%patch20 -p1 -b .str716
-%patch21 -p1 -b .encryption
-%patch22 -p1 -b .str718
-%patch23 -p1 -b .authtype
 %patch24 -p1 -b .maxlogsize
 %patch25 -p1 -b .enabledisable
 %if %use_dbus
@@ -208,10 +201,6 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d
 install -c -m 644 %{SOURCE11} $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d/cups.conf
 %endif
 
-# Symlinks to avoid conflicting with bash builtins
-ln -s enable $RPM_BUILD_ROOT%{_bindir}/cupsenable
-ln -s disable $RPM_BUILD_ROOT%{_bindir}/cupsdisable
-
 # Remove unshipped files.
 rm -rf $RPM_BUILD_ROOT%{_mandir}/cat? $RPM_BUILD_ROOT%{_mandir}/*/cat?
 
@@ -331,6 +320,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/cups
 
 %changelog
+* Thu Jun  3 2004 Tim Waugh <twaugh@redhat.com> 1:1.1.21-0.rc1.1
+- 1.1.21rc1.
+- No longer need str716, str718, authtype or encryption patches.
+
 * Wed Jun  2 2004 Tim Waugh <twaugh@redhat.com> 1:1.1.20-15
 - Build on ppc and ppc64 again.
 
diff --git a/sources b/sources
index aa87709..581d6d0 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-09d0be2bad1b0617bc0eba6eef81f6e9  cups-1.1.20-source.tar.bz2
+3cf609727cbf8d8c097d16100be58a28  cups-1.1.21rc1-source.tar.bz2
 b0bb017098e8e76b8a25e666c41ce540  postscript.ppd.gz