diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec
index 1b7e006..ffd22b2 100644
--- a/NetworkManager-openvpn.spec
+++ b/NetworkManager-openvpn.spec
@@ -1,25 +1,20 @@
-%define nm_version          1:0.8.998
+%define nm_version          1:0.9.2
 %define dbus_version        1.1
 %define gtk2_version        3.0.1
 %define openvpn_version     2.1
 %define shared_mime_version 0.16-3
 
-%define snapshot %{nil}
-%define realversion 0.9.0
+%define snapshot .git20120302
+%define realversion 0.9.3.995
 
 Summary: NetworkManager VPN plugin for OpenVPN
 Name: NetworkManager-openvpn
 Epoch:   1
-Version: 0.9.0
-Release: 4%{snapshot}%{?dist}
+Version: 0.9.3.995
+Release: 1%{snapshot}%{?dist}
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
 Group: System Environment/Base
-# How to build the source package:
-# - Check out network-manager-openvpn
-# - ./autogen.sh --prefix=/usr --sysconfdir=/etc
-# - make distcheck
-# - use generated NetworkManager-openvpn-0.8.tar.bz2
 Source: %{name}-%{realversion}%{snapshot}.tar.bz2
 
 BuildRequires: gtk3-devel                 >= %{gtk2_version}
@@ -27,7 +22,11 @@ BuildRequires: dbus-devel                 >= %{dbus_version}
 BuildRequires: NetworkManager-devel       >= %{nm_version}
 BuildRequires: NetworkManager-glib-devel  >= %{nm_version}
 BuildRequires: glib2-devel
+%if 0%{?fedora} > 16
 BuildRequires: libgnome-keyring-devel
+%else
+BuildRequires: gnome-keyring-devel
+%endif
 BuildRequires: libtool intltool gettext
 Requires(post): %{_bindir}/update-desktop-database
 Requires(postun): %{_bindir}/update-desktop-database
@@ -51,7 +50,6 @@ with NetworkManager and the GNOME desktop.
 if [ ! -f configure ]; then
   ./autogen.sh
 fi
-export CFLAGS="$RPM_OPT_FLAGS -Wno-error=deprecated-declarations"
 %configure --disable-static --disable-dependency-tracking --enable-more-warnings=yes --with-gtkver=3
 make %{?_smp_mflags}
 
@@ -92,6 +90,11 @@ fi
 %dir %{_datadir}/gnome-vpn-properties/openvpn
 
 %changelog
+* Fri Mar  2 2012 Dan Williams <dcbw@redhat.com> - 1:0.9.3.995-1
+- Update to 0.9.3.995 (0.9.4-beta1)
+- ui: allow setting Cipher and HMAC options in Static Key mode
+- ui: add support for external UI mode, eg GNOME Shell
+
 * Sun Feb 26 2012 Peter Robinson <pbrobinson@fedoraproject.org> - 1:0.9.0-4
 - Update for unannounced gnome-keyring devel changes
 
diff --git a/sources b/sources
index 2e7e229..1470662 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ab5dbe20315e5b4c41956b1ef2d8c3e2  NetworkManager-openvpn-0.9.0.tar.bz2
+cbe4a8082235446bd7108bf0686ee0b6  NetworkManager-openvpn-0.9.3.995.git20120302.tar.bz2