diff --git a/.cvsignore b/.cvsignore
index 2a031fc..e8c7b71 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -84,3 +84,5 @@ NetworkManager-0.7.0.svn3473.tar.gz
 nm-applet-0.7.0.svn604.tar.gz
 NetworkManager-0.7.0.svn3476.tar.gz
 nm-applet-0.7.0.svn606.tar.gz
+NetworkManager-0.7.0.svn3521.tar.gz
+nm-applet-0.7.0.svn636.tar.gz
diff --git a/NetworkManager-0.6.5-fixup-internal-applet-build.patch b/NetworkManager-0.6.5-fixup-internal-applet-build.patch
index e120f14..808ebfd 100644
--- a/NetworkManager-0.6.5-fixup-internal-applet-build.patch
+++ b/NetworkManager-0.6.5-fixup-internal-applet-build.patch
@@ -47,15 +47,14 @@ diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am.buil
  noinst_LTLIBRARIES = libgconf-helpers.la
  
  libgconf_helpers_la_SOURCES =	\
-@@ -8,5 +12,8 @@ libgconf_helpers_la_SOURCES =	\
+@@ -13,5 +17,7 @@ libgconf_helpers_la_CPPFLAGS = \
  
- libgconf_helpers_la_CPPFLAGS = $(NMA_CFLAGS)
- 
--libgconf_helpers_la_LIBADD = $(NMA_LIBS)
-+libgconf_helpers_la_LIBADD = $(NMA_LIBS) \
+ libgconf_helpers_la_LIBADD = \
+ 	$(NMA_LIBS) \
+-	${top_builddir}/src/utils/libutils.la
++	${top_builddir}/src/utils/libutils.la \
 +	-L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
 +	-L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la
-+
  
 diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/utils/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/utils/Makefile.am
 --- NetworkManager-0.7.0/nm-applet-0.7.0/src/utils/Makefile.am.buildfix	2007-11-13 15:41:01.000000000 -0500
@@ -101,12 +100,12 @@ diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/wireless-security/Makefile.am.
  libwireless_security_la_SOURCES = \
  	wireless-security.h \
  	wireless-security.c \
-@@ -35,5 +39,7 @@ libwireless_security_la_CPPFLAGS = \
- 
+@@ -36,5 +40,7 @@ libwireless_security_la_CPPFLAGS = \
  libwireless_security_la_LIBADD = \
  	$(NMA_LIBS) \
--	${top_builddir}/src/utils/libutils.la
-+	${top_builddir}/src/utils/libutils.la \
+ 	${top_builddir}/src/utils/libutils.la \
+-	${top_builddir}/src/gconf-helpers/libgconf-helpers.la
++	${top_builddir}/src/gconf-helpers/libgconf-helpers.la \
 +	-L${top_srcdir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
 +	-L${top_srcdir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la
  
diff --git a/NetworkManager.spec b/NetworkManager.spec
index 26f22a9..2c2e1ea 100644
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@ -9,8 +9,8 @@ ExcludeArch: s390 s390x
 %define libnl_version 1.0-0.15.pre8.git20071218
 %define ppp_version 2.2.4
 
-%define snapshot svn3476
-%define applet_snapshot svn606
+%define snapshot svn3521
+%define applet_snapshot svn636
 
 Name: NetworkManager
 Summary: Network connection manager and user applications
@@ -279,6 +279,12 @@ fi
 
 
 %changelog
+* Mon Mar 31 2008 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.9.1.svn3521
+- Show VPN failures
+- Support Static WEP key indexes
+- Fix parsing of WEP keys from ifcfg files
+- Pre-fill wireless security UI bits in connection editor and applet
+
 * Tue Mar 18 2008 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.9.1.svn3476
 - Grab system settings from /etc/sysconfig/network-scripts, not from profiles
 
diff --git a/sources b/sources
index 7ab3e17..1886b14 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-782bdb8ccfc5c989847a6e916c7765e1  NetworkManager-0.7.0.svn3476.tar.gz
-7e52199a1174e44c601ec7e89bcf3f64  nm-applet-0.7.0.svn606.tar.gz
+3585104d8f4afc09a3b031c279598a9b  NetworkManager-0.7.0.svn3521.tar.gz
+b737ae84f0522f0fb989ef3ef9dfd02f  nm-applet-0.7.0.svn636.tar.gz