diff --git a/.cvsignore b/.cvsignore
index e8ae9ba..c8f7306 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,3 @@
 NetworkManager-openvpn-0.8.tar.bz2
 NetworkManager-openvpn-0.8.git20100411.tar.bz2
+NetworkManager-openvpn-0.8.0.997.git20100609.tar.bz2
diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec
index c2648b4..db2497c 100644
--- a/NetworkManager-openvpn.spec
+++ b/NetworkManager-openvpn.spec
@@ -1,16 +1,17 @@
-%define nm_version          1:0.8
+%define nm_version          1:0.7.997
 %define dbus_version        1.1
 %define gtk2_version        2.10.0
 %define openvpn_version     2.1
 %define shared_mime_version 0.16-3
 
-%define snapshot .git20100411
+%define snapshot .git20100609
+%define realversion 0.8.0.997
 
 Summary: NetworkManager VPN plugin for OpenVPN
 Name: NetworkManager-openvpn
 Epoch:   1
-Version: 0.8
-Release: 2%{snapshot}%{?dist}
+Version: 0.8.1
+Release: 0.1%{snapshot}%{?dist}
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
 Group: System Environment/Base
@@ -19,7 +20,8 @@ Group: System Environment/Base
 # - ./autogen.sh --prefix=/usr --sysconfdir=/etc
 # - make distcheck
 # - use generated NetworkManager-openvpn-0.8.tar.bz2
-Source: %{name}-%{version}%{snapshot}.tar.bz2
+Source: %{name}-%{realversion}%{snapshot}.tar.bz2
+Patch0: import-export.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: gtk2-devel                 >= %{gtk2_version}
@@ -50,8 +52,8 @@ This package contains software for integrating the OpenVPN VPN software
 with NetworkManager and the GNOME desktop.
 
 %prep
-%setup -q -n %{name}-%{version}
-
+%setup -q -n %{name}-%{realversion}
+%patch0 -p1 -b .importexport
 
 %build
 if [ ! -f configure ]; then
@@ -103,6 +105,10 @@ fi
 %dir %{_datadir}/gnome-vpn-properties/openvpn
 
 %changelog
+* Wed Jun  9 2010 Dan Williams <dcbw@redhat.com> - 1:0.8.1-0.1.git20100609
+- Add support for PKCS#8 private keys
+- Add support for unencrypted private keys (rh #497454)
+
 * Sun Apr 11 2010 Dan Williams <dcbw@redhat.com> - 1:0.8-2
 - Add support for more HMAC authentication algorithms
 - Fix requests for private key passwords for certificates (rh #549961)
diff --git a/import-export.patch b/import-export.patch
new file mode 100644
index 0000000..771d441
--- /dev/null
+++ b/import-export.patch
@@ -0,0 +1,14 @@
+diff -up NetworkManager-openvpn-0.8.0.997/properties/nm-openvpn.c.foo NetworkManager-openvpn-0.8.0.997/properties/nm-openvpn.c
+--- NetworkManager-openvpn-0.8.0.997/properties/nm-openvpn.c.foo	2010-06-09 22:15:22.095413377 -0700
++++ NetworkManager-openvpn-0.8.0.997/properties/nm-openvpn.c	2010-06-09 22:15:31.771412470 -0700
+@@ -767,8 +767,8 @@ openvpn_plugin_ui_interface_init (NMVpnP
+ 	/* interface implementation */
+ 	iface_class->ui_factory = ui_factory;
+ 	iface_class->get_capabilities = get_capabilities;
+-	iface_class->import_from_file = import;
+-	iface_class->export_to_file = export;
++	iface_class->import = import;
++	iface_class->export = export;
+ 	iface_class->get_suggested_name = get_suggested_name;
+ 	iface_class->delete_connection = delete_connection;
+ }
diff --git a/sources b/sources
index 40a40b9..e802f7f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8bec68b1d862154282e360808778717d  NetworkManager-openvpn-0.8.git20100411.tar.bz2
+b8a571e5594765b7a412d560afc16396  NetworkManager-openvpn-0.8.0.997.git20100609.tar.bz2