diff --git a/.cvsignore b/.cvsignore
index 7380b5b..ba80974 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -93,3 +93,5 @@ nm-applet-0.7.0.svn657.tar.gz
 NetworkManager-0.7.0.svn3548.tar.gz
 NetworkManager-0.7.0.svn3549.tar.gz
 nm-applet-0.7.0.svn662.tar.gz
+NetworkManager-0.7.0.svn3566.tar.gz
+nm-applet-0.7.0.svn679.tar.gz
diff --git a/NetworkManager.spec b/NetworkManager.spec
index e6241f8..56e6946 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 svn3549
-%define applet_snapshot svn662
+%define snapshot svn3566
+%define applet_snapshot svn679
 
 Name: NetworkManager
 Summary: Network connection manager and user applications
@@ -24,8 +24,7 @@ Source: %{name}-%{version}.%{snapshot}.tar.gz
 Source1: nm-applet-%{version}.%{applet_snapshot}.tar.gz
 Source2: nm-system-settings.conf
 Patch1: NetworkManager-0.6.5-fixup-internal-applet-build.patch
-Patch2: nm-applet-0.7.0-disable-stuff.patch
-Patch3: no-strict-aliasing.patch
+Patch2: no-strict-aliasing.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 PreReq:   chkconfig
@@ -137,8 +136,7 @@ NetworkManager functionality from applications that use glib.
 # unpack the applet
 tar -xzf %{SOURCE1}
 %patch1 -p1 -b .buildfix
-%patch2 -p1 -b .disable-stuff
-%patch3 -p1 -b .no-strict-aliasing
+%patch2 -p1 -b .no-strict-aliasing
 
 %build
 # Even though we don't require named, we still build with it
@@ -287,6 +285,12 @@ fi
 
 
 %changelog
+* Wed Apr 16 2008 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.9.1.svn3566
+- Turn on Add/Edit in the connection editor
+- Don't flush or change IPv6 addresses or routes
+- Enhance nm-online tool
+- Some serial communication fixes for mobile broadband
+
 * Wed Apr  9 2008 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.9.1.svn3549
 - Fix issues with VPN passwords not getting found
 
diff --git a/nm-applet-0.7.0-disable-stuff.patch b/nm-applet-0.7.0-disable-stuff.patch
deleted file mode 100644
index 6d571d1..0000000
--- a/nm-applet-0.7.0-disable-stuff.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/nm-connection-list.c.disable-stuff NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/nm-connection-list.c
---- NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/nm-connection-list.c.disable-stuff	2008-02-27 11:02:34.000000000 -0500
-+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/nm-connection-list.c	2008-02-29 14:13:13.000000000 -0500
-@@ -417,9 +417,11 @@ new_connection_list (NMConnectionList *l
- 	                                      COL_TIMESTAMP, GTK_SORT_DESCENDING);
- 	gtk_tree_view_set_model (GTK_TREE_VIEW (clist), GTK_TREE_MODEL (sort_model));
- 
-+if (FALSE) {
- 	g_signal_connect (G_OBJECT (clist),
- 	                  "row-activated", G_CALLBACK (connection_double_clicked_cb),
- 	                  list);
-+}
- 
- 	gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (clist),
- 	                                             -1, "Name", gtk_cell_renderer_text_new (),
-@@ -444,15 +446,19 @@ new_connection_list (NMConnectionList *l
- 	g_object_set_data (G_OBJECT (button), CONNECTION_LIST_TAG, list);
- 	g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (add_connection_cb), clist);
- 	g_free (name);
-+	gtk_widget_set_sensitive (button, FALSE);
- 
- 	name = g_strdup_printf ("%s_edit", prefix);
- 	button = glade_xml_get_widget (list->gui, name);
- 	g_object_set_data (G_OBJECT (button), CONNECTION_LIST_TAG, list);
- 	g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (edit_connection_cb), clist);
-+if (FALSE) {
- 	g_signal_connect (G_OBJECT (select),
- 	                  "changed", G_CALLBACK (list_selection_changed_cb),
- 	                  button);
-+}
- 	g_free (name);
-+	gtk_widget_set_sensitive (button, FALSE);
- 
- 	name = g_strdup_printf ("%s_delete", prefix);
- 	button = glade_xml_get_widget (list->gui, name);
diff --git a/sources b/sources
index 7ae100f..24833f3 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-126323fb50af92c634899c45d53f8596  NetworkManager-0.7.0.svn3549.tar.gz
-75614d7d309c713defdb81d5c8288871  nm-applet-0.7.0.svn662.tar.gz
+029de3e4769d5a0d729191f57eb22c01  NetworkManager-0.7.0.svn3566.tar.gz
+3ee218cd29382f3d3f871fe3f16894d3  nm-applet-0.7.0.svn679.tar.gz