diff --git a/openvpn-2.1.1-init.patch b/openvpn-2.1.1-init.patch
new file mode 100644
index 0000000..598a009
--- /dev/null
+++ b/openvpn-2.1.1-init.patch
@@ -0,0 +1,5 @@
+--- sample-scripts/openvpn.init~	2010-01-04 08:30:35.000000000 -0600
++++ sample-scripts/openvpn.init	2010-01-04 15:53:29.503900367 -0600
+@@ -153 +153 @@
+-		. $bn.sh
++		. ./$bn.sh
diff --git a/openvpn-2.1.1-initinfo.patch b/openvpn-2.1.1-initinfo.patch
new file mode 100644
index 0000000..19a382d
--- /dev/null
+++ b/openvpn-2.1.1-initinfo.patch
@@ -0,0 +1,16 @@
+--- sample-scripts/openvpn.init~	2010-01-04 16:52:25.000000000 -0600
++++ sample-scripts/openvpn.init	2010-01-05 05:48:24.043085950 -0600
+@@ -15,0 +16,13 @@
++### BEGIN INIT INFO
++# Provides: openvpn
++# Required-Start: $network
++# Required-Stop: $network
++# Short-Description: start and stop openvpn
++# Description: OpenVPN is a robust and highly flexible tunneling \
++#              application that uses all of the encryption, \
++#              authentication, and certification features of the OpenSSL \
++#              library to securely tunnel IP networks over a single UDP \
++#              port.
++### END INIT INFO
++
++
diff --git a/openvpn.spec b/openvpn.spec
index 9185e14..3bfc63b 100644
--- a/openvpn.spec
+++ b/openvpn.spec
@@ -4,7 +4,7 @@
 
 Name:              openvpn
 Version:           2.1.1
-Release:           1%{?prerelease:.%{prerelease}}%{?dist}
+Release:           2%{?prerelease:.%{prerelease}}%{?dist}
 Summary:           A full-featured SSL VPN solution
 URL:               http://openvpn.net/
 #Source0:           http://openvpn.net/beta/%{name}-%{version}%{?prerelease:_%{prerelease}}.tar.gz
@@ -18,6 +18,8 @@ Source3:           roadwarrior-client.conf
 # Don't start openvpn by default.
 Patch0:            openvpn-init.patch
 Patch1:            openvpn-script-security.patch
+Patch2:            openvpn-2.1.1-init.patch
+Patch3:            openvpn-2.1.1-initinfo.patch
 License:           GPLv2
 Group:             Applications/Internet
 BuildRoot:         %{_tmppath}/%{name}-%{version}-%{release}-%(id -un)
@@ -54,6 +56,9 @@ for compression.
 %setup -q -n %{name}-%{version}%{?prerelease:_%{prerelease}}
 %patch0 -p0
 %patch1 -p1
+%patch2 -p0
+%patch3 -p0
+
 sed -i -e 's,%{_datadir}/openvpn/plugin,%{_libdir}/openvpn/plugin,' openvpn.8
 
 # %%doc items shouldn't be executable.
@@ -170,6 +175,10 @@ fi
 %config %dir %{_sysconfdir}/%{name}/
 
 %changelog
+* Mon Jan 04 2010 Jon Ciesla <limb@jcomserv.net> 2.1.1-2
+- Fix init script *.sh sourcing, BZ 498348.
+- Added init script info block, BZ 392991, BZ 541219.
+
 * Fri Dec 11 2009 Steven Pritchard <steve@kspei.com> 2.1.1-1
 - Update to 2.1.1.