diff --git a/.cvsignore b/.cvsignore
index 9352595..7f0a2a8 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -117,3 +117,5 @@ nm-applet-0.7.0.svn838.tar.gz
 NetworkManager-0.7.0.svn4174.tar.gz
 nm-applet-0.7.0.svn939.tar.gz
 NetworkManager-0.7.0.svn4175.tar.gz
+NetworkManager-0.7.0.svn4201.tar.gz
+nm-applet-0.7.0.svn958.tar.gz
diff --git a/NetworkManager.spec b/NetworkManager.spec
index 8036c47..52564ea 100644
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@ -9,8 +9,8 @@ ExcludeArch: s390 s390x
 %define libnl_version 1.1
 %define ppp_version 2.2.4
 
-%define snapshot svn4175
-%define applet_snapshot svn939
+%define snapshot svn4201
+%define applet_snapshot svn958
 
 Name: NetworkManager
 Summary: Network connection manager and user applications
@@ -41,9 +41,9 @@ Requires: avahi-autoipd
 Requires: dnsmasq
 Obsoletes: dhcdbd
 
-Conflicts: NetworkManager-vpnc < 1:0.7.0-0.10.svn4174
+Conflicts: NetworkManager-vpnc < 1:0.7.0-0.11.svn4174
 Conflicts: NetworkManager-openvpn < 1:0.7.0-16.svn4174
-Conflicts: NetworkManager-pptp < 1:0.7.0-0.10.svn4174
+Conflicts: NetworkManager-pptp < 1:0.7.0-0.11.svn4174
 
 BuildRequires: dbus-devel >= %{dbus_version}
 BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
@@ -53,7 +53,6 @@ BuildRequires: glib2-devel gtk2-devel
 BuildRequires: libglade2-devel
 BuildRequires: openssl-devel
 BuildRequires: GConf2-devel
-BuildRequires: gnome-panel-devel
 BuildRequires: libgnomeui-devel
 BuildRequires: gnome-keyring-devel
 BuildRequires: gettext-devel
@@ -95,7 +94,6 @@ Summary: GNOME applications for use with NetworkManager
 Group: Applications/Internet
 Requires: %{name} = %{epoch}:%{version}-%{release}
 Requires: %{name}-glib = %{epoch}:%{version}-%{release}
-Requires: gnome-panel
 Requires: dbus >= %{dbus_version}
 Requires: dbus-glib >= %{dbus_glib_version}
 Requires: libnotify >= 0.4.3
@@ -296,6 +294,14 @@ fi
 %{_datadir}/gtk-doc/html/libnm-glib/*
 
 %changelog
+* Tue Oct 21 2008 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.11.svn4201
+- Fix issues with hostname during anaconda installation (rh #461933)
+- Fix Ad-Hoc WPA connections (rh #461197)
+- Don't require gnome-panel or gnome-panel-devel (rh #427834)
+- Fix determination of WPA encryption capabilities on some cards
+- Fix conflicts with PPTP and vpnc plugins
+- Allow .cer file extensions when choosing certificates
+
 * Sat Oct 11 2008 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.11.svn4175
 - Fix conflicts for older PPTP VPN plugins
 
diff --git a/sources b/sources
index 745fd56..19d0c79 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-74161daaa20a15661c62cf8df58740c2  nm-applet-0.7.0.svn939.tar.gz
-e68a22872c2eabfb28f5a9678ec048c0  NetworkManager-0.7.0.svn4175.tar.gz
+270eddc917a3c7c159f049fa726e2acd  NetworkManager-0.7.0.svn4201.tar.gz
+47a821b1228fb064bf1404581623b384  nm-applet-0.7.0.svn958.tar.gz