diff --git a/.cvsignore b/.cvsignore
index b1bf94f..9b979c5 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-openvpn-2.1_beta16.tar.gz
-openvpn-2.1_beta16.tar.gz.asc
+openvpn-2.1_rc2.tar.gz
+openvpn-2.1_rc2.tar.gz.asc
diff --git a/openvpn-2.1_beta15-test-timeout.patch b/openvpn-2.1_beta15-test-timeout.patch
deleted file mode 100644
index 52a7eaa..0000000
--- a/openvpn-2.1_beta15-test-timeout.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- openvpn-2.1_beta15/sample-config-files/loopback-client	2006-09-12 18:21:43.000000000 +0100
-+++ openvpn-2.1_beta15/sample-config-files/loopback-client	2006-09-12 18:22:40.000000000 +0100
-@@ -22,4 +22,4 @@
- cert sample-keys/client.crt
- cipher DES-EDE3-CBC
- ping 1
--inactive 120
-+inactive 120 10000000
---- openvpn-2.1_beta15/sample-config-files/loopback-server	2006-09-12 18:21:50.000000000 +0100
-+++ openvpn-2.1_beta15/sample-config-files/loopback-server	2006-09-12 18:22:51.000000000 +0100
-@@ -23,4 +23,4 @@
- cert sample-keys/server.crt
- cipher DES-EDE3-CBC
- ping 1
--inactive 120
-+inactive 120 10000000
diff --git a/openvpn.spec b/openvpn.spec
index d763104..2e92216 100644
--- a/openvpn.spec
+++ b/openvpn.spec
@@ -1,10 +1,10 @@
-%define prerelease beta16
+%define prerelease rc2
 
 %define plugins down-root auth-pam
 
 Name:              openvpn
 Version:           2.1
-Release:           0.14%{?prerelease:.%{prerelease}}%{?dist}
+Release:           0.17%{?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
@@ -67,11 +67,28 @@ done
 ./openvpn --genkey --secret key
 ./openvpn --test-crypto --secret key
 
+# Randomize ports for tests to avoid conflicts on the build servers.
+cport=$[ 50000 + ($RANDOM % 15534) ]
+sport=$[ $cport + 1 ]
+sed -e 's/^\(rport\) .*$/\1 '$sport'/' \
+    -e 's/^\(lport\) .*$/\1 '$cport'/' \
+    < sample-config-files/loopback-client \
+    > %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u})-loopback-client
+sed -e 's/^\(rport\) .*$/\1 '$cport'/' \
+    -e 's/^\(lport\) .*$/\1 '$sport'/' \
+    < sample-config-files/loopback-server \
+    > %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u})-loopback-server
+
 # Test SSL/TLS negotiations (runs for 2 minutes):
-./openvpn --config sample-config-files/loopback-client &
-./openvpn --config sample-config-files/loopback-server
+./openvpn --config \
+    %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u})-loopback-client &
+./openvpn --config \
+    %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u})-loopback-server
 wait
 
+rm -f %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u})-loopback-client \
+    %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u})-loopback-server
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -132,6 +149,15 @@ fi
 %config %dir %{_sysconfdir}/%{name}/
 
 %changelog
+* Fri Mar 02 2007 Steven Pritchard <steve@kspei.com> 2.1-0.17.rc2
+- Update to 2.1_rc2
+
+* Tue Feb 27 2007 Steven Pritchard <steve@kspei.com> 2.1-0.16.rc1
+- Randomize ports for tests to avoid conflicts on the build servers
+
+* Tue Feb 27 2007 Steven Pritchard <steve@kspei.com> 2.1-0.15.rc1
+- Update to 2.1_rc1
+
 * Mon Oct 02 2006 Steven Pritchard <steve@kspei.com> 2.1-0.14.beta16
 - Update to 2.1_beta16
 - Drop Paul's patch (in upstream)
diff --git a/sources b/sources
index 249f633..95828a0 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-3a53f55dafcfa4aab9e408e36326e236  openvpn-2.1_beta16.tar.gz
-4529dc8c27ea67783b333dc586a909ef  openvpn-2.1_beta16.tar.gz.asc
+853c81d2de51d85b5381d4c7f7f074e3  openvpn-2.1_rc2.tar.gz
+4b4319498804b4365fd5c1d3a02e4f3f  openvpn-2.1_rc2.tar.gz.asc