diff --git a/NetworkManager.spec b/NetworkManager.spec
index 2262558..5cbcdb8 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 svn3590
-%define applet_snapshot svn694
+%define snapshot svn3614
+%define applet_snapshot svn703
 
 Name: NetworkManager
 Summary: Network connection manager and user applications
@@ -232,11 +232,10 @@ fi
 %doc COPYING ChangeLog NEWS AUTHORS README CONTRIBUTING TODO
 %{_sysconfdir}/dbus-1/system.d/NetworkManager.conf
 %{_sysconfdir}/dbus-1/system.d/nm-dhcp-client.conf
+%{_sysconfdir}/dbus-1/system.d/nm-dispatcher.conf
 %{_sysconfdir}/dbus-1/system.d/nm-system-settings.conf
 %config %{_sysconfdir}/rc.d/init.d/NetworkManager
-%config %{_sysconfdir}/rc.d/init.d/NetworkManagerDispatcher
 %{_sbindir}/%{name}
-%{_sbindir}/NetworkManagerDispatcher
 %{_sbindir}/nm-system-settings
 %{_sysconfdir}/nm-system-settings.conf
 %dir %{_sysconfdir}/NetworkManager/
@@ -245,6 +244,7 @@ fi
 %{_bindir}/nm-tool
 %{_bindir}/nm-online
 %{_libexecdir}/nm-dhcp-client.action
+%{_libexecdir}/nm-dispatcher.action
 %{_libdir}/libnm-util.so*
 %dir %{_libdir}/NetworkManager
 %{_libdir}/NetworkManager/*.so*
@@ -255,6 +255,7 @@ fi
 %dir %{_datadir}/NetworkManager
 %{_datadir}/NetworkManager/gdb-cmd
 %{_datadir}/dbus-1/system-services/org.freedesktop.NetworkManagerSystemSettings.service
+%{_datadir}/dbus-1/system-services/org.freedesktop.nm_dispatcher.service
 %{_libdir}/pppd/2.4.4/nm-pppd-plugin.so
 
 %files gnome
@@ -291,7 +292,18 @@ fi
 
 
 %changelog
-* Tue Apr 22 2008 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.9.2.svn3590
+* Sun Apr 27 2008 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.6.7.svn3614
+- Don't ask for wireless keys when the driver sends disconnect events during
+	association; wait until the entire assocation times out
+- Replace dispatcher daemon with D-Bus activated callout
+- Fix parsing of DNS2 and DNS3 ifcfg file items
+- Execute dispatcher scripts in alphabetical order
+- Be active at runlevel 2
+- Hook up MAC address widgets for wired & wireless; and BSSID widget for wireless
+- Pre-populate anonymous identity and phase2 widgets correctly
+- Clear out unused connection keys from GConf
+
+* Tue Apr 22 2008 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.6.7.svn3590
 - Don't select devices without a default gateway as the default route (rh #437338)
 - Fill in broadcast address if not specified (rh #443474)
 - Respect manual VPN IPv4 configuration options
diff --git a/optionally-wait-for-network.patch b/optionally-wait-for-network.patch
index fbedf31..d469094 100644
--- a/optionally-wait-for-network.patch
+++ b/optionally-wait-for-network.patch
@@ -1,6 +1,25 @@
---- NetworkManager-0.7.0/initscript/RedHat/NetworkManager.in	2008-04-05 12:17:55.000000000 -0400
-+++ NetworkManager-0.7.0/initscript/RedHat/NetworkManager.in	2008-04-16 13:10:41.000000000 -0400
-@@ -34,6 +34,9 @@
+diff -up NetworkManager-0.7.0/initscript/RedHat/NetworkManager.in.wait-for-network NetworkManager-0.7.0/initscript/RedHat/NetworkManager.in
+--- NetworkManager-0.7.0/initscript/RedHat/NetworkManager.in.wait-for-network	2008-04-24 11:49:01.000000000 -0400
++++ NetworkManager-0.7.0/initscript/RedHat/NetworkManager.in	2008-04-27 21:51:07.000000000 -0400
+@@ -2,7 +2,7 @@
+ #
+ # NetworkManager:   NetworkManager daemon
+ #
+-# chkconfig: - 27 73
++# chkconfig: - 98 02
+ # description:  This is a daemon for automatically switching network \
+ #               connections to the best available connection.
+ #
+@@ -10,7 +10,7 @@
+ # pidfile: /var/run/NetworkManager/NetworkManager.pid
+ #
+ ### BEGIN INIT INFO
+-# Provides: network_manager $network
++# Provides: network_manager
+ # Required-Start: messagebus haldaemon
+ # Required-Stop: messagebus haldaemon
+ # Default-Start: 2 3 4 5
+@@ -34,6 +34,9 @@ NETWORKMANAGER_BIN=${sbindir}/NetworkMan
  # Source function library.
  . /etc/rc.d/init.d/functions
  
@@ -10,7 +29,7 @@
  # so we can rearrange this easily
  processname=NetworkManager
  servicename=NetworkManager
-@@ -50,6 +53,14 @@
+@@ -52,6 +55,14 @@ start()
  	daemon --check $servicename $processname --pid-file=$pidfile
  	RETVAL=$?
  	echo
diff --git a/sources b/sources
index df7d304..1c23012 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-10ae47ccd5efa8dc7ccce332e5204aaf  NetworkManager-0.7.0.svn3590.tar.gz
-c3f4eb2798b08c5a43fd95c7ea9ffe8c  nm-applet-0.7.0.svn694.tar.gz
+cf3b981c710f464d73c785e30c8c613e  NetworkManager-0.7.0.svn3614.tar.gz
+5f021f8e792c14b3329c1fe5ed554c77  nm-applet-0.7.0.svn703.tar.gz