diff --git a/.cvsignore b/.cvsignore
index 43906c5..aba0103 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-openvpn-2.0.1.tar.gz
+openvpn-2.0.2.tar.gz
diff --git a/openvpn-2.0.1.tar.gz.asc b/openvpn-2.0.1.tar.gz.asc
deleted file mode 100644
index 420074c..0000000
--- a/openvpn-2.0.1.tar.gz.asc
+++ /dev/null
@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.4 (GNU/Linux)
-
-iD8DBQBDAkOWHQtJlh+/UfMRAlV1AJ0fALHZW8e3dtWtMe5psNRHsYdMgQCgnhl/
-LXHbj2c8LcfkeaL8E8U9eYc=
-=BscN
------END PGP SIGNATURE-----
diff --git a/openvpn-2.0.2.tar.gz.asc b/openvpn-2.0.2.tar.gz.asc
new file mode 100644
index 0000000..c2da92d
--- /dev/null
+++ b/openvpn-2.0.2.tar.gz.asc
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.4 (GNU/Linux)
+
+iD8DBQBDDfRYHQtJlh+/UfMRAsWsAJ9p43cPLKwsPTJDLXaUE5yiTStt5QCfedKh
+VZhPLkjDDBY+PoFG590wW9k=
+=oESp
+-----END PGP SIGNATURE-----
diff --git a/openvpn.spec b/openvpn.spec
index f658c88..d8e6a9e 100644
--- a/openvpn.spec
+++ b/openvpn.spec
@@ -1,7 +1,7 @@
 %define plugins down-root auth-pam
 
 Name:              openvpn
-Version:           2.0.1
+Version:           2.0.2
 Release:           1%{?dist}
 Summary:           A full-featured SSL VPN solution
 URL:               http://openvpn.net/
@@ -125,6 +125,10 @@ fi
 %config %dir %{_sysconfdir}/%{name}/
 
 %changelog
+* Thu Aug 25 2005 Steven Pritchard <steve@kspei.com> 2.0.2-1
+- Update to 2.0.2
+- Refine roadwarrior-server.conf a bit
+
 * Mon Aug 22 2005 Steven Pritchard <steve@kspei.com> 2.0.1-1
 - Update to 2.0.1
 
diff --git a/roadwarrior-server.conf b/roadwarrior-server.conf
index 0cbaea6..be3db15 100644
--- a/roadwarrior-server.conf
+++ b/roadwarrior-server.conf
@@ -39,12 +39,14 @@ push "route 10.8.0.1 255.255.255.255"
 # to the local network.
 push "route 192.168.0.0 255.255.255.0"
 
+# Push DHCP options to Windows clients.
+push "dhcp-option DOMAIN example.com"
+push "dhcp-option DNS 192.168.0.1"
+push "dhcp-option WINS 192.168.0.1"
+
 # Client should attempt reconnection on link
 # failure.
-ping 10
-ping-restart 120
-push "ping 10"
-push "ping-restart 60"
+keepalive 10 60
 
 # Delete client instances after some period
 # of inactivity.
@@ -58,4 +60,8 @@ route 10.8.0.0 255.255.255.0
 user openvpn
 group openvpn
 
+# Keep TUN devices and keys open across restarts.
+persist-tun
+persist-key
+
 verb 4
diff --git a/sources b/sources
index 117b96f..117f71c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fad7a08c0d68371c2c0e6428bcb98fa5  openvpn-2.0.1.tar.gz
+862f8788f080f669b1ae00a74ef68001  openvpn-2.0.2.tar.gz