diff --git a/.cvsignore b/.cvsignore
index c02dcab..b1bf94f 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-openvpn-2.1_beta15.tar.gz
-openvpn-2.1_beta15.tar.gz.asc
+openvpn-2.1_beta16.tar.gz
+openvpn-2.1_beta16.tar.gz.asc
diff --git a/openvpn.spec b/openvpn.spec
index d721310..d763104 100644
--- a/openvpn.spec
+++ b/openvpn.spec
@@ -1,10 +1,10 @@
-%define prerelease beta15
+%define prerelease beta16
 
 %define plugins down-root auth-pam
 
 Name:              openvpn
 Version:           2.1
-Release:           0.13%{?prerelease:.%{prerelease}}%{?dist}
+Release:           0.14%{?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
@@ -15,8 +15,6 @@ Source2:           roadwarrior-server.conf
 Source3:           roadwarrior-client.conf
 # Don't start openvpn by default.
 Patch0:            openvpn-init.patch
-# Avoid test hang (from Paul Howarth).
-Patch1:            openvpn-2.1_beta15-test-timeout.patch
 License:           GPL
 Group:             Applications/Internet
 BuildRoot:         %{_tmppath}/%{name}-%{version}-%{release}-%(id -un)
@@ -45,7 +43,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.
@@ -135,6 +132,10 @@ fi
 %config %dir %{_sysconfdir}/%{name}/
 
 %changelog
+* 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)
+
 * Tue Sep 12 2006 Steven Pritchard <steve@kspei.com> 2.1-0.13.beta15
 - Update to 2.1_beta15
 - Add openvpn-2.1_beta15-test-timeout.patch to avoid test hang
diff --git a/sources b/sources
index 93e8b2a..249f633 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-2ddc1878c99ea3a9b348275338f7d502  openvpn-2.1_beta15.tar.gz
-7e62c63fb8205613ac8b99a4c788d576  openvpn-2.1_beta15.tar.gz.asc
+3a53f55dafcfa4aab9e408e36326e236  openvpn-2.1_beta16.tar.gz
+4529dc8c27ea67783b333dc586a909ef  openvpn-2.1_beta16.tar.gz.asc