diff --git a/BETA21-userpriv-fixups.patch b/BETA21-userpriv-fixups.patch
new file mode 100644
index 0000000..2936544
--- /dev/null
+++ b/BETA21-userpriv-fixups.patch
@@ -0,0 +1,32 @@
+Index: openvpn/tun.c
+===================================================================
+--- openvpn/tun.c	(revision 2677)
++++ openvpn/tun.c	(revision 2679)
+@@ -1221,17 +1221,20 @@
+   if (tt)
+     {
+ #ifdef CONFIG_FEATURE_IPROUTE
+-	char command_line[256];
+-	/*
+-	 * Flush IP configuration for the device
+-	 */
+-	openvpn_snprintf (command_line, sizeof (command_line),
++	if (tt->type != DEV_TYPE_NULL)
++	  {
++	    char command_line[256];
++	    /*
++	     * Flush IP configuration for the device
++	     */
++	    openvpn_snprintf (command_line, sizeof (command_line),
+ 			  "%s addr flush dev %s",
+ 			  iproute_path,
+ 			  tt->actual_name
+ 			  );
+-	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 flush failed");
++	  }
+ #endif
+       close_tun_generic (tt);
+       free (tt);
diff --git a/openvpn.spec b/openvpn.spec
index 8b007e5..e2902e9 100644
--- a/openvpn.spec
+++ b/openvpn.spec
@@ -15,6 +15,7 @@ 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)
@@ -49,6 +50,7 @@ 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.
@@ -168,6 +170,7 @@ fi
 - Update to 2.1_rc6
 - Pass paths to ifconfig, ip, and route to configure
 - BR iproute and Require iproute and net-tools
+- Add BETA21-userpriv-fixups.patch from Alon Bar-Lev
 
 * Wed Jan 23 2008 Steven Pritchard <steve@kspei.com> 2.1-0.21.rc5
 - Update to 2.1_rc5