diff --git a/.cvsignore b/.cvsignore
index 288a607..66c5520 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -5,3 +5,5 @@ NetworkManager-0.6.4.cvs20060829.tar.gz
 NetworkManager-0.6.5.cvs20061025.tar.gz
 NetworkManager-0.6.5.svn2474.tar.gz
 nm-applet-0.6.5.svn63.tar.gz
+NetworkManager-0.6.5.svn2547.tar.gz
+nm-applet-0.6.5.svn71.tar.gz
diff --git a/NetworkManager-0.6.5-wpa_supplicant-debug.patch b/NetworkManager-0.6.5-wpa_supplicant-debug.patch
new file mode 100644
index 0000000..321adfb
--- /dev/null
+++ b/NetworkManager-0.6.5-wpa_supplicant-debug.patch
@@ -0,0 +1,22 @@
+--- NetworkManager-0.6.5/src/nm-device-802-11-wireless.c.debug	2007-04-09 11:00:46.000000000 -0400
++++ NetworkManager-0.6.5/src/nm-device-802-11-wireless.c	2007-04-09 11:02:00.000000000 -0400
+@@ -2715,14 +2715,17 @@
+ supplicant_exec (NMDevice80211Wireless *self)
+ {
+ 	gboolean	success = FALSE;
+-	char *	argv[4];
++	char *	argv[7];
+ 	GError *	error = NULL;
+ 	GPid		pid = -1;
+ 
+ 	argv[0] = WPA_SUPPLICANT_BIN;
+ 	argv[1] = "-g";
+ 	argv[2] = WPA_SUPPLICANT_GLOBAL_SOCKET;
+-	argv[3] = NULL;
++	argv[3] = "-dd";
++	argv[4] = "-o";
++	argv[5] = "daemon";
++	argv[6] = NULL;
+ 
+ 	success = g_spawn_async ("/", argv, NULL, 0, &supplicant_child_setup, NULL,
+ 	                         &pid, &error);
diff --git a/NetworkManager.spec b/NetworkManager.spec
index 38132da..aa9fc57 100644
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@ -10,15 +10,15 @@ Name: NetworkManager
 Summary: Network connection manager and user applications
 Epoch: 1
 Version: 0.6.5
-Release: 0.6.svn2474%{?dist}
+Release: 0.7.svn2547%{?dist}
 Group: System Environment/Base
 License: GPL
 URL: http://www.gnome.org/projects/NetworkManager/
-Source: %{name}-%{version}.svn2474.tar.gz
-Source1: nm-applet-0.6.5.svn63.tar.gz
+Source: %{name}-%{version}.svn2547.tar.gz
+Source1: nm-applet-0.6.5.svn71.tar.gz
 Patch0: NetworkManager-0.6.4-startup-dhcdbd.patch
 Patch1: NetworkManager-0.6.5-fixup-internal-applet-build.patch
-Patch2: NetworkManager-0.6.5-dbus-connection-close.patch
+Patch2: NetworkManager-0.6.5-wpa_supplicant-debug.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 PreReq:   chkconfig
@@ -117,13 +117,12 @@ NetworkManager functionality from applications that use glib.
 %prep
 %setup -q
 %patch0 -p1 -b .startup-dhcdbd
+%patch2 -p1 -b .wpas-debug
 
 # unpack the applet
 tar -xzf %{SOURCE1}
 %patch1 -p1 -b .buildfix
 
-%patch2 -p1 -b .dbus-connection-close
-
 %build
 # Even though we don't require named, we still build with it
 # so that if the user installs it, NM will use it automatically
@@ -247,6 +246,13 @@ fi
 
 
 %changelog
+* Mon Apr  9 2007 Dan Williams  <dcbw@redhat.com> - 1:0.6.5-0.7.svn2547
+- Update from trunk
+    - Updated translations
+    - Cleaned-up VPN properties dialogs
+    - Fix 64-bit kernel leakage issues in WEXT
+    - Don't capture and redirect wpa_supplicant log output
+
 * Wed Mar 28 2007 Matthew Barnes  <mbarnes@redhat.com> 1:0.6.5-0.6.svn2474
 - Close private D-Bus connections. (#232691)
 
diff --git a/sources b/sources
index 8ee5559..5792a1b 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-66c2c133230b27b8c0f0904bc0afda52  NetworkManager-0.6.5.svn2474.tar.gz
-99409b7e202a8c0c1121f7f63490392d  nm-applet-0.6.5.svn63.tar.gz
+bb96eb758e4e2156f15cbc863580f0a1  NetworkManager-0.6.5.svn2547.tar.gz
+6705d870f81ccc89f3a7edbe4a6870e8  nm-applet-0.6.5.svn71.tar.gz