diff --git a/openvpn-init.patch b/openvpn-init.patch
index c9f9299..bcf00a0 100644
--- a/openvpn-init.patch
+++ b/openvpn-init.patch
@@ -1,6 +1,6 @@
---- sample-scripts/openvpn.init.orig	2004-12-16 11:52:16.351973000 -0600
-+++ sample-scripts/openvpn.init	2004-12-16 12:26:42.782827808 -0600
-@@ -3,12 +3,13 @@
+--- sample-scripts/openvpn.init.orig	2005-06-27 19:50:53.000000000 -0500
++++ sample-scripts/openvpn.init	2005-06-27 19:53:54.000000000 -0500
+@@ -3,12 +3,14 @@
  # openvpn       This shell script takes care of starting and stopping
  #               openvpn on RedHat or other chkconfig-based system.
  #
@@ -11,6 +11,7 @@
 -#              uses all of the encryption, authentication, and certification features
 -#              of the OpenSSL library to securely tunnel IP networks over a single
 -#              UDP port.
++# processname: openvpn
 +# description: OpenVPN is a robust and highly flexible tunneling \
 +#              application that uses all of the encryption, \
 +#              authentication, and certification features of the OpenSSL \
diff --git a/openvpn.spec b/openvpn.spec
index bebc46f..452e863 100644
--- a/openvpn.spec
+++ b/openvpn.spec
@@ -2,10 +2,9 @@
 
 Name:              openvpn
 Version:           2.0
-Release:           1%{?dist}
+Release:           2%{?dist}
 Summary:           A full-featured SSL VPN solution
 URL:               http://openvpn.net/
-#Source0:           http://dl.sourceforge.net/sourceforge/openvpn/%{name}-%{version}.tar.gz
 Source0:           http://openvpn.net/release/%{name}-%{version}.tar.gz
 Source1:           http://openvpn.net/signatures/%{name}-%{version}.tar.gz.asc
 # Sample 2.0 config files
@@ -19,9 +18,8 @@ BuildRoot:         %{_tmppath}/%{name}-%{version}-%{release}-%(id -un)
 BuildRequires:     lzo-devel
 BuildRequires:     openssl-devel
 BuildRequires:     pam-devel
-# This won't work with udev
-#Requires:          /dev/net/tun
-# This will work with RH9+ dev or udev
+# We need /dev/net/tun.
+# This will work with RH9+ dev or udev.
 Requires:          dev >= 0:3.3.2-5
 Requires(pre):     /usr/sbin/useradd
 Requires(post):    /sbin/chkconfig
@@ -42,6 +40,7 @@ for compression.
 %prep
 %setup -q -n %{name}-%{version}%{?prever:_%{prever}}
 %patch0 -p0
+sed -i -e 's,%{_datadir}/openvpn/plugin,%{_libdir}/openvpn/plugin,' openvpn.8
 
 %build
 #  --enable-pthread        Enable pthread support (Experimental for OpenVPN 2.0)
@@ -78,12 +77,13 @@ install -d -m 0755 $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
 cp -pR contrib easy-rsa sample-{config-file,key,script}s \
     $RPM_BUILD_ROOT%{_datadir}/%{name}
+rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/easy-rsa/Windows
 cp %{SOURCE2} %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/%{name}/sample-config-files/
 
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/plugin/lib
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}/plugin/lib
 for plugin in %{plugins} ; do
     install -m 0755 plugin/$plugin/openvpn-$plugin.so \
-        $RPM_BUILD_ROOT%{_datadir}/%{name}/plugin/lib/openvpn-$plugin.so
+        $RPM_BUILD_ROOT%{_libdir}/%{name}/plugin/lib/openvpn-$plugin.so
     cp plugin/$plugin/README plugin/$plugin.txt
 done
 
@@ -117,10 +117,17 @@ fi
 %{_mandir}/man8/%{name}.8*
 %{_sbindir}/%{name}
 %{_datadir}/%{name}/
+%{_libdir}/%{name}/
 %config %{_initrddir}/%{name}
 %config %dir %{_sysconfdir}/%{name}/
 
 %changelog
+* Mon Jun 27 2005 Steven Pritchard <steve@kspei.com> 2.0-2
+- Move the plugin directory to _libdir
+- Drop the easy-rsa/Windows directory
+- Comment cleanups
+- Add "processname" header to init script
+
 * Sat Jun 25 2005 Steven Pritchard <steve@kspei.com> 2.0-1
 - Update to 2.0 final
 - Drop Epoch: 0 and rebuild for Fedora Extras