diff --git a/.cvsignore b/.cvsignore
index e4b3df4..a6b8b16 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-openvpn-2.1_rc6.tar.gz
-openvpn-2.1_rc6.tar.gz.asc
+openvpn-2.1_rc7.tar.gz
+openvpn-2.1_rc7.tar.gz.asc
diff --git a/BETA21-userpriv-fixups.patch b/BETA21-userpriv-fixups.patch
deleted file mode 100644
index 64cdab4..0000000
--- a/BETA21-userpriv-fixups.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Index: openvpn/tun.c
-===================================================================
---- openvpn/tun.c	(revision 2677)
-+++ openvpn/tun.c	(revision 2682)
-@@ -1221,17 +1221,24 @@
-   if (tt)
-     {
- #ifdef CONFIG_FEATURE_IPROUTE
--	char command_line[256];
--	/*
--	 * Flush IP configuration for the device
--	 */
--	openvpn_snprintf (command_line, sizeof (command_line),
--			  "%s addr flush dev %s",
-+	if (tt->type != DEV_TYPE_NULL && tt->did_ifconfig)
-+	  {
-+	    char command_line[256];
-+	    struct gc_arena gc = gc_new ();
-+
-+	    openvpn_snprintf (command_line, sizeof (command_line),
-+			  "%s addr del dev %s local %s peer %s",
- 			  iproute_path,
--			  tt->actual_name
-+			  tt->actual_name,
-+			  print_in_addr_t (tt->local, 0, &gc),
-+			  print_in_addr_t (tt->remote_netmask, 0, &gc)
- 			  );
--	msg (M_INFO, "%s", command_line);
--	system_check (command_line, NULL, S_FATAL, "Linux ip flush failed");
-+
-+	    msg (M_INFO, "%s", command_line);
-+	    system_check (command_line, NULL, S_FATAL, "Linux ip addr del failed");
-+
-+	    gc_free (&gc);
-+	  }
- #endif
-       close_tun_generic (tt);
-       free (tt);
diff --git a/openvpn.spec b/openvpn.spec
index a714209..3d3e8eb 100644
--- a/openvpn.spec
+++ b/openvpn.spec
@@ -1,21 +1,20 @@
-%define prerelease rc6
+%define prerelease rc7
 
 %define plugins down-root auth-pam
 
 Name:              openvpn
 Version:           2.1
-Release:           0.23%{?prerelease:.%{prerelease}}%{?dist}
+Release:           0.24%{?prerelease:.%{prerelease}}%{?dist}
 Summary:           A full-featured SSL VPN solution
 URL:               http://openvpn.net/
-#Source0:           http://openvpn.net/release/%{name}-%{version}%{?prerelease:_%{prerelease}}.tar.gz
-Source0:           http://openvpn.net/beta/%{name}-%{version}%{?prerelease:_%{prerelease}}.tar.gz
+Source0:           http://openvpn.net/release/%{name}-%{version}%{?prerelease:_%{prerelease}}.tar.gz
+#Source0:           http://openvpn.net/beta/%{name}-%{version}%{?prerelease:_%{prerelease}}.tar.gz
 Source1:           http://openvpn.net/signatures/%{name}-%{version}%{?prerelease:_%{prerelease}}.tar.gz.asc
 # Sample 2.0 config files
 Source2:           roadwarrior-server.conf
 Source3:           roadwarrior-client.conf
 # Don't start openvpn by default.
 Patch0:            openvpn-init.patch
-Patch1:            BETA21-userpriv-fixups.patch
 License:           GPL
 Group:             Applications/Internet
 BuildRoot:         %{_tmppath}/%{name}-%{version}-%{release}-%(id -un)
@@ -50,7 +49,6 @@ for compression.
 %prep
 %setup -q -n %{name}-%{version}%{?prerelease:_%{prerelease}}
 %patch0 -p0
-%patch1 -p1
 sed -i -e 's,%{_datadir}/openvpn/plugin,%{_libdir}/openvpn/plugin,' openvpn.8
 
 # %%doc items shouldn't be executable.
@@ -166,6 +164,10 @@ fi
 %config %dir %{_sysconfdir}/%{name}/
 
 %changelog
+* Tue Jan 29 2008 Steven Pritchard <steve@kspei.com> 2.1-0.24.rc7
+- Update to 2.1_rc7
+- Drop BETA21-userpriv-fixups.patch (upstream)
+
 * Fri Jan 25 2008 Steven Pritchard <steve@kspei.com> 2.1-0.23.rc6
 - Apply update to BETA21-userpriv-fixups.patch from Alon Bar-Lev
 
diff --git a/sources b/sources
index 5571d98..144bfcd 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-4c4965555242d138754765bfbc10990d  openvpn-2.1_rc6.tar.gz
-eaf5e55c7d6c1fab16f1e43df9b1d1bb  openvpn-2.1_rc6.tar.gz.asc
+38c8fdfaa3465d740049468bc7b66fcf  openvpn-2.1_rc7.tar.gz
+9ec429fee30701261a4a14c237d1fa7a  openvpn-2.1_rc7.tar.gz.asc