diff --git a/.NetworkManager.metadata b/.NetworkManager.metadata
new file mode 100644
index 0000000..e59d0db
--- /dev/null
+++ b/.NetworkManager.metadata
@@ -0,0 +1,2 @@
+ab15eeb9ae37eeebb9b2c47d3e6e991bc98de3c6 SOURCES/nmtui-0.0.1.tar.xz
+91b9fc66e273c87925efdad1cb789ce4fcbf8f84 SOURCES/NetworkManager-0.9.9.0.git20131108.tar.bz2
diff --git a/README.md b/README.md
deleted file mode 100644
index 0e7897f..0000000
--- a/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-The master branch has no content
- 
-Look at the c7 branch if you are working with CentOS-7, or the c4/c5/c6 branch for CentOS-4, 5 or 6
- 
-If you find this file in a distro specific branch, it means that no content has been checked in yet
diff --git a/SOURCES/00-server.conf b/SOURCES/00-server.conf
new file mode 100644
index 0000000..eede0c8
--- /dev/null
+++ b/SOURCES/00-server.conf
@@ -0,0 +1,20 @@
+# This configuration file, when placed into into
+# /etc/NetworkManager/conf.d changes NetworkManager's behavior to
+# what's expected on "traditional UNIX server" type deployments.
+#
+# See "man NetworkManager.conf" for more information about these
+# and other keys.
+#
+# Do not edit this file; it will be overwritten on upgrades. If you
+# want to override the values here, or set additional values, you can
+# do so by adding another file (eg, "99-local.conf") to this directory
+# and setting keys there.
+
+[main]
+# Do not do automatic (DHCP/SLAAC) configuration on ethernet devices
+# with no other matching connections.
+no-auto-default=*
+
+# Ignore the carrier (cable plugged in) state when attempting to
+# activate static-IP connections.
+ignore-carrier=*
diff --git a/SOURCES/0001-fix-build-with-newt-0.52.15.patch b/SOURCES/0001-fix-build-with-newt-0.52.15.patch
new file mode 100644
index 0000000..455fbce
--- /dev/null
+++ b/SOURCES/0001-fix-build-with-newt-0.52.15.patch
@@ -0,0 +1,24 @@
+From db5beed85ae8e9cf35ed94d2e3c78c6b469b2d63 Mon Sep 17 00:00:00 2001
+From: Dan Winship <danw@gnome.org>
+Date: Mon, 4 Nov 2013 10:47:48 -0500
+Subject: [PATCH] fix build with newt 0.52.15
+
+---
+ nmt-newt-popup.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/nmt-newt-popup.c b/nmt-newt-popup.c
+index f6c427e..6f37243 100644
+--- a/nmtui-0.0.1/nmt-newt-popup.c
++++ b/nmtui-0.0.1/nmt-newt-popup.c
+@@ -22,6 +22,7 @@
+ 
+ #include "nmt-newt-popup.h"
+ #include "nmt-newt-form.h"
++#include "nmt-newt-hacks.h"
+ #include "nmt-newt-listbox.h"
+ #include "nmt-newt-utils.h"
+ 
+-- 
+1.8.4.2
+
diff --git a/SOURCES/NetworkManager.conf b/SOURCES/NetworkManager.conf
new file mode 100644
index 0000000..65e34a4
--- /dev/null
+++ b/SOURCES/NetworkManager.conf
@@ -0,0 +1,2 @@
+[main]
+plugins=ifcfg-rh
diff --git a/SOURCES/explain-dns1-dns2.patch b/SOURCES/explain-dns1-dns2.patch
new file mode 100644
index 0000000..e31a0eb
--- /dev/null
+++ b/SOURCES/explain-dns1-dns2.patch
@@ -0,0 +1,27 @@
+diff -up NetworkManager-0.8.2/src/dns-manager/nm-dns-manager.c.explain-dns1-dns2 NetworkManager-0.8.2/src/dns-manager/nm-dns-manager.c
+--- NetworkManager-0.8.2/src/dns-manager/nm-dns-manager.c.explain-dns1-dns2	2010-10-18 18:44:05.000000000 -0500
++++ NetworkManager-0.8.2/src/dns-manager/nm-dns-manager.c	2010-11-03 13:51:56.614584001 -0500
+@@ -358,7 +358,7 @@ write_resolv_conf (FILE *f, const char *
+ 
+ 	str = g_string_new ("");
+ 
+-	if (nameservers) {
++	if (nameservers && g_strv_length (nameservers)) {
+ 		int num = g_strv_length (nameservers);
+ 
+ 		for (i = 0; i < num; i++) {
+@@ -374,6 +374,14 @@ write_resolv_conf (FILE *f, const char *
+ 			g_string_append (str, nameservers[i]);
+ 			g_string_append_c (str, '\n');
+ 		}
++	} else {
++		g_string_append_printf (str, "\n\n%s%s%s%s%s%s",
++		                        "# No nameservers found; try putting DNS servers into your\n",
++		                        "# ifcfg files in /etc/sysconfig/network-scripts like so:\n",
++		                        "#\n",
++		                        "# DNS1=xxx.xxx.xxx.xxx\n",
++		                        "# DNS2=xxx.xxx.xxx.xxx\n",
++		                        "# DOMAIN=lab.foo.com bar.foo.com\n");
+ 	}
+ 
+ 	nameservers_str = g_string_free (str, FALSE);
diff --git a/SOURCES/rh1029464-settings-convert-NMDefaultWiredConnection-into-a-pla.patch b/SOURCES/rh1029464-settings-convert-NMDefaultWiredConnection-into-a-pla.patch
new file mode 100644
index 0000000..01b51a6
--- /dev/null
+++ b/SOURCES/rh1029464-settings-convert-NMDefaultWiredConnection-into-a-pla.patch
@@ -0,0 +1,710 @@
+From 49983db85eb0c4737271b27e83e70c1216419096 Mon Sep 17 00:00:00 2001
+From: Dan Williams <dcbw@redhat.com>
+Date: Tue, 12 Nov 2013 14:26:20 -0600
+Subject: [PATCH] settings: convert NMDefaultWiredConnection into a plain
+ NMSettingsConnection (rh #1029464) (bgo #712188)
+
+Changing the default wired connection has always deleted the connection
+(thus disconnecting the interface) and re-added it as a settings plugin
+connection.  That was always sub-optimal, but until the 'unsaved' connection
+stuff landed this summer, we couldn't do anything about that.  Clean
+that all up, adding the connection as an unsaved connection right from
+the start, which allows changes to the connection without having to
+delete and recreate it, thus preventing disconnection of any interface
+that is using the connection.
+
+A new signal is added to NMSettingsConnection that is only emitted when
+the connection is changed from D-Bus (thus indicating an explicit user-
+requested change) since the connection may be modified internally by
+NetworkManager.  NM-triggered changes should not result in the connection
+no longer being a default-wired connection.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=712188
+https://bugzilla.redhat.com/show_bug.cgi?id=1029464
+---
+ src/Makefile.am                            |   2 -
+ src/settings/nm-default-wired-connection.c | 190 ---------------------------
+ src/settings/nm-default-wired-connection.h |  55 --------
+ src/settings/nm-settings-connection.c      |  14 ++
+ src/settings/nm-settings-connection.h      |   3 +
+ src/settings/nm-settings.c                 | 204 ++++++++++++++---------------
+ 6 files changed, 119 insertions(+), 349 deletions(-)
+ delete mode 100644 src/settings/nm-default-wired-connection.c
+ delete mode 100644 src/settings/nm-default-wired-connection.h
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index bcac9ac..34b7339 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -159,16 +159,14 @@ nm_sources = \
+ 	\
+ 	ppp-manager/nm-ppp-manager.c \
+ 	ppp-manager/nm-ppp-manager.h \
+ 	ppp-manager/nm-ppp-status.h \
+ 	\
+ 	settings/nm-agent-manager.c \
+ 	settings/nm-agent-manager.h \
+-	settings/nm-default-wired-connection.c \
+-	settings/nm-default-wired-connection.h \
+ 	settings/nm-inotify-helper.c \
+ 	settings/nm-inotify-helper.h \
+ 	settings/nm-secret-agent.c \
+ 	settings/nm-secret-agent.h \
+ 	settings/nm-settings-connection.c \
+ 	settings/nm-settings-connection.h \
+ 	settings/nm-settings-error.c \
+diff --git a/src/settings/nm-default-wired-connection.c b/src/settings/nm-default-wired-connection.c
+deleted file mode 100644
+index 6c8ce41..0000000
+--- a/src/settings/nm-default-wired-connection.c
++++ /dev/null
+@@ -1,190 +0,0 @@
+-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+-/* NetworkManager system settings service
+- *
+- * This program is free software; you can redistribute it and/or modify
+- * it under the terms of the GNU General Public License as published by
+- * the Free Software Foundation; either version 2 of the License, or
+- * (at your option) any later version.
+- *
+- * This program is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- * GNU General Public License for more details.
+- *
+- * You should have received a copy of the GNU General Public License along
+- * with this program; if not, write to the Free Software Foundation, Inc.,
+- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+- *
+- * (C) Copyright 2008 Novell, Inc.
+- * (C) Copyright 2009 - 2011 Red Hat, Inc.
+- */
+-
+-#include "config.h"
+-
+-#include <netinet/ether.h>
+-
+-#include <NetworkManager.h>
+-#include <nm-setting-connection.h>
+-#include <nm-setting-wired.h>
+-#include <nm-utils.h>
+-
+-#include "nm-dbus-glib-types.h"
+-#include "nm-default-wired-connection.h"
+-#include "nm-device-ethernet.h"
+-
+-G_DEFINE_TYPE (NMDefaultWiredConnection, nm_default_wired_connection, NM_TYPE_SETTINGS_CONNECTION)
+-
+-#define NM_DEFAULT_WIRED_CONNECTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_DEFAULT_WIRED_CONNECTION, NMDefaultWiredConnectionPrivate))
+-
+-typedef struct {
+-	NMDevice *device;
+-} NMDefaultWiredConnectionPrivate;
+-
+-enum {
+-	TRY_UPDATE,
+-	DELETED,
+-	LAST_SIGNAL
+-};
+-
+-static guint signals[LAST_SIGNAL] = { 0 };
+-
+-/****************************************************************/
+-
+-NMDevice *
+-nm_default_wired_connection_get_device (NMDefaultWiredConnection *wired)
+-{
+-	g_return_val_if_fail (NM_IS_DEFAULT_WIRED_CONNECTION (wired), NULL);
+-
+-	return NM_DEFAULT_WIRED_CONNECTION_GET_PRIVATE (wired)->device;
+-}
+-
+-static void
+-commit_changes (NMSettingsConnection *connection,
+-                NMSettingsConnectionCommitFunc callback,
+-                gpointer user_data)
+-{
+-	NMDefaultWiredConnection *self = NM_DEFAULT_WIRED_CONNECTION (connection);
+-
+-	/* Keep the object alive over try-update since it might get removed
+-	 * from the settings service there, but we still need it for the callback.
+-	 */
+-	g_object_ref (connection);
+-	g_signal_emit (self, signals[TRY_UPDATE], 0);
+-	callback (connection, NULL, user_data);
+-	g_object_unref (connection);
+-}
+-
+-static void 
+-do_delete (NMSettingsConnection *connection,
+-	       NMSettingsConnectionDeleteFunc callback,
+-	       gpointer user_data)
+-{
+-	g_signal_emit (connection, signals[DELETED], 0);
+-	NM_SETTINGS_CONNECTION_CLASS (nm_default_wired_connection_parent_class)->delete (connection,
+-	                                                                                 callback,
+-	                                                                                 user_data);
+-}
+-
+-/****************************************************************/
+-
+-NMDefaultWiredConnection *
+-nm_default_wired_connection_new (NMDevice *device,
+-                                 const char *defname,
+-                                 gboolean read_only)
+-{
+-	NMDefaultWiredConnection *self;
+-	NMDefaultWiredConnectionPrivate *priv;
+-	NMSetting *setting;
+-	char *uuid;
+-	const guint8 *hw_address;
+-	guint len = 0;
+-	GByteArray *mac;
+-
+-	g_return_val_if_fail (NM_IS_DEVICE_ETHERNET (device), NULL);
+-	g_return_val_if_fail (defname != NULL, NULL);
+-
+-	self = (NMDefaultWiredConnection *) g_object_new (NM_TYPE_DEFAULT_WIRED_CONNECTION, NULL);
+-
+-	priv = NM_DEFAULT_WIRED_CONNECTION_GET_PRIVATE (self);
+-	priv->device = g_object_ref (device);
+-
+-	setting = nm_setting_connection_new ();
+-
+-	uuid = nm_utils_uuid_generate ();
+-	g_object_set (setting,
+-	              NM_SETTING_CONNECTION_ID, defname,
+-	              NM_SETTING_CONNECTION_TYPE, NM_SETTING_WIRED_SETTING_NAME,
+-	              NM_SETTING_CONNECTION_AUTOCONNECT, TRUE,
+-	              NM_SETTING_CONNECTION_UUID, uuid,
+-	              NM_SETTING_CONNECTION_READ_ONLY, read_only,
+-	              NM_SETTING_CONNECTION_TIMESTAMP, (guint64) time (NULL),
+-	              NULL);
+-	g_free (uuid);
+-
+-	nm_connection_add_setting (NM_CONNECTION (self), setting);
+-
+-	/* Lock the connection to the specific device */
+-	hw_address = nm_device_get_hw_address (device, &len);
+-	mac = g_byte_array_sized_new (len);
+-	g_byte_array_append (mac, hw_address, len);
+-
+-	setting = nm_setting_wired_new ();
+-	g_object_set (setting, NM_SETTING_WIRED_MAC_ADDRESS, mac, NULL);
+-	nm_connection_add_setting (NM_CONNECTION (self), setting);
+-
+-	g_byte_array_unref (mac);
+-
+-	return self;
+-}
+-
+-static void
+-nm_default_wired_connection_init (NMDefaultWiredConnection *self)
+-{
+-}
+-
+-static void
+-dispose (GObject *object)
+-{
+-	NMDefaultWiredConnectionPrivate *priv = NM_DEFAULT_WIRED_CONNECTION_GET_PRIVATE (object);
+-
+-	g_clear_object (&priv->device);
+-
+-	G_OBJECT_CLASS (nm_default_wired_connection_parent_class)->dispose (object);
+-}
+-
+-static void
+-nm_default_wired_connection_class_init (NMDefaultWiredConnectionClass *klass)
+-{
+-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
+-	NMSettingsConnectionClass *settings_class = NM_SETTINGS_CONNECTION_CLASS (klass);
+-
+-	g_type_class_add_private (klass, sizeof (NMDefaultWiredConnectionPrivate));
+-
+-	/* Virtual methods */
+-	object_class->dispose = dispose;
+-	settings_class->commit_changes = commit_changes;
+-	settings_class->delete = do_delete;
+-
+-	/* Signals */
+-	signals[TRY_UPDATE] =
+-		g_signal_new ("try-update",
+-			      G_OBJECT_CLASS_TYPE (object_class),
+-			      G_SIGNAL_RUN_LAST,
+-			      0, NULL, NULL,
+-			      g_cclosure_marshal_VOID__VOID,
+-			      G_TYPE_NONE, 0);
+-
+-	/* The 'deleted' signal is used to signal intentional deletions (like
+-	 * updating or user-requested deletion) rather than using the
+-	 * superclass' 'removed' signal, since that signal doesn't have the
+-	 * semantics we want; it gets emitted as a side-effect of various operations
+-	 * and is meant more for D-Bus clients instead of in-service uses.
+-	 */
+-	signals[DELETED] =
+-		g_signal_new ("deleted",
+-			      G_OBJECT_CLASS_TYPE (object_class),
+-			      G_SIGNAL_RUN_LAST,
+-			      0, NULL, NULL,
+-			      g_cclosure_marshal_VOID__VOID,
+-			      G_TYPE_NONE, 0);
+-}
+diff --git a/src/settings/nm-default-wired-connection.h b/src/settings/nm-default-wired-connection.h
+deleted file mode 100644
+index 3661a7b..0000000
+--- a/src/settings/nm-default-wired-connection.h
++++ /dev/null
+@@ -1,55 +0,0 @@
+-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+-/* NetworkManager system settings service
+- *
+- * This program is free software; you can redistribute it and/or modify
+- * it under the terms of the GNU General Public License as published by
+- * the Free Software Foundation; either version 2 of the License, or
+- * (at your option) any later version.
+- *
+- * This program is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- * GNU General Public License for more details.
+- *
+- * You should have received a copy of the GNU General Public License along
+- * with this program; if not, write to the Free Software Foundation, Inc.,
+- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+- *
+- * (C) Copyright 2008 Novell, Inc.
+- * (C) Copyright 2009 - 2011 Red Hat, Inc.
+- */
+-
+-#ifndef NM_DEFAULT_WIRED_CONNECTION_H
+-#define NM_DEFAULT_WIRED_CONNECTION_H
+-
+-#include "nm-settings-connection.h"
+-#include "nm-device.h"
+-
+-G_BEGIN_DECLS
+-
+-#define NM_TYPE_DEFAULT_WIRED_CONNECTION            (nm_default_wired_connection_get_type ())
+-#define NM_DEFAULT_WIRED_CONNECTION(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DEFAULT_WIRED_CONNECTION, NMDefaultWiredConnection))
+-#define NM_DEFAULT_WIRED_CONNECTION_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DEFAULT_WIRED_CONNECTION, NMDefaultWiredConnectionClass))
+-#define NM_IS_DEFAULT_WIRED_CONNECTION(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_DEFAULT_WIRED_CONNECTION))
+-#define NM_IS_DEFAULT_WIRED_CONNECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_DEFAULT_WIRED_CONNECTION))
+-#define NM_DEFAULT_WIRED_CONNECTION_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_DEFAULT_WIRED_CONNECTION, NMDefaultWiredConnectionClass))
+-
+-typedef struct {
+-	NMSettingsConnection parent;
+-} NMDefaultWiredConnection;
+-
+-typedef struct {
+-	NMSettingsConnectionClass parent;
+-} NMDefaultWiredConnectionClass;
+-
+-GType nm_default_wired_connection_get_type (void);
+-
+-NMDefaultWiredConnection *nm_default_wired_connection_new (NMDevice *device,
+-                                                           const char *defname,
+-                                                           gboolean read_only);
+-
+-NMDevice *nm_default_wired_connection_get_device (NMDefaultWiredConnection *wired);
+-
+-G_END_DECLS
+-
+-#endif /* NM_DEFAULT_WIRED_CONNECTION_H */
+diff --git a/src/settings/nm-settings-connection.c b/src/settings/nm-settings-connection.c
+index f1bc3c3..53c606f 100644
+--- a/src/settings/nm-settings-connection.c
++++ b/src/settings/nm-settings-connection.c
+@@ -79,14 +79,15 @@ enum {
+ 	PROP_VISIBLE,
+ 	PROP_UNSAVED,
+ };
+ 
+ enum {
+ 	UPDATED,
+ 	REMOVED,
++	DBUS_UPDATED,
+ 	LAST_SIGNAL
+ };
+ static guint signals[LAST_SIGNAL] = { 0 };
+ 
+ typedef struct {
+ 	gboolean disposed;
+ 
+@@ -1232,14 +1233,16 @@ con_update_cb (NMSettingsConnection *self,
+ 		 */
+ 		for_agent = nm_connection_duplicate (NM_CONNECTION (self));
+ 		nm_connection_clear_secrets_with_flags (for_agent,
+ 		                                        secrets_filter_cb,
+ 		                                        GUINT_TO_POINTER (NM_SETTING_SECRET_FLAG_AGENT_OWNED));
+ 		nm_agent_manager_save_secrets (info->agent_mgr, for_agent, TRUE, info->sender_uid);
+ 		g_object_unref (for_agent);
++
++		g_signal_emit (self, signals[DBUS_UPDATED], 0);
+ 	}
+ 
+ 	update_complete (self, info, error);
+ }
+ 
+ static void
+ update_auth_cb (NMSettingsConnection *self,
+@@ -2031,23 +2034,34 @@ nm_settings_connection_class_init (NMSettingsConnectionClass *class)
+ 		                       "TRUE when the connection has not yet been saved "
+ 		                       "to permanent storage (eg disk) or when it "
+ 		                       "has been changed but not yet saved.",
+ 		                       FALSE,
+ 		                       G_PARAM_READABLE));
+ 
+ 	/* Signals */
++
++	/* Emitted when the connection is changed for any reason */
+ 	signals[UPDATED] = 
+ 		g_signal_new (NM_SETTINGS_CONNECTION_UPDATED,
+ 		              G_TYPE_FROM_CLASS (class),
+ 		              G_SIGNAL_RUN_FIRST,
+ 		              0,
+ 		              NULL, NULL,
+ 		              g_cclosure_marshal_VOID__VOID,
+ 		              G_TYPE_NONE, 0);
+ 
++	/* Emitted when connection is changed from D-Bus */
++	signals[DBUS_UPDATED] =
++		g_signal_new (NM_SETTINGS_CONNECTION_DBUS_UPDATED,
++		              G_TYPE_FROM_CLASS (class),
++		              G_SIGNAL_RUN_FIRST,
++		              0, NULL, NULL,
++		              g_cclosure_marshal_VOID__VOID,
++		              G_TYPE_NONE, 0);
++
+ 	signals[REMOVED] = 
+ 		g_signal_new (NM_SETTINGS_CONNECTION_REMOVED,
+ 		              G_TYPE_FROM_CLASS (class),
+ 		              G_SIGNAL_RUN_FIRST,
+ 		              0,
+ 		              NULL, NULL,
+ 		              g_cclosure_marshal_VOID__VOID,
+diff --git a/src/settings/nm-settings-connection.h b/src/settings/nm-settings-connection.h
+index 8b995ab..a687ddb 100644
+--- a/src/settings/nm-settings-connection.h
++++ b/src/settings/nm-settings-connection.h
+@@ -37,14 +37,17 @@ G_BEGIN_DECLS
+ 
+ /* Signals */
+ #define NM_SETTINGS_CONNECTION_UPDATED "updated"
+ #define NM_SETTINGS_CONNECTION_REMOVED "removed"
+ #define NM_SETTINGS_CONNECTION_GET_SECRETS "get-secrets"
+ #define NM_SETTINGS_CONNECTION_CANCEL_SECRETS "cancel-secrets"
+ 
++/* Emitted when connection is changed from D-Bus */
++#define NM_SETTINGS_CONNECTION_DBUS_UPDATED "dbus-updated"
++
+ /* Properties */
+ #define NM_SETTINGS_CONNECTION_VISIBLE "visible"
+ #define NM_SETTINGS_CONNECTION_UNSAVED "unsaved"
+ 
+ typedef struct _NMSettingsConnection NMSettingsConnection;
+ typedef struct _NMSettingsConnectionClass NMSettingsConnectionClass;
+ 
+diff --git a/src/settings/nm-settings.c b/src/settings/nm-settings.c
+index 49d64d1..e384a17 100644
+--- a/src/settings/nm-settings.c
++++ b/src/settings/nm-settings.c
+@@ -54,15 +54,14 @@
+ #include <nm-utils.h>
+ 
+ #include "nm-device-ethernet.h"
+ #include "nm-dbus-glib-types.h"
+ #include "nm-settings.h"
+ #include "nm-settings-connection.h"
+ #include "nm-settings-error.h"
+-#include "nm-default-wired-connection.h"
+ #include "nm-logging.h"
+ #include "nm-dbus-manager.h"
+ #include "nm-manager-auth.h"
+ #include "nm-session-monitor.h"
+ #include "plugins/keyfile/plugin.h"
+ #include "nm-agent-manager.h"
+ #include "nm-settings-utils.h"
+@@ -874,29 +873,14 @@ claim_connection (NMSettings *self,
+ 		g_signal_emit_by_name (self, NM_CP_SIGNAL_CONNECTION_ADDED, connection);
+ 
+ 		/* Exported D-Bus signal */
+ 		g_signal_emit (self, signals[NEW_CONNECTION], 0, connection);
+ 	}
+ }
+ 
+-static void
+-remove_default_wired_connection (NMSettings *self,
+-                                 NMSettingsConnection *connection,
+-                                 gboolean do_signal)
+-{
+-	NMSettingsPrivate *priv = NM_SETTINGS_GET_PRIVATE (self);
+-	const char *path = nm_connection_get_path (NM_CONNECTION (connection));
+-
+-	if (g_hash_table_lookup (priv->connections, path)) {
+-		if (do_signal)
+-			g_signal_emit_by_name (G_OBJECT (connection), NM_SETTINGS_CONNECTION_REMOVED);
+-		g_hash_table_remove (priv->connections, path);
+-	}
+-}
+-
+ /**
+  * nm_settings_add_connection:
+  * @self: the #NMSettings object
+  * @connection: the source connection to create a new #NMSettingsConnection from
+  * @save_to_disk: %TRUE to save the connection to disk immediately, %FALSE to
+  * not save to disk
+  * @error: on return, a location to store any errors that may occur
+@@ -1483,148 +1467,164 @@ have_connection_for_device (NMSettings *self, NMDevice *device)
+ 	/* See if there's a known non-NetworkManager configuration for the device */
+ 	if (nm_device_spec_match_list (device, priv->unrecognized_specs))
+ 		return TRUE;
+ 
+ 	return FALSE;
+ }
+ 
+-#define DEFAULT_WIRED_TAG "default-wired"
++#define DEFAULT_WIRED_CONNECTION_TAG "default-wired-connection"
++#define DEFAULT_WIRED_DEVICE_TAG     "default-wired-device"
++
++static void default_wired_clear_tag (NMSettings *self,
++                                     NMDevice *device,
++                                     NMSettingsConnection *connection,
++                                     gboolean add_to_no_auto_default);
+ 
+ static void
+-default_wired_deleted (NMDefaultWiredConnection *wired,
+-                       NMSettings *self)
++default_wired_connection_removed_cb (NMSettingsConnection *connection, NMSettings *self)
+ {
+-	NMSettingsPrivate *priv = NM_SETTINGS_GET_PRIVATE (self);
+ 	NMDevice *device;
+-	NMSettingConnection *s_con;
+ 
+-	device = nm_default_wired_connection_get_device (wired);
+-	g_object_set_data (G_OBJECT (device), DEFAULT_WIRED_TAG, NULL);
+-
+-	s_con = nm_connection_get_setting_connection (NM_CONNECTION (wired));
+-	g_assert (s_con);
+-
+-	/* Ignore removals of read-only connections, since they couldn't have
+-	 * been removed by the user.
+-	 */
+-	if (nm_setting_connection_get_read_only (s_con))
+-		return;
+-
+-	/* When the default wired connection is removed (either deleted or saved
+-	 * to a new persistent connection by a plugin), write the MAC address of
+-	 * the wired device to the config file and don't create a new default wired
++	/* When the default wired connection is removed (either deleted or saved to
++	 * a new persistent connection by a plugin), write the MAC address of the
++	 * wired device to the config file and don't create a new default wired
+ 	 * connection for that device again.
+ 	 */
+-	nm_config_set_ethernet_no_auto_default (priv->config, NM_CONFIG_DEVICE (device));
++	device = g_object_get_data (G_OBJECT (connection), DEFAULT_WIRED_DEVICE_TAG);
++	if (device)
++		default_wired_clear_tag (self, device, connection, TRUE);
+ }
+ 
+ static void
+-delete_cb (NMSettingsConnection *connection, GError *error, gpointer user_data)
++default_wired_connection_dbus_updated_cb (NMSettingsConnection *connection, NMSettings *self)
+ {
+-}
+-
+-static void
+-default_wired_try_update (NMDefaultWiredConnection *wired,
+-                          NMSettings *self)
+-{
+-	GError *error = NULL;
+-	const char *id;
+-	NMSettingsConnection *added;
++	NMDevice *device;
+ 
+-	/* Try to move this default wired conneciton to a plugin so that it has
+-	 * persistent storage.
++	/* The connection has been changed by the user, it should no longer be
++	 * considered a default wired connection, and should no longer affect
++	 * the no-auto-default configuration option.
+ 	 */
++	device = g_object_get_data (G_OBJECT (connection), DEFAULT_WIRED_DEVICE_TAG);
++	if (device)
++		default_wired_clear_tag (self, device, connection, FALSE);
++}
+ 
+-	/* Keep it alive over removal so we can re-add it if we need to */
+-	g_object_ref (wired);
++static void
++default_wired_clear_tag (NMSettings *self,
++                         NMDevice *device,
++                         NMSettingsConnection *connection,
++                         gboolean add_to_no_auto_default)
++{
++	g_return_if_fail (NM_IS_SETTINGS (self));
++	g_return_if_fail (NM_IS_DEVICE (device));
++	g_return_if_fail (NM_IS_CONNECTION (connection));
++	g_return_if_fail (device == g_object_get_data (G_OBJECT (connection), DEFAULT_WIRED_DEVICE_TAG));
++	g_return_if_fail (connection == g_object_get_data (G_OBJECT (device), DEFAULT_WIRED_CONNECTION_TAG));
+ 
+-	id = nm_connection_get_id (NM_CONNECTION (wired));
+-	g_assert (id);
++	g_object_set_data (G_OBJECT (connection), DEFAULT_WIRED_DEVICE_TAG, NULL);
++	g_object_set_data (G_OBJECT (device), DEFAULT_WIRED_CONNECTION_TAG, NULL);
+ 
+-	remove_default_wired_connection (self, NM_SETTINGS_CONNECTION (wired), FALSE);
+-	added = nm_settings_add_connection (self, NM_CONNECTION (wired), TRUE, &error);
+-	if (added) {
+-		nm_settings_connection_delete (NM_SETTINGS_CONNECTION (wired), delete_cb, NULL);
++	g_signal_handlers_disconnect_by_func (connection, G_CALLBACK (default_wired_connection_removed_cb), self);
++	g_signal_handlers_disconnect_by_func (connection, G_CALLBACK (default_wired_connection_dbus_updated_cb), self);
+ 
+-		g_object_set_data (G_OBJECT (nm_default_wired_connection_get_device (wired)),
+-		                   DEFAULT_WIRED_TAG,
+-		                   NULL);
+-		nm_log_info (LOGD_SETTINGS, "Saved default wired connection '%s' to persistent storage", id);
+-	} else {
+-		nm_log_warn (LOGD_SETTINGS, "couldn't save default wired connection '%s': %d / %s",
+-			         id,
+-			         error ? error->code : -1,
+-			         (error && error->message) ? error->message : "(unknown)");
+-		g_clear_error (&error);
+-
+-		/* If there was an error, don't destroy the default wired connection,
+-		 * but add it back to the system settings service. Connection is already
+-		 * exported on the bus, don't export it again, thus do_export == FALSE.
+-		 */
+-		claim_connection (self, NM_SETTINGS_CONNECTION (wired), FALSE);
+-	}
+-
+-	g_object_unref (wired);
++	if (add_to_no_auto_default)
++		nm_config_set_ethernet_no_auto_default (NM_SETTINGS_GET_PRIVATE (self)->config, NM_CONFIG_DEVICE (device));
+ }
+ 
+ void
+ nm_settings_device_added (NMSettings *self, NMDevice *device)
+ {
+ 	NMSettingsPrivate *priv = NM_SETTINGS_GET_PRIVATE (self);
+-	NMDefaultWiredConnection *wired;
+-	gboolean read_only = TRUE;
+-	const char *id;
+-	char *defname;
++	NMConnection *connection;
++	NMSettingsConnection *added;
++	NMSetting *setting;
++	GError *error = NULL;
++	const guint8 *hw_address;
++	char *defname, *uuid;
++	guint len = 0;
++	GByteArray *mac;
+ 
+ 	if (!NM_IS_DEVICE_ETHERNET (device))
+ 		return;
+ 
+ 	/* If the device isn't managed or it already has a default wired connection,
+ 	 * ignore it.
+ 	 */
+ 	if (   !nm_device_get_managed (device)
+-	    || g_object_get_data (G_OBJECT (device), DEFAULT_WIRED_TAG)
++	    || g_object_get_data (G_OBJECT (device), DEFAULT_WIRED_CONNECTION_TAG)
+ 	    || have_connection_for_device (self, device)
+ 	    || !nm_config_get_ethernet_can_auto_default (priv->config, NM_CONFIG_DEVICE (device)))
+ 		return;
+ 
+-	if (get_plugin (self, NM_SYSTEM_CONFIG_INTERFACE_CAP_MODIFY_CONNECTIONS))
+-		read_only = FALSE;
++	hw_address = nm_device_get_hw_address (device, &len);
++	if (!hw_address)
++		return;
++
++	connection = nm_connection_new ();
++	g_assert (connection);
++	setting = nm_setting_connection_new ();
++	g_assert (setting);
++	nm_connection_add_setting (connection, setting);
+ 
+ 	defname = nm_settings_utils_get_default_wired_name (priv->connections);
+-	wired = nm_default_wired_connection_new (device, defname, read_only);
++	uuid = nm_utils_uuid_generate ();
++	g_object_set (setting,
++	              NM_SETTING_CONNECTION_ID, defname,
++	              NM_SETTING_CONNECTION_TYPE, NM_SETTING_WIRED_SETTING_NAME,
++	              NM_SETTING_CONNECTION_AUTOCONNECT, TRUE,
++	              NM_SETTING_CONNECTION_UUID, uuid,
++	              NM_SETTING_CONNECTION_TIMESTAMP, (guint64) time (NULL),
++	              NULL);
++	g_free (uuid);
+ 	g_free (defname);
+-	if (!wired)
++
++	/* Lock the connection to the device */
++	setting = nm_setting_wired_new ();
++	nm_connection_add_setting (connection, setting);
++
++	mac = g_byte_array_sized_new (len);
++	g_byte_array_append (mac, hw_address, len);
++	g_object_set (setting, NM_SETTING_WIRED_MAC_ADDRESS, mac, NULL);
++	g_byte_array_unref (mac);
++
++	/* Add the connection */
++	added = nm_settings_add_connection (self, connection, FALSE, &error);
++	g_object_unref (connection);
++
++	if (!added) {
++		nm_log_warn (LOGD_SETTINGS, "(%s) couldn't create default wired connection: %s",
++		             nm_device_get_iface (device),
++		             (error && error->message) ? error->message : "(unknown)");
++		g_clear_error (&error);
+ 		return;
++	}
+ 
+-	id = nm_connection_get_id (NM_CONNECTION (wired));
+-	g_assert (id);
++	g_object_set_data (G_OBJECT (added), DEFAULT_WIRED_DEVICE_TAG, device);
++	g_object_set_data (G_OBJECT (device), DEFAULT_WIRED_CONNECTION_TAG, added);
+ 
+-	nm_log_info (LOGD_SETTINGS, "Added default wired connection '%s' for %s",
+-	             id, nm_device_get_udi (device));
++	g_signal_connect (added, NM_SETTINGS_CONNECTION_DBUS_UPDATED,
++	                  G_CALLBACK (default_wired_connection_dbus_updated_cb), self);
++	g_signal_connect (added, NM_SETTINGS_CONNECTION_REMOVED,
++	                  G_CALLBACK (default_wired_connection_removed_cb), self);
+ 
+-	g_signal_connect (wired, "try-update", (GCallback) default_wired_try_update, self);
+-	g_signal_connect (wired, "deleted", (GCallback) default_wired_deleted, self);
+-	claim_connection (self, NM_SETTINGS_CONNECTION (wired), TRUE);
+-	g_object_unref (wired);
+-
+-	g_object_set_data (G_OBJECT (device), DEFAULT_WIRED_TAG, wired);
++	nm_log_info (LOGD_SETTINGS, "(%s): created default wired connection '%s'",
++	             nm_device_get_iface (device),
++	             nm_connection_get_id (NM_CONNECTION (added)));
+ }
+ 
+ void
+ nm_settings_device_removed (NMSettings *self, NMDevice *device)
+ {
+-	NMDefaultWiredConnection *connection;
++	NMSettingsConnection *connection;
+ 
+-	if (!NM_IS_DEVICE_ETHERNET (device))
+-		return;
+-
+-	connection = (NMDefaultWiredConnection *) g_object_get_data (G_OBJECT (device), DEFAULT_WIRED_TAG);
+-	if (connection)
+-		remove_default_wired_connection (self, NM_SETTINGS_CONNECTION (connection), TRUE);
++	connection = g_object_get_data (G_OBJECT (device), DEFAULT_WIRED_CONNECTION_TAG);
++	if (connection) {
++		default_wired_clear_tag (self, device, connection, FALSE);
++		nm_settings_connection_delete (connection, NULL, NULL);
++	}
+ }
+ 
+ /***************************************************************/
+ 
+ static gint
+ best_connection_sort (gconstpointer a, gconstpointer b, gpointer user_data)
+ {
+-- 
+1.8.3.1
+
diff --git a/SOURCES/rh1031763-0001-policy-ignore-nameservers-when-starting-lookup-threa.patch b/SOURCES/rh1031763-0001-policy-ignore-nameservers-when-starting-lookup-threa.patch
new file mode 100644
index 0000000..ab2042d
--- /dev/null
+++ b/SOURCES/rh1031763-0001-policy-ignore-nameservers-when-starting-lookup-threa.patch
@@ -0,0 +1,59 @@
+From 8d027cfe6012d001df5ba3342a3e1e75fe629088 Mon Sep 17 00:00:00 2001
+From: Dan Williams <dcbw@redhat.com>
+Date: Tue, 19 Nov 2013 19:40:28 -0600
+Subject: [PATCH 1/3] policy: ignore nameservers when starting lookup thread
+ (rh #1031763)
+
+When generating connections, we won't always have DNS information.
+Plus, the "best" device already has the default route, which is a
+pretty good indication it should be the address we use for looking
+up the hostname.
+---
+ src/nm-policy.c | 8 ++------
+ 1 file changed, 2 insertions(+), 6 deletions(-)
+
+diff --git a/src/nm-policy.c b/src/nm-policy.c
+index fe21d40..b9c915f 100644
+--- a/src/nm-policy.c
++++ b/src/nm-policy.c
+@@ -460,17 +460,15 @@ update_system_hostname (NMPolicy *policy, NMDevice *best4, NMDevice *best6)
+ 	 * bootup hostname. Start reverse DNS of the current IPv4 or IPv6 address.
+ 	 */
+ 	if (best4) {
+ 		NMIP4Config *ip4_config;
+ 		const NMPlatformIP4Address *addr4;
+ 
+ 		ip4_config = nm_device_get_ip4_config (best4);
+-		if (   !ip4_config
+-		    || (nm_ip4_config_get_num_nameservers (ip4_config) == 0)
+-		    || (nm_ip4_config_get_num_addresses (ip4_config) == 0)) {
++		if (!ip4_config || (nm_ip4_config_get_num_addresses (ip4_config) == 0)) {
+ 			/* No valid IP4 config (!!); fall back to localhost.localdomain */
+ 			_set_hostname (policy, NULL, "no IPv4 config");
+ 			return;
+ 		}
+ 
+ 		addr4 = nm_ip4_config_get_address (ip4_config, 0);
+ 		g_assert (addr4); /* checked for > 1 address above */
+@@ -478,17 +476,15 @@ update_system_hostname (NMPolicy *policy, NMDevice *best4, NMDevice *best6)
+ 		priv->lookup_addr = g_inet_address_new_from_bytes ((guint8 *) &addr4->address,
+ 		                                                     G_SOCKET_FAMILY_IPV4);
+ 	} else {
+ 		NMIP6Config *ip6_config;
+ 		const NMPlatformIP6Address *addr6;
+ 
+ 		ip6_config = nm_device_get_ip6_config (best6);
+-		if (   !ip6_config
+-		    || (nm_ip6_config_get_num_nameservers (ip6_config) == 0)
+-		    || (nm_ip6_config_get_num_addresses (ip6_config) == 0)) {
++		if (!ip6_config || (nm_ip6_config_get_num_addresses (ip6_config) == 0)) {
+ 			/* No valid IP6 config (!!); fall back to localhost.localdomain */
+ 			_set_hostname (policy, NULL, "no IPv6 config");
+ 			return;
+ 		}
+ 
+ 		addr6 = nm_ip6_config_get_address (ip6_config, 0);
+ 		g_assert (addr6); /* checked for > 1 address above */
+-- 
+1.8.3.1
+
diff --git a/SOURCES/rh1031763-0002-core-capture-DNS-configuration-from-resolv.conf-when.patch b/SOURCES/rh1031763-0002-core-capture-DNS-configuration-from-resolv.conf-when.patch
new file mode 100644
index 0000000..4db0ad8
--- /dev/null
+++ b/SOURCES/rh1031763-0002-core-capture-DNS-configuration-from-resolv.conf-when.patch
@@ -0,0 +1,676 @@
+From 00009b2a238555b6777aab79b3190a8a46df56d2 Mon Sep 17 00:00:00 2001
+From: Dan Williams <dcbw@redhat.com>
+Date: Tue, 19 Nov 2013 22:28:36 -0600
+Subject: [PATCH] core: capture DNS configuration from resolv.conf when
+ generating connections
+
+If the interface who's IP configuration is being captured has the default
+route, then read DNS servers from resolv.conf into the NMIP[4|6]Config.
+---
+ .gitignore                          |   1 +
+ src/NetworkManagerUtils.c           | 138 ++++++++++++++++++++++++++++
+ src/NetworkManagerUtils.h           |   8 ++
+ src/devices/nm-device.c             |  10 +-
+ src/nm-ip4-config.c                 |  13 ++-
+ src/nm-ip4-config.h                 |   2 +-
+ src/nm-ip6-config.c                 |  11 ++-
+ src/nm-ip6-config.h                 |   2 +-
+ src/tests/Makefile.am               |  12 ++-
+ src/tests/test-resolvconf-capture.c | 176 ++++++++++++++++++++++++++++++++++++
+ 10 files changed, 362 insertions(+), 11 deletions(-)
+ create mode 100644 src/tests/test-resolvconf-capture.c
+
+diff --git a/src/NetworkManagerUtils.c b/src/NetworkManagerUtils.c
+index c2cf5e7..5a5fb7f 100644
+--- a/src/NetworkManagerUtils.c
++++ b/src/NetworkManagerUtils.c
+@@ -21,14 +21,15 @@
+ 
+ #include <glib.h>
+ #include <errno.h>
+ #include <fcntl.h>
+ #include <string.h>
+ #include <unistd.h>
+ #include <stdlib.h>
++#include <resolv.h>
+ 
+ #include "NetworkManagerUtils.h"
+ #include "nm-utils.h"
+ #include "nm-logging.h"
+ #include "nm-device.h"
+ #include "nm-setting-connection.h"
+ #include "nm-setting-ip4-config.h"
+@@ -607,7 +608,136 @@ nm_utils_complete_generic (NMConnection *connection,
+ char *
+ nm_utils_new_vlan_name (const char *parent_iface, guint32 vlan_id)
+ {
+ 	/* Basically VLAN_NAME_TYPE_RAW_PLUS_VID_NO_PAD */
+ 	return g_strdup_printf ("%s.%d", parent_iface, vlan_id);
+ }
+ 
++static GPtrArray *
++read_nameservers (const char *test_rc_contents)
++{
++	GPtrArray *nameservers = NULL;
++	char *contents = NULL;
++	char **lines, **iter;
++	char *p;
++
++	if (test_rc_contents)
++		contents = g_strdup (test_rc_contents);
++	else {
++		if (!g_file_get_contents (_PATH_RESCONF, &contents, NULL, NULL))
++			return NULL;
++	}
++
++	nameservers = g_ptr_array_new_full (3, g_free);
++
++	lines = g_strsplit_set (contents, "\r\n", -1);
++	for (iter = lines; iter && *iter; iter++) {
++		if (!g_str_has_prefix (*iter, "nameserver"))
++			continue;
++		p = *iter + strlen ("nameserver");
++		while (g_ascii_isspace (*p))
++			p++;
++
++		g_ptr_array_add (nameservers, g_strdup (p));
++	}
++
++	g_free (contents);
++	g_strfreev (lines);
++	return nameservers;
++}
++
++#define IS_10(a)  ((ntohl (a) & 0xff000000) == 0x0a000000)
++#define IS_172(a) ((ntohl (a) & 0xfff00000) == 0xac100000)
++#define IS_192(a) ((ntohl (a) & 0xffff0000) == 0xc0a80000)
++
++/**
++ * nm_utils_capture_resolv_conf_ip4():
++ * @addresses: array of #NMPlatformIP4Address structures
++ * @nameservers: array of guint32
++ * @test_rc_contents: for testing; the contents of resolv.conf
++ *
++ * Reads all /etc/resolv.conf IPv4 nameservers and adds them to @nameservers,
++ * which checks to ensure that private-network nameservers are not added if
++ * @addresses does not contain an address in that private network.
++ */
++void
++nm_utils_capture_resolv_conf_ip4 (const GArray *addresses,
++                                  GArray *nameservers,
++                                  const char *test_rc_contents)
++{
++	GPtrArray *read_ns;
++	gboolean has_10 = FALSE, has_172 = FALSE, has_192 = FALSE;
++	guint i;
++
++	g_return_if_fail (nameservers != NULL);
++
++	read_ns = read_nameservers (test_rc_contents);
++	if (!read_ns)
++		return;
++
++	for (i = 0; addresses && i < addresses->len; i++) {
++		NMPlatformIP4Address *addr = &g_array_index (addresses, NMPlatformIP4Address, i);
++
++		if (IS_10 (addr->address))
++			has_10 = TRUE;
++		else if (IS_172 (addr->address))
++			has_172 = TRUE;
++		else if (IS_192 (addr->address))
++			has_192 = TRUE;
++	}
++
++	for (i = 0; i < read_ns->len; i++) {
++		const char *s = g_ptr_array_index (read_ns, i);
++		guint32 ns = 0;
++
++		if (!inet_pton (AF_INET, s, (void *) &ns) || !ns)
++			continue;
++
++		/* Ignore any private-network addresses that aren't in this
++		 * interface's address space.
++		 */
++		if (   (IS_10 (ns) && !has_10)
++		    || (IS_172 (ns) && !has_172)
++		    || (IS_192 (ns) && !has_192))
++			continue;
++
++		g_array_append_val (nameservers, ns);
++	}
++
++	g_ptr_array_unref (read_ns);
++}
++
++/**
++ * nm_utils_capture_resolv_conf_ip6():
++ * @addresses: array of #NMPlatformIP6Address structures
++ * @nameservers: array of struct in6_addr
++ * @test_rc_contents: for testing; the contents of resolv.conf
++ *
++ * Reads all /etc/resolv.conf IPv6 nameservers and adds them to @nameservers.
++ */
++void
++nm_utils_capture_resolv_conf_ip6 (const GArray *addresses,
++                                  GArray *nameservers,
++                                  const char *test_rc_contents)
++{
++	GPtrArray *read_ns;
++	guint i;
++
++	g_return_if_fail (nameservers != NULL);
++
++	read_ns = read_nameservers (test_rc_contents);
++	if (!read_ns)
++		return;
++
++	for (i = 0; i < read_ns->len; i++) {
++		const char *s = g_ptr_array_index (read_ns, i);
++		struct in6_addr ns = IN6ADDR_ANY_INIT;
++
++		if (!inet_pton (AF_INET6, s, (void *) &ns) || IN6_IS_ADDR_UNSPECIFIED (&ns))
++			continue;
++
++		g_array_append_val (nameservers, ns);
++	}
++
++	g_ptr_array_unref (read_ns);
++}
++
+diff --git a/src/NetworkManagerUtils.h b/src/NetworkManagerUtils.h
+index 93ec111..cd30ece 100644
+--- a/src/NetworkManagerUtils.h
++++ b/src/NetworkManagerUtils.h
+@@ -80,8 +80,16 @@ void nm_utils_complete_generic (NMConnection *connection,
+                                 const GSList *existing,
+                                 const char *format,
+                                 const char *preferred,
+                                 gboolean default_enable_ipv6);
+ 
+ char *nm_utils_new_vlan_name (const char *parent_iface, guint32 vlan_id);
+ 
++void nm_utils_capture_resolv_conf_ip4 (const GArray *addresses,
++                                       GArray *nameservers,
++                                       const char *test_rc_contents);
++
++void nm_utils_capture_resolv_conf_ip6 (const GArray *addresses,
++                                       GArray *nameservers,
++                                       const char *test_rc_contents);
++
+ #endif /* NETWORK_MANAGER_UTILS_H */
+diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
+index cc678ce..f03ecbb 100644
+--- a/src/devices/nm-device.c
++++ b/src/devices/nm-device.c
+@@ -353,15 +353,15 @@ static void cp_connection_updated (NMConnectionProvider *cp, NMConnection *conne
+ 
+ static const char *state_to_string (NMDeviceState state);
+ 
+ static void link_changed_cb (NMPlatform *platform, int ifindex, NMPlatformLink *info, NMPlatformReason reason, NMDevice *device);
+ static void check_carrier (NMDevice *device);
+ 
+ static void nm_device_queued_ip_config_change_clear (NMDevice *self);
+-static void update_ip_config (NMDevice *self, gboolean capture_dhcp);
++static void update_ip_config (NMDevice *self, gboolean initial);
+ static void device_ip_changed (NMPlatform *platform, int ifindex, gpointer platform_object, NMPlatformReason reason, gpointer user_data);
+ 
+ static void nm_device_slave_notify_enslave (NMDevice *dev, gboolean success);
+ static void nm_device_slave_notify_release (NMDevice *dev, gboolean master_failed);
+ 
+ static void addrconf6_start_with_link_ready (NMDevice *self);
+ 
+@@ -6493,44 +6493,44 @@ capture_lease_config (NMDevice *device,
+ 		if (out_ip6_config && strcmp (method, NM_SETTING_IP6_CONFIG_METHOD_AUTO) == 0) {
+ 			/* FIXME: implement find_ip6_lease_config() */
+ 		}
+ 	}
+ }
+ 
+ static void
+-update_ip_config (NMDevice *self, gboolean capture_dhcp)
++update_ip_config (NMDevice *self, gboolean initial)
+ {
+ 	NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self);
+ 	int ifindex;
+ 	gboolean linklocal6_just_completed = FALSE;
+ 
+ 	ifindex = nm_device_get_ip_ifindex (self);
+ 	if (!ifindex)
+ 		return;
+ 
+ 	/* IPv4 */
+ 	g_clear_object (&priv->ext_ip4_config);
+-	priv->ext_ip4_config = nm_ip4_config_capture (ifindex);
++	priv->ext_ip4_config = nm_ip4_config_capture (ifindex, initial);
+ 
+ 	if (priv->ext_ip4_config) {
+-		if (capture_dhcp) {
++		if (initial) {
+ 			g_clear_object (&priv->dev_ip4_config);
+ 			capture_lease_config (self, priv->ext_ip4_config, &priv->dev_ip4_config, NULL, NULL);
+ 		}
+ 		if (priv->dev_ip4_config)
+ 			nm_ip4_config_subtract (priv->ext_ip4_config, priv->dev_ip4_config);
+ 		if (priv->vpn4_config)
+ 			nm_ip4_config_subtract (priv->ext_ip4_config, priv->vpn4_config);
+ 
+ 		ip4_config_merge_and_apply (self, NULL, FALSE, NULL);
+ 	}
+ 
+ 	/* IPv6 */
+ 	g_clear_object (&priv->ext_ip6_config);
+-	priv->ext_ip6_config = nm_ip6_config_capture (ifindex);
++	priv->ext_ip6_config = nm_ip6_config_capture (ifindex, initial);
+ 	if (priv->ext_ip6_config) {
+ 
+ 		/* Check this before modifying ext_ip6_config */
+ 		linklocal6_just_completed = priv->linklocal6_timeout_id &&
+ 		                            linklocal6_config_is_ready (priv->ext_ip6_config);
+ 
+ 		if (priv->ac_ip6_config)
+diff --git a/src/nm-ip4-config.c b/src/nm-ip4-config.c
+index 5229ef9..e27a557 100644
+--- a/src/nm-ip4-config.c
++++ b/src/nm-ip4-config.c
+@@ -25,14 +25,15 @@
+ 
+ #include "libgsystem.h"
+ #include "nm-platform.h"
+ #include "nm-utils.h"
+ #include "nm-dbus-manager.h"
+ #include "nm-dbus-glib-types.h"
+ #include "nm-ip4-config-glue.h"
++#include "NetworkManagerUtils.h"
+ 
+ 
+ G_DEFINE_TYPE (NMIP4Config, nm_ip4_config, G_TYPE_OBJECT)
+ 
+ #define NM_IP4_CONFIG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_IP4_CONFIG, NMIP4ConfigPrivate))
+ 
+ typedef struct {
+@@ -121,20 +122,20 @@ static gboolean
+ routes_are_duplicate (const NMPlatformIP4Route *a, const NMPlatformIP4Route *b, gboolean consider_gateway_and_metric)
+ {
+ 	return a->network == b->network && a->plen == b->plen &&
+ 	       (!consider_gateway_and_metric || (a->gateway == b->gateway && a->metric == b->metric));
+ }
+ 
+ NMIP4Config *
+-nm_ip4_config_capture (int ifindex)
++nm_ip4_config_capture (int ifindex, gboolean capture_resolv_conf)
+ {
+ 	NMIP4Config *config;
+ 	NMIP4ConfigPrivate *priv;
+-	guint i;
+ 	gboolean gateway_changed = FALSE;
++	guint i;
+ 
+ 	/* Slaves have no IP configuration */
+ 	if (nm_platform_link_get_master (ifindex) > 0)
+ 		return NULL;
+ 
+ 	config = nm_ip4_config_new ();
+ 	priv = NM_IP4_CONFIG_GET_PRIVATE (config);
+@@ -156,14 +157,22 @@ nm_ip4_config_capture (int ifindex)
+ 			}
+ 			/* Remove the default route from the list */
+ 			g_array_remove_index (priv->routes, i);
+ 			break;
+ 		}
+ 	}
+ 
++	/* If the interface has the default route, and has IPv4 addresses, capture
++	 * nameservers from /etc/resolv.conf.
++	 */
++	if (priv->addresses->len && priv->gateway && capture_resolv_conf) {
++		nm_utils_capture_resolv_conf_ip4 (priv->addresses, priv->nameservers, NULL);
++		_NOTIFY (config, PROP_NAMESERVERS);
++	}
++
+ 	/* actually, nobody should be connected to the signal, just to be sure, notify */
+ 	_NOTIFY (config, PROP_ADDRESSES);
+ 	_NOTIFY (config, PROP_ROUTES);
+ 	if (gateway_changed)
+ 		_NOTIFY (config, PROP_GATEWAY);
+ 
+ 	return config;
+diff --git a/src/nm-ip4-config.h b/src/nm-ip4-config.h
+index 3b2b250..4ecfb76 100644
+--- a/src/nm-ip4-config.h
++++ b/src/nm-ip4-config.h
+@@ -55,15 +55,15 @@ GType nm_ip4_config_get_type (void);
+ NMIP4Config * nm_ip4_config_new (void);
+ 
+ /* D-Bus integration */
+ void nm_ip4_config_export (NMIP4Config *config);
+ const char * nm_ip4_config_get_dbus_path (const NMIP4Config *config);
+ 
+ /* Integration with nm-platform and nm-setting */
+-NMIP4Config *nm_ip4_config_capture (int ifindex);
++NMIP4Config *nm_ip4_config_capture (int ifindex, gboolean capture_resolv_conf);
+ gboolean nm_ip4_config_commit (const NMIP4Config *config, int ifindex, int priority);
+ void nm_ip4_config_merge_setting (NMIP4Config *config, NMSettingIP4Config *setting);
+ void nm_ip4_config_update_setting (const NMIP4Config *config, NMSettingIP4Config *setting);
+ 
+ /* Utility functions */
+ void nm_ip4_config_merge (NMIP4Config *dst, const NMIP4Config *src);
+ void nm_ip4_config_subtract (NMIP4Config *dst, const NMIP4Config *src);
+diff --git a/src/nm-ip6-config.c b/src/nm-ip6-config.c
+index 7522164..726e658 100644
+--- a/src/nm-ip6-config.c
++++ b/src/nm-ip6-config.c
+@@ -26,14 +26,15 @@
+ #include "nm-glib-compat.h"
+ #include "libgsystem.h"
+ #include "nm-platform.h"
+ #include "nm-utils.h"
+ #include "nm-dbus-manager.h"
+ #include "nm-dbus-glib-types.h"
+ #include "nm-ip6-config-glue.h"
++#include "NetworkManagerUtils.h"
+ 
+ G_DEFINE_TYPE (NMIP6Config, nm_ip6_config, G_TYPE_OBJECT)
+ 
+ #define NM_IP6_CONFIG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_IP6_CONFIG, NMIP6ConfigPrivate))
+ 
+ typedef struct {
+ 	char *path;
+@@ -121,15 +122,15 @@ static gboolean
+ routes_are_duplicate (const NMPlatformIP6Route *a, const NMPlatformIP6Route *b, gboolean consider_gateway_and_metric)
+ {
+ 	return IN6_ARE_ADDR_EQUAL (&a->network, &b->network) && a->plen == b->plen &&
+ 	       (!consider_gateway_and_metric || (IN6_ARE_ADDR_EQUAL (&a->gateway, &b->gateway) && a->metric == b->metric));
+ }
+ 
+ NMIP6Config *
+-nm_ip6_config_capture (int ifindex)
++nm_ip6_config_capture (int ifindex, gboolean capture_resolv_conf)
+ {
+ 	NMIP6Config *config;
+ 	NMIP6ConfigPrivate *priv;
+ 	guint i;
+ 	gboolean gateway_changed = FALSE;
+ 
+ 	/* Slaves have no IP configuration */
+@@ -156,14 +157,22 @@ nm_ip6_config_capture (int ifindex)
+ 			}
+ 			/* Remove the default route from the list */
+ 			g_array_remove_index (priv->routes, i);
+ 			break;
+ 		}
+ 	}
+ 
++	/* If the interface has the default route, and has IPv4 addresses, capture
++	 * nameservers from /etc/resolv.conf.
++	 */
++	if (priv->addresses->len && !IN6_IS_ADDR_UNSPECIFIED (&priv->gateway) && capture_resolv_conf) {
++		nm_utils_capture_resolv_conf_ip6 (priv->addresses, priv->nameservers, NULL);
++		_NOTIFY (config, PROP_NAMESERVERS);
++	}
++
+ 	/* actually, nobody should be connected to the signal, just to be sure, notify */
+ 	_NOTIFY (config, PROP_ADDRESSES);
+ 	_NOTIFY (config, PROP_ROUTES);
+ 	if (gateway_changed)
+ 		_NOTIFY (config, PROP_GATEWAY);
+ 
+ 	return config;
+diff --git a/src/nm-ip6-config.h b/src/nm-ip6-config.h
+index 538490a..2b1ba8b 100644
+--- a/src/nm-ip6-config.h
++++ b/src/nm-ip6-config.h
+@@ -54,15 +54,15 @@ GType nm_ip6_config_get_type (void);
+ NMIP6Config * nm_ip6_config_new (void);
+ 
+ /* D-Bus integration */
+ void nm_ip6_config_export (NMIP6Config *config);
+ const char * nm_ip6_config_get_dbus_path (const NMIP6Config *config);
+ 
+ /* Integration with nm-platform and nm-setting */
+-NMIP6Config *nm_ip6_config_capture (int ifindex);
++NMIP6Config *nm_ip6_config_capture (int ifindex, gboolean initial);
+ gboolean nm_ip6_config_commit (const NMIP6Config *config, int ifindex, int priority);
+ void nm_ip6_config_merge_setting (NMIP6Config *config, NMSettingIP6Config *setting);
+ void nm_ip6_config_update_setting (const NMIP6Config *config, NMSettingIP6Config *setting);
+ 
+ /* Utility functions */
+ void nm_ip6_config_merge (NMIP6Config *dst, const NMIP6Config *src);
+ void nm_ip6_config_subtract (NMIP6Config *dst, const NMIP6Config *src);
+diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
+index 9d17e9a..eaa9d51 100644
+--- a/src/tests/Makefile.am
++++ b/src/tests/Makefile.am
+@@ -12,15 +12,16 @@ AM_CPPFLAGS = \
+ 
+ noinst_PROGRAMS = \
+ 	test-dhcp-options \
+ 	test-policy-hosts \
+ 	test-wifi-ap-utils \
+ 	test-ip4-config \
+ 	test-ip6-config \
+-	test-dcb
++	test-dcb \
++	test-resolvconf-capture
+ 
+ ####### DHCP options test #######
+ 
+ test_dhcp_options_SOURCES = \
+ 	test-dhcp-options.c
+ 
+ test_dhcp_options_CPPFLAGS = \
+@@ -67,21 +68,30 @@ test_ip6_config_LDADD = \
+ 
+ test_dcb_SOURCES = \
+ 	test-dcb.c
+ 
+ test_dcb_LDADD = \
+ 	$(top_builddir)/src/libNetworkManager.la
+ 
++####### resolv.conf capture test #######
++
++test_resolvconf_capture_SOURCES = \
++	test-resolvconf-capture.c
++
++test_resolvconf_capture_LDADD = \
++	$(top_builddir)/src/libNetworkManager.la
++
+ ####### secret agent interface test #######
+ 
+ EXTRA_DIST = test-secret-agent.py
+ 
+ ###########################################
+ 
+ check-local: test-dhcp-options test-policy-hosts test-wifi-ap-utils test-ip4-config test-ip6-config
+ 	$(abs_builddir)/test-dhcp-options
+ 	$(abs_builddir)/test-policy-hosts
+ 	$(abs_builddir)/test-wifi-ap-utils
+ 	$(abs_builddir)/test-ip4-config
+ 	$(abs_builddir)/test-ip6-config
+ 	$(abs_builddir)/test-dcb
++	$(abs_builddir)/test-resolvconf-capture
+ 
+diff --git a/src/tests/test-resolvconf-capture.c b/src/tests/test-resolvconf-capture.c
+new file mode 100644
+index 0000000..0343d17
+--- /dev/null
++++ b/src/tests/test-resolvconf-capture.c
+@@ -0,0 +1,176 @@
++/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
++/*
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2, or (at your option)
++ * any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License along
++ * with this program; if not, write to the Free Software Foundation, Inc.,
++ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ * Copyright (C) 2013 Red Hat, Inc.
++ *
++ */
++
++#include <glib.h>
++#include <string.h>
++
++#include "NetworkManagerUtils.h"
++#include "nm-platform.h"
++
++static void
++test_capture_empty (void)
++{
++	GArray *ns4 = g_array_new (FALSE, FALSE, sizeof (guint32));
++	GArray *ns6 = g_array_new (FALSE, FALSE, sizeof (struct in6_addr));
++
++	nm_utils_capture_resolv_conf_ip4 (NULL, ns4, "");
++	g_assert_cmpint (ns4->len, ==, 0);
++
++	nm_utils_capture_resolv_conf_ip6 (NULL, ns6, "");
++	g_assert_cmpint (ns6->len, ==, 0);
++
++	g_array_free (ns4, TRUE);
++	g_array_free (ns6, TRUE);
++}
++
++static void
++assert_dns4_entry (const GArray *a, guint i, const char *s)
++{
++	guint32 n, m;
++
++	g_assert (inet_aton (s, (void *) &n) != 0);
++	m = g_array_index (a, guint32, i);
++	g_assert_cmpint (m, ==, n);
++}
++
++static void
++assert_dns6_entry (const GArray *a, guint i, const char *s)
++{
++	struct in6_addr n = IN6ADDR_ANY_INIT;
++	struct in6_addr *m;
++
++	g_assert (inet_pton (AF_INET6, s, (void *) &n) == 1);
++	m = &g_array_index (a, struct in6_addr, i);
++	g_assert (IN6_ARE_ADDR_EQUAL (&n, m));
++}
++
++static void
++test_capture_basic4 (void)
++{
++	GArray *ns4 = g_array_new (FALSE, FALSE, sizeof (guint32));
++	const char *rc =
++"# neato resolv.conf\r\n"
++"domain foobar.com\r\n"
++"search foobar.com\r\n"
++"nameserver 4.2.2.1\r\n"
++"nameserver 4.2.2.2\r\n"
++"nameserver 192.168.1.1\r\n";
++
++	nm_utils_capture_resolv_conf_ip4 (NULL, ns4, rc);
++	g_assert_cmpint (ns4->len, ==, 2);
++	assert_dns4_entry (ns4, 0, "4.2.2.1");
++	assert_dns4_entry (ns4, 1, "4.2.2.2");
++	/* 192.x not present because no addresses given */
++
++	g_array_free (ns4, TRUE);
++}
++
++static void
++test_capture_basic6 (void)
++{
++	GArray *ns6 = g_array_new (FALSE, FALSE, sizeof (struct in6_addr));
++	const char *rc =
++"# neato resolv.conf\r\n"
++"domain foobar.com\r\n"
++"search foobar.com\r\n"
++"nameserver 2001:4860:4860::8888\r\n"
++"nameserver 2001:4860:4860::8844\r\n";
++
++	nm_utils_capture_resolv_conf_ip6 (NULL, ns6, rc);
++	g_assert_cmpint (ns6->len, ==, 2);
++	assert_dns6_entry (ns6, 0, "2001:4860:4860::8888");
++	assert_dns6_entry (ns6, 1, "2001:4860:4860::8844");
++
++	g_array_free (ns6, TRUE);
++}
++
++static void
++test_capture_private_net4 (void)
++{
++	GArray *ns4 = g_array_new (FALSE, FALSE, sizeof (guint32));
++	const char *rc =
++"# neato resolv.conf\r\n"
++"domain foobar.com\r\n"
++"search foobar.com\r\n"
++"nameserver 4.2.2.1\r\n"
++"nameserver 4.2.2.2\r\n"
++"nameserver 10.2.3.4\r\n"
++"nameserver 172.17.6.3\r\n"
++"nameserver 192.168.1.1\r\n";
++	GArray *addrs = g_array_new (FALSE, FALSE, sizeof (NMPlatformIP4Address));
++	NMPlatformIP4Address a, *b;
++
++	memset (&a, 0, sizeof (a));
++	a.address = htonl (0x0a000006);
++	a.plen = 8;
++	g_array_append_val (addrs, a);
++
++	/* 10.x test */
++	nm_utils_capture_resolv_conf_ip4 (addrs, ns4, rc);
++	g_assert_cmpint (ns4->len, ==, 3);
++	assert_dns4_entry (ns4, 0, "4.2.2.1");
++	assert_dns4_entry (ns4, 1, "4.2.2.2");
++	assert_dns4_entry (ns4, 2, "10.2.3.4");
++
++	/* 172.x test */
++	b = &g_array_index (addrs, NMPlatformIP4Address, 0);
++	b->address = htonl (0xac100003);
++
++	g_array_set_size (ns4, 0);
++	nm_utils_capture_resolv_conf_ip4 (addrs, ns4, rc);
++	g_assert_cmpint (ns4->len, ==, 3);
++	assert_dns4_entry (ns4, 0, "4.2.2.1");
++	assert_dns4_entry (ns4, 1, "4.2.2.2");
++	assert_dns4_entry (ns4, 2, "172.17.6.3");
++
++	/* 192.x test */
++	b = &g_array_index (addrs, NMPlatformIP4Address, 0);
++	b->address = htonl (0xc0a80010);
++
++	g_array_set_size (ns4, 0);
++	nm_utils_capture_resolv_conf_ip4 (addrs, ns4, rc);
++	g_assert_cmpint (ns4->len, ==, 3);
++	assert_dns4_entry (ns4, 0, "4.2.2.1");
++	assert_dns4_entry (ns4, 1, "4.2.2.2");
++	assert_dns4_entry (ns4, 2, "192.168.1.1");
++
++	g_array_free (ns4, TRUE);
++	g_array_free (addrs, TRUE);
++}
++
++/*******************************************/
++
++int
++main (int argc, char **argv)
++{
++	g_test_init (&argc, &argv, NULL);
++
++#if !GLIB_CHECK_VERSION (2,36,0)
++	g_type_init ();
++#endif
++
++	g_test_add_func ("/resolvconf-capture/empty", test_capture_empty);
++	g_test_add_func ("/resolvconf-capture/basic4", test_capture_basic4);
++	g_test_add_func ("/resolvconf-capture/basic6", test_capture_basic6);
++	g_test_add_func ("/resolvconf-capture/private-net4", test_capture_private_net4);
++
++	return g_test_run ();
++}
++
+-- 
+1.8.3.1
+
diff --git a/SOURCES/rh1031763-0003-core-don-t-leave-additional-default-routes-in-captur.patch b/SOURCES/rh1031763-0003-core-don-t-leave-additional-default-routes-in-captur.patch
new file mode 100644
index 0000000..c960c56
--- /dev/null
+++ b/SOURCES/rh1031763-0003-core-don-t-leave-additional-default-routes-in-captur.patch
@@ -0,0 +1,73 @@
+From 05a82a948877c62fb624c3b681fa95c9f26c26e4 Mon Sep 17 00:00:00 2001
+From: Dan Williams <dcbw@redhat.com>
+Date: Tue, 19 Nov 2013 22:51:29 -0600
+Subject: [PATCH 3/3] core: don't leave additional default routes in captured
+ IP config
+
+There can be multiple defualt routes for an interface with different
+metrics.  Only accept the first one, otherwise the rest get left in
+the IPv4 config and could be applied at random times.
+---
+ src/nm-ip4-config.c | 4 ++--
+ src/nm-ip6-config.c | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/nm-ip4-config.c b/src/nm-ip4-config.c
+index e27a557..aa4bfd5 100644
+--- a/src/nm-ip4-config.c
++++ b/src/nm-ip4-config.c
+@@ -147,21 +147,21 @@ nm_ip4_config_capture (int ifindex, gboolean capture_resolv_conf)
+ 	priv->routes = nm_platform_ip4_route_get_all (ifindex, TRUE);
+ 
+ 	/* Extract gateway from default route */
+ 	for (i = 0; i < priv->routes->len; i++) {
+ 		const NMPlatformIP4Route *route = &g_array_index (priv->routes, NMPlatformIP4Route, i);
+ 
+ 		if (route->network == 0) {
+-			if (priv->gateway != route->gateway) {
++			if (!gateway_changed && (priv->gateway != route->gateway)) {
+ 				priv->gateway = route->gateway;
+ 				gateway_changed = TRUE;
+ 			}
+ 			/* Remove the default route from the list */
+ 			g_array_remove_index (priv->routes, i);
+-			break;
++			i--;
+ 		}
+ 	}
+ 
+ 	/* If the interface has the default route, and has IPv4 addresses, capture
+ 	 * nameservers from /etc/resolv.conf.
+ 	 */
+ 	if (priv->addresses->len && priv->gateway && capture_resolv_conf) {
+diff --git a/src/nm-ip6-config.c b/src/nm-ip6-config.c
+index 726e658..08ac43a 100644
+--- a/src/nm-ip6-config.c
++++ b/src/nm-ip6-config.c
+@@ -147,21 +147,21 @@ nm_ip6_config_capture (int ifindex, gboolean capture_resolv_conf)
+ 	priv->routes = nm_platform_ip6_route_get_all (ifindex, TRUE);
+ 
+ 	/* Extract gateway from default route */
+ 	for (i = 0; i < priv->routes->len; i++) {
+ 		const NMPlatformIP6Route *route = &g_array_index (priv->routes, NMPlatformIP6Route, i);
+ 
+ 		if (IN6_IS_ADDR_UNSPECIFIED (&route->network)) {
+-			if (!IN6_ARE_ADDR_EQUAL (&priv->gateway, &route->gateway)) {
++			if (!gateway_changed && !IN6_ARE_ADDR_EQUAL (&priv->gateway, &route->gateway)) {
+ 				priv->gateway = route->gateway;
+ 				gateway_changed = TRUE;
+ 			}
+ 			/* Remove the default route from the list */
+ 			g_array_remove_index (priv->routes, i);
+-			break;
++			i--;
+ 		}
+ 	}
+ 
+ 	/* If the interface has the default route, and has IPv4 addresses, capture
+ 	 * nameservers from /etc/resolv.conf.
+ 	 */
+ 	if (priv->addresses->len && !IN6_IS_ADDR_UNSPECIFIED (&priv->gateway) && capture_resolv_conf) {
+-- 
+1.8.3.1
+
diff --git a/SOURCES/rh1031794-no-touch-loopback.patch b/SOURCES/rh1031794-no-touch-loopback.patch
new file mode 100644
index 0000000..fd9803f
--- /dev/null
+++ b/SOURCES/rh1031794-no-touch-loopback.patch
@@ -0,0 +1,160 @@
+From 46a7760ead2841d0a8ad5468bae8042b44af7aa2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ji=C5=99=C3=AD=20Klime=C5=A1?= <jklimes@redhat.com>
+Date: Wed, 20 Nov 2013 18:05:01 +0100
+Subject: [PATCH 1/2] core: do not generate a connection for loopback interface
+ (rh #1032594)
+
+Else loopback is managed, and could be easily disconnected, which causes various
+issues with applications. So do not manage it for now, to be on the safer side.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1032594
+---
+ src/nm-manager.c | 19 ++++++++++---------
+ 1 file changed, 10 insertions(+), 9 deletions(-)
+
+diff --git a/src/nm-manager.c b/src/nm-manager.c
+index bf03084..adb8d72 100644
+--- a/src/nm-manager.c
++++ b/src/nm-manager.c
+@@ -147,15 +147,15 @@ static void bluez_manager_bdaddr_added_cb (NMBluezManager *bluez_mgr,
+                                            NMManager *manager);
+ 
+ static void bluez_manager_bdaddr_removed_cb (NMBluezManager *bluez_mgr,
+                                              const char *bdaddr,
+                                              const char *object_path,
+                                              gpointer user_data);
+ 
+-static void add_device (NMManager *self, NMDevice *device, gboolean nm_created);
++static void add_device (NMManager *self, NMDevice *device, gboolean generate_con);
+ static void remove_device (NMManager *self, NMDevice *device, gboolean quitting);
+ 
+ static void hostname_provider_init (NMHostnameProvider *provider_class);
+ 
+ static NMActiveConnection *_new_active_connection (NMManager *self,
+                                                    NMConnection *connection,
+                                                    const char *specific_object,
+@@ -577,15 +577,15 @@ modem_added (NMModemManager *modem_manager,
+ 		nm_log_info (LOGD_MB, "ignoring modem '%s' (no associated Bluetooth device)", modem_iface);
+ 		return;
+ 	}
+ 
+ 	/* Make the new modem device */
+ 	device = nm_device_modem_new (modem, driver);
+ 	if (device)
+-		add_device (self, device, TRUE);
++		add_device (self, device, FALSE);
+ }
+ 
+ static void
+ set_state (NMManager *manager, NMState state)
+ {
+ 	NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE (manager);
+ 	const char *state_str;
+@@ -1184,15 +1184,15 @@ system_create_virtual_device (NMManager *self, NMConnection *connection)
+ 		device = nm_device_vlan_new_for_connection (connection, parent);
+ 	} else if (nm_connection_is_type (connection, NM_SETTING_INFINIBAND_SETTING_NAME)) {
+ 		device = nm_device_infiniband_new_partition (connection, parent);
+ 	}
+ 
+ 	if (device) {
+ 		nm_device_set_is_nm_owned (device, TRUE);
+-		add_device (self, device, TRUE);
++		add_device (self, device, FALSE);
+ 	}
+ 
+ 	g_signal_handlers_unblock_by_func (nm_platform_get (), G_CALLBACK (platform_link_added_cb), self);
+ 
+ out:
+ 	g_free (iface);
+ 	return device;
+@@ -1765,15 +1765,15 @@ get_existing_connection (NMManager *manager, NMDevice *device)
+ 	}
+ 	g_object_unref (connection);
+ 
+ 	return added ? NM_CONNECTION (added) : NULL;
+ }
+ 
+ static void
+-add_device (NMManager *self, NMDevice *device, gboolean nm_created)
++add_device (NMManager *self, NMDevice *device, gboolean generate_con)
+ {
+ 	NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE (self);
+ 	const char *iface, *driver, *type_desc;
+ 	char *path;
+ 	static guint32 devcount = 0;
+ 	const GSList *unmanaged_specs;
+ 	NMConnection *connection = NULL;
+@@ -1858,16 +1858,17 @@ add_device (NMManager *self, NMDevice *device, gboolean nm_created)
+ 
+ 	path = g_strdup_printf ("/org/freedesktop/NetworkManager/Devices/%d", devcount++);
+ 	nm_device_set_path (device, path);
+ 	nm_dbus_manager_register_object (priv->dbus_mgr, path, device);
+ 	nm_log_info (LOGD_CORE, "(%s): exported as %s", iface, path);
+ 	g_free (path);
+ 
+-	/* Don't bother generating a connection for devices NM just created */
+-	if (!nm_created)
++	/* Don't generate a connection e.g. for devices NM just created, or
++	 * for the loopback */
++	if (generate_con)
+ 		connection = get_existing_connection (self, device);
+ 
+ 	/* Start the device if it's supposed to be managed */
+ 	unmanaged_specs = nm_settings_get_unmanaged_specs (priv->settings);
+ 	if (   !manager_sleeping (self)
+ 	    && !nm_device_spec_match_list (device, unmanaged_specs)) {
+ 		nm_device_set_manager_managed (device,
+@@ -1959,15 +1960,15 @@ bluez_manager_bdaddr_added_cb (NMBluezManager *bluez_mgr,
+ 		nm_log_info (LOGD_HW, "BT device %s (%s) added (%s%s%s)",
+ 		             name,
+ 		             bdaddr,
+ 		             has_dun ? "DUN" : "",
+ 		             has_dun && has_nap ? " " : "",
+ 		             has_nap ? "NAP" : "");
+ 
+-		add_device (manager, device, TRUE);
++		add_device (manager, device, FALSE);
+ 	}
+ }
+ 
+ static void
+ bluez_manager_bdaddr_removed_cb (NMBluezManager *bluez_mgr,
+                                  const char *bdaddr,
+                                  const char *object_path,
+@@ -2259,15 +2260,15 @@ platform_link_added_cb (NMPlatform *platform,
+ 		default:
+ 			device = nm_device_generic_new (plink);
+ 			break;
+ 		}
+ 	}
+ 
+ 	if (device)
+-		add_device (self, device, FALSE);
++		add_device (self, device, plink->type != NM_LINK_TYPE_LOOPBACK);
+ }
+ 
+ static void
+ platform_link_removed_cb (NMPlatform *platform,
+                           int ifindex,
+                           NMPlatformLink *plink,
+                           NMPlatformReason reason,
+@@ -2296,15 +2297,15 @@ atm_device_added_cb (NMAtmManager *atm_mgr,
+ 
+ 	device = find_device_by_iface (self, iface);
+ 	if (device)
+ 		return;
+ 
+ 	device = nm_device_adsl_new (sysfs_path, iface, driver);
+ 	if (device)
+-		add_device (self, device, FALSE);
++		add_device (self, device, TRUE);
+ }
+ 
+ static void
+ atm_device_removed_cb (NMAtmManager *manager,
+                        const char *iface,
+                        gpointer user_data)
+ {
+-- 
+1.8.3.1
+
diff --git a/SOURCES/rh997998-core-fix-re-activation-of-existing-active-connection.patch b/SOURCES/rh997998-core-fix-re-activation-of-existing-active-connection.patch
new file mode 100644
index 0000000..d6d3c1e
--- /dev/null
+++ b/SOURCES/rh997998-core-fix-re-activation-of-existing-active-connection.patch
@@ -0,0 +1,57 @@
+From 3c236c88ebe396cff6ca492f1cc1cf1c30ed0e8c Mon Sep 17 00:00:00 2001
+From: Dan Winship <danw@gnome.org>
+Date: Tue, 12 Nov 2013 14:18:44 -0500
+Subject: [PATCH] core: fix re-activation of existing active connection
+
+The change to allow an NMConnection to only be active on a single
+device accidentally broke the case of re-activating a connection on
+the same device. Fix that.
+---
+ src/nm-manager.c | 15 +++++++++------
+ 1 file changed, 9 insertions(+), 6 deletions(-)
+
+diff --git a/src/nm-manager.c b/src/nm-manager.c
+index 7555930..039a606 100644
+--- a/src/nm-manager.c
++++ b/src/nm-manager.c
+@@ -2890,28 +2890,31 @@ _new_active_connection (NMManager *self,
+ 	NMActiveConnection *existing_ac;
+ 
+ 	g_return_val_if_fail (NM_IS_CONNECTION (connection), NULL);
+ 	g_return_val_if_fail (NM_IS_AUTH_SUBJECT (subject), NULL);
+ 
+ 	/* Can't create new AC for already-active connection */
+ 	existing_ac = find_ac_for_connection (self, connection);
++	if (NM_IS_VPN_CONNECTION (existing_ac)) {
++		g_set_error (error, NM_MANAGER_ERROR, NM_MANAGER_ERROR_CONNECTION_ALREADY_ACTIVE,
++		             "Connection '%s' is already active",
++		             nm_connection_get_id (connection));
++		return NULL;
++	}
++
+ 	if (existing_ac) {
+ 		NMDevice *existing_device = nm_active_connection_get_device (existing_ac);
+ 
+-		if (NM_IS_VPN_CONNECTION (existing_ac) || existing_device == device) {
+-			g_set_error (error, NM_MANAGER_ERROR, NM_MANAGER_ERROR_CONNECTION_ALREADY_ACTIVE,
+-			             "Connection '%s' is already active",
+-			             nm_connection_get_id (connection));
+-		} else {
++		if (existing_device != device) {
+ 			g_set_error (error, NM_MANAGER_ERROR, NM_MANAGER_ERROR_CONNECTION_ALREADY_ACTIVE,
+ 			             "Connection '%s' is already active on %s",
+ 			             nm_connection_get_id (connection),
+ 			             nm_device_get_iface (existing_device));
++			return NULL;
+ 		}
+-		return NULL;
+ 	}
+ 
+ 	/* Normalize the specific object */
+ 	if (specific_object && g_strcmp0 (specific_object, "/") == 0)
+ 		specific_object = NULL;
+ 
+ 	if (nm_connection_is_type (connection, NM_SETTING_VPN_SETTING_NAME)) {
+-- 
+1.8.3.1
+
diff --git a/SPECS/NetworkManager.spec b/SPECS/NetworkManager.spec
new file mode 100644
index 0000000..f8de643
--- /dev/null
+++ b/SPECS/NetworkManager.spec
@@ -0,0 +1,2421 @@
+%define dbus_version 1.1
+%define dbus_glib_version 0.94
+
+%define glib2_version	2.24.0
+%define libnl3_version 3.2.7
+%define ppp_version 2.4.5
+
+%define snapshot .git20131108
+%define realversion 0.9.9.0
+
+%define nmtui_version 0.0.1
+
+%global regen_docs 0
+
+%define systemd_dir %{_prefix}/lib/systemd/system
+%define udev_dir %{_prefix}/lib/udev
+
+%global _hardened_build 1
+
+Name: NetworkManager
+Summary: Network connection manager and user applications
+Epoch: 1
+Version: 0.9.9.0
+Release: 25%{snapshot}%{?dist}
+Group: System Environment/Base
+License: GPLv2+
+URL: http://www.gnome.org/projects/NetworkManager/
+
+Source: %{name}-%{realversion}%{snapshot}.tar.bz2
+Source1: NetworkManager.conf
+Source2: 00-server.conf
+Source3: nmtui-%{nmtui_version}.tar.xz
+Patch1: explain-dns1-dns2.patch
+Patch2: 0001-fix-build-with-newt-0.52.15.patch
+Patch3: rh1029464-settings-convert-NMDefaultWiredConnection-into-a-pla.patch
+Patch4: rh997998-core-fix-re-activation-of-existing-active-connection.patch
+
+Patch5: rh1031763-0001-policy-ignore-nameservers-when-starting-lookup-threa.patch
+Patch6: rh1031763-0002-core-capture-DNS-configuration-from-resolv.conf-when.patch
+Patch7: rh1031763-0003-core-don-t-leave-additional-default-routes-in-captur.patch
+
+Patch8: rh1031794-no-touch-loopback.patch
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Requires(post): systemd-sysv
+Requires(post): systemd
+Requires(preun): systemd
+Requires(postun): systemd
+
+Requires: dbus >= %{dbus_version}
+Requires: dbus-glib >= %{dbus_glib_version}
+Requires: glib2 >= %{glib2_version}
+Requires: iproute
+Requires: dhclient >= 12:4.1.0
+Requires: wpa_supplicant >= 1:0.7.3-1
+Requires: libnl3 >= %{libnl3_version}
+Requires: %{name}-glib%{?_isa} = %{epoch}:%{version}-%{release}
+Requires: ppp = %{ppp_version}
+Requires: avahi-autoipd
+Requires: dnsmasq
+Requires: udev
+Requires: iptables
+Obsoletes: dhcdbd
+
+Conflicts: NetworkManager-vpnc < 1:0.7.0.99-1
+Conflicts: NetworkManager-openvpn < 1:0.7.0.99-1
+Conflicts: NetworkManager-pptp < 1:0.7.0.99-1
+Conflicts: NetworkManager-openconnect < 0:0.7.0.99-1
+Conflicts: kde-plasma-networkmanagement < 1:0.9-0.49.20110527git.nm09
+
+BuildRequires: dbus-devel >= %{dbus_version}
+BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
+%if 0%{?fedora}
+BuildRequires: wireless-tools-devel >= 1:28-0pre9
+%endif
+BuildRequires: glib2-devel >= %{glib2_version}
+BuildRequires: gobject-introspection-devel >= 0.10.3
+BuildRequires: gettext-devel
+BuildRequires: /usr/bin/autopoint
+BuildRequires: pkgconfig
+BuildRequires: wpa_supplicant
+BuildRequires: libnl3-devel >= %{libnl3_version}
+BuildRequires: perl(XML::Parser)
+BuildRequires: automake autoconf intltool libtool
+BuildRequires: ppp = %{ppp_version}
+BuildRequires: ppp-devel = %{ppp_version}
+BuildRequires: nss-devel >= 3.11.7
+BuildRequires: polkit-devel
+BuildRequires: dhclient
+%if %{regen_docs}
+BuildRequires: gtk-doc
+%endif
+BuildRequires: libudev-devel
+BuildRequires: libuuid-devel
+BuildRequires: libgudev1-devel >= 143
+BuildRequires: vala-tools
+BuildRequires: iptables
+BuildRequires: systemd >= 200-3 systemd-devel
+BuildRequires: libsoup-devel
+BuildRequires: libndp-devel >= 1.0
+BuildRequires: ModemManager-glib-devel >= 1.0
+BuildRequires: newt-devel
+BuildRequires: teamd-devel
+
+%description
+NetworkManager is a system network service that manages your network devices
+and connections, attempting to keep active network connectivity when available.
+It manages ethernet, WiFi, mobile broadband (WWAN), and PPPoE devices, and
+provides VPN integration with a variety of different VPN services.
+
+
+%package devel
+Summary: Libraries and headers for adding NetworkManager support to applications
+Group: Development/Libraries
+Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release}
+Requires: dbus-devel >= %{dbus_version}
+Requires: dbus-glib >= %{dbus_glib_version}
+Requires: pkgconfig
+
+%description devel
+This package contains various headers accessing some NetworkManager functionality
+from applications.
+
+
+%package glib
+Summary: Libraries for adding NetworkManager support to applications that use glib.
+Group: Development/Libraries
+Requires: dbus >= %{dbus_version}
+Requires: dbus-glib >= %{dbus_glib_version}
+
+%description glib
+This package contains the libraries that make it easier to use some NetworkManager
+functionality from applications that use glib.
+
+
+%package glib-devel
+Summary: Header files for adding NetworkManager support to applications that use glib.
+Group: Development/Libraries
+Requires: %{name}-devel%{?_isa} = %{epoch}:%{version}-%{release}
+Requires: %{name}-glib%{?_isa} = %{epoch}:%{version}-%{release}
+Requires: glib2-devel
+Requires: pkgconfig
+Requires: dbus-glib-devel >= %{dbus_glib_version}
+
+%description glib-devel
+This package contains the header and pkg-config files for development applications using
+NetworkManager functionality from applications that use glib.
+
+%package config-server
+Summary: NetworkManager config file for "server-like" defaults
+Group: System Environment/Base
+Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release}
+
+%description config-server
+This adds a NetworkManager configuration file to make it behave more
+like the old "network" service. In particular, it stops NetworkManager
+from automatically running DHCP on unconfigured ethernet devices, and
+allows connections with static IP addresses to be brought up even on
+ethernet devices with no carrier.
+
+This package is intended to be installed by default for server
+deployments.
+
+%package tui
+Summary: NetworkManager curses-based UI
+Group: System Environment/Base
+Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release}
+Requires: %{name}-glib%{?_isa} = %{epoch}:%{version}-%{release}
+
+%description tui
+This adds a curses-based "TUI" (Text User Interface) to
+NetworkManager, to allow performing some of the operations supported
+by nm-connection-editor and nm-applet in a non-graphical environment.
+
+%prep
+%setup -q -n NetworkManager-%{realversion}
+
+# nmtui
+tar -xf %{SOURCE3}
+
+%patch1 -p1 -b .explain-dns1-dns2
+%patch2 -p1 -b .newt
+%patch3 -p1 -b .rh1029464-settings-default-wired
+%patch4 -p1 -b .rh997998-reactivate
+
+%patch5 -p1 -b .rh1031763-1
+%patch6 -p1 -b .rh1031763-2
+%patch7 -p1 -b .rh1031763-3
+
+%patch8 -p1 -b .loopback
+
+%build
+
+%if %{regen_docs}
+# back up pristine docs and use them instead of generated ones, which make
+# multilib unhappy due to different timestamps in the generated content
+%{__cp} -R docs ORIG-docs
+%endif
+
+#autopoint --force
+#intltoolize --force
+%configure \
+	--disable-static \
+	--with-dhclient=yes \
+	--with-dhcpcd=no \
+	--with-crypto=nss \
+	--enable-more-warnings=error \
+	--enable-ppp=yes \
+	--with-modem-manager-1=yes \
+%if 0%{?fedora}
+	--enable-bluez4=no \
+%else
+%if 0%{?rhel}
+	--enable-bluez4=yes \
+%endif
+%endif
+	--enable-wimax=no \
+	--enable-vala=yes \
+%if %{regen_docs}
+	--enable-gtk-doc \
+%endif
+%if 0%{?fedora}
+	--with-wext=yes \
+%else
+	--with-wext=no \
+%endif
+	--enable-polkit=yes \
+	--enable-modify-system=yes \
+	--enable-concheck \
+	--with-session-tracking=systemd \
+	--with-suspend-resume=systemd \
+	--with-systemdsystemunitdir=%{systemd_dir} \
+	--with-udev-dir=%{udev_dir} \
+	--with-system-ca-path=/etc/pki/tls/certs \
+	--with-tests=yes \
+	--with-valgrind=no \
+	--enable-ifcfg-rh=yes \
+	--with-system-libndp=yes \
+	--with-pppd-plugin-dir=%{_libdir}/pppd/%{ppp_version} \
+	--with-dist-version=%{version}-%{release}
+
+make %{?_smp_mflags}
+
+# nmtui
+pushd nmtui-%{nmtui_version}
+	NETWORKMANAGER_CFLAGS='-I$(top_builddir)/../include -I$(top_builddir)/../libnm-util -I$(top_builddir)/../libnm-glib `pkg-config --cflags gio-2.0 dbus-glib-1`'
+	export NETWORKMANAGER_CFLAGS
+	NETWORKMANAGER_LIBS='-L$(top_builddir)/../libnm-util/.libs -L$(top_builddir)/../libnm-glib/.libs -lnm-util -lnm-glib `pkg-config --libs gio-2.0 dbus-glib-1`'
+	export NETWORKMANAGER_LIBS
+	%configure
+	make %{?_smp_mflags}
+popd
+
+%install
+%{__rm} -rf $RPM_BUILD_ROOT
+
+# install NM
+make install DESTDIR=$RPM_BUILD_ROOT
+
+%{__cp} %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/
+
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/conf.d
+%{__cp} %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/conf.d
+
+# create a VPN directory
+%{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/NetworkManager/VPN
+
+# create a keyfile plugin system settings directory
+%{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/NetworkManager/system-connections
+
+# create a dnsmasq.d directory
+%{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/NetworkManager/dnsmasq.d
+
+%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/gnome-vpn-properties
+
+%{__mkdir_p} $RPM_BUILD_ROOT%{_localstatedir}/lib/NetworkManager
+
+%find_lang %{name}
+
+%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/*.la
+%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/pppd/%{ppp_version}/*.la
+%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/NetworkManager/*.la
+
+install -m 0755 test/.libs/nm-online %{buildroot}/%{_bindir}
+
+%if %{regen_docs}
+# install the pristine docs
+%{__cp} ORIG-docs/libnm-glib/html/* $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/libnm-glib/
+%{__cp} ORIG-docs/libnm-util/html/* $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/libnm-util/
+%endif
+
+mkdir -p $RPM_BUILD_ROOT%{systemd_dir}/network-online.target.wants
+ln -s ../NetworkManager-wait-online.service $RPM_BUILD_ROOT%{systemd_dir}/network-online.target.wants
+
+# install nmtui
+pushd nmtui-%{nmtui_version}
+	make install DESTDIR=$RPM_BUILD_ROOT
+popd
+
+%clean
+%{__rm} -rf $RPM_BUILD_ROOT
+
+
+%post
+%systemd_post NetworkManager.service NetworkManager-wait-online.service NetworkManager-dispatcher.service
+
+%preun
+if [ $1 -eq 0 ]; then
+    # Package removal, not upgrade
+    /bin/systemctl --no-reload disable NetworkManager.service >/dev/null 2>&1 || :
+
+    # Don't kill networking entirely just on package remove
+    #/bin/systemctl stop NetworkManager.service >/dev/null 2>&1 || :
+fi
+%systemd_preun NetworkManager-wait-online.service NetworkManager-dispatcher.service
+
+%postun
+%systemd_postun
+
+
+%post	glib -p /sbin/ldconfig
+%postun	glib -p /sbin/ldconfig
+
+
+%files -f %{name}.lang
+%defattr(-,root,root,0755)
+%doc COPYING NEWS AUTHORS README CONTRIBUTING TODO
+%{_sysconfdir}/dbus-1/system.d/org.freedesktop.NetworkManager.conf
+%{_sysconfdir}/dbus-1/system.d/nm-avahi-autoipd.conf
+%{_sysconfdir}/dbus-1/system.d/nm-dispatcher.conf
+%{_sysconfdir}/dbus-1/system.d/nm-ifcfg-rh.conf
+%{_sbindir}/%{name}
+%{_bindir}/nmcli
+%{_datadir}/bash-completion/completions/nmcli
+%dir %{_sysconfdir}/%{name}/
+%dir %{_sysconfdir}/%{name}/dispatcher.d
+%dir %{_sysconfdir}/%{name}/dnsmasq.d
+%dir %{_sysconfdir}/%{name}/VPN
+%config(noreplace) %{_sysconfdir}/%{name}/NetworkManager.conf
+%{_bindir}/nm-online
+%{_libexecdir}/nm-dhcp-helper
+%{_libexecdir}/nm-avahi-autoipd.action
+%{_libexecdir}/nm-dispatcher.action
+%dir %{_libdir}/NetworkManager
+%{_libdir}/NetworkManager/libnm-settings-plugin*.so
+%{_mandir}/man1/*
+%{_mandir}/man5/*
+%{_mandir}/man8/*
+%dir %{_localstatedir}/lib/NetworkManager
+%dir %{_sysconfdir}/NetworkManager/system-connections
+%{_datadir}/dbus-1/system-services/org.freedesktop.NetworkManager.service
+%{_datadir}/dbus-1/system-services/org.freedesktop.nm_dispatcher.service
+%{_libdir}/pppd/%{ppp_version}/nm-pppd-plugin.so
+%{_datadir}/polkit-1/actions/*.policy
+%{udev_dir}/rules.d/*.rules
+# systemd stuff
+%{systemd_dir}/NetworkManager.service
+%{systemd_dir}/NetworkManager-wait-online.service
+%{systemd_dir}/NetworkManager-dispatcher.service
+%{systemd_dir}/network-online.target.wants/NetworkManager-wait-online.service
+%{_datadir}/doc/NetworkManager/examples/server.conf
+
+%files devel
+%defattr(-,root,root,0755)
+%doc ChangeLog docs/api/html/*
+%dir %{_includedir}/%{name}
+%{_includedir}/%{name}/%{name}.h
+%{_includedir}/%{name}/NetworkManagerVPN.h
+%{_includedir}/%{name}/nm-version.h
+%{_libdir}/pkgconfig/%{name}.pc
+%dir %{_datadir}/gtk-doc/html/NetworkManager
+%{_datadir}/gtk-doc/html/NetworkManager/*
+%{_datadir}/vala/vapi/*.deps
+%{_datadir}/vala/vapi/*.vapi
+
+%files glib
+%defattr(-,root,root,0755)
+%{_libdir}/libnm-glib.so.*
+%{_libdir}/libnm-glib-vpn.so.*
+%{_libdir}/libnm-util.so.*
+%{_libdir}/girepository-1.0/NetworkManager-1.0.typelib
+%{_libdir}/girepository-1.0/NMClient-1.0.typelib
+
+%files glib-devel
+%defattr(-,root,root,0755)
+%dir %{_includedir}/libnm-glib
+%{_includedir}/libnm-glib/*.h
+%{_includedir}/%{name}/nm-setting*.h
+%{_includedir}/%{name}/nm-connection.h
+%{_includedir}/%{name}/nm-utils-enum-types.h
+%{_includedir}/%{name}/nm-utils.h
+%{_libdir}/pkgconfig/libnm-glib.pc
+%{_libdir}/pkgconfig/libnm-glib-vpn.pc
+%{_libdir}/pkgconfig/libnm-util.pc
+%{_libdir}/libnm-glib.so
+%{_libdir}/libnm-glib-vpn.so
+%{_libdir}/libnm-util.so
+%{_datadir}/gir-1.0/NetworkManager-1.0.gir
+%{_datadir}/gir-1.0/NMClient-1.0.gir
+%dir %{_datadir}/gtk-doc/html/libnm-glib
+%{_datadir}/gtk-doc/html/libnm-glib/*
+%dir %{_datadir}/gtk-doc/html/libnm-util
+%{_datadir}/gtk-doc/html/libnm-util/*
+
+%files config-server
+%defattr(-,root,root,0755)
+%config %{_sysconfdir}/%{name}/conf.d/00-server.conf
+
+%files tui
+%{_bindir}/nmtui-edit
+
+%changelog
+* Thu Nov 21 2013 Dan Williams <dcbw@redhat.com> - 0.9.9.0-25.git20131108
+- core: stop touching the loopback device (rh #1031794)
+
+* Tue Nov 19 2013 Dan Williams <dcbw@redhat.com> - 0.9.9.0-24.git20131108
+- core: read DNS information when reading initial interface configurations (rh #1031763)
+
+* Tue Nov 19 2013 Dan Williams <dcbw@redhat.com> - 0.9.9.0-23.git20131108
+- core: run reverse-DNS hostname lookups even if IP config has no DNS servers (rh #1031763)
+
+* Wed Nov 13 2013 Dan Williams <dcbw@redhat.com> - 0.9.9.0-22.git20131108
+- core: allow same connection reactivations on the same device (rh #997998)
+
+* Wed Nov 13 2013 Dan Williams <dcbw@redhat.com> - 0.9.9.0-21.git20131108
+- core: fix default wired connection changes causing disconnection (rh #1029464)
+
+* Fri Nov  8 2013 Dan Williams <dcbw@redhat.com> - 0.9.9.0-20.git20131108
+- core: fix possible crash with WiFi (rh #1025371)
+- core: fix crash cleaning up Team devices
+
+* Fri Nov  8 2013 Dan Williams <dcbw@redhat.com> - 0.9.9.0-19.git20131108
+- core: fix various issues with ignore-carrier configuration (rh #1018403)
+- core: improve handling of NPAR/SRIOV devices in bonds (rh #804527)
+- ifcfg-rh: fix crash when reading connection (rh #1025007)
+- core: better handling of unrecognized connections (rh #1022256)
+- cli: add 'nmcli dev connect eth0' functionality (rh #961543)
+- core: add support for DCB/FCoE configuration (rh #799241)
+- cli: add 'activate' menu command for interactive editor (rh #1004883)
+- core: fix segfault when setting default IPv6 route for VPNs (rh #1019021)
+- core: track autoconnect for software devices that are removed (rh #1005913)
+- ifcfg-rh: always read and write static IP addresses (rh #998135)
+- cli: copy remove connection to local one on save (rh #997958)
+- core: don't crash when no DHCP client is available (rh #1015809)
+- libnm-glib: fix crash in nm_client_new() (rh #1010288)
+
+* Tue Nov  5 2013 Dan Winship <danw@redhat.com> - 0.9.9.0-18.git20131011
+- Add an explicit versioned NM-glib requirement to NM-tui, per rpmdiff
+
+* Wed Oct 30 2013 Dan Winship <danw@redhat.com> - 0.9.9.0-17.git20131011
+- Add NetworkManager-tui package with the (still-alpha) curses UI (rh #1025021)
+
+* Fri Oct 11 2013 Dan Williams <dcbw@redhat.com> - 0.9.9.0-16.git20131011
+- core: fix IPv4 addressing when IPv6 is disabled at boot time (rh #1012151)
+- ifcfg-rh: fix handling of default routes in route6 files (rh #991807)
+- core: fix PropertiesChanged signals for IP-related properties
+- ifcfg-rh: make minimal ifcfg file handling consistent with initscripts
+
+* Fri Oct  4 2013 Dan Williams <dcbw@redhat.com> - 0.9.9.0-15.git20131004
+- core: add support for 'primary' bond option (rh #1013727)
+- cli: fix creation of Dynamic WEP configurations (rh #1005171)
+
+* Thu Oct  3 2013 Dan Williams <dcbw@redhat.com> - 0.9.9.0-14.git20131003
+- core: fix DHCPv6 address prefix length (rh #1013583)
+- cli: enhance bonding questionaire (rh #1007355)
+- core: fix crash with Bluez5 if PAN connection is not defined (rh #1014770)
+- libnm-glib: fix various memory leaks that could cause UIs to mis-report state
+- core: fix issues with mis-configured IPv6 router advertisements (rh #1008104)
+- cli: fix potential crash editing connections (rh #1011942)
+- core: fix crash deactivating team devices (rh #1013593)
+
+* Tue Oct  1 2013 Dan Winship <danw@redhat.com> - 0.9.9.0-13.git20131001
+- core: fix bridge device creation (#1012532)
+- core,settings: do not call functions with connection==NULL (rh #1008151)
+- cli: accept gateway in the IP questionnaire of 'nmcli -a con add' (rh #1007368)
+- cli: always print success message (not only in --pretty mode) (rh #1006444)
+- cli: fix bond questionnaire to be able to set miimon (rh #1007355)
+- ifcfg-rh: if IPv4 is disabled put DNS domains (DOMAIN) into IPv6 (rh #1004866)
+- platform: fix a crash when nm_platform_sysctl_get() returns NULL (rh #1010522)
+- platform: fix InfiniBand partition handling (rh #1008568)
+- infiniband: only check the last 8 bytes when doing hwaddr matches (rh #1008566)
+- bluez: merge adding support for BlueZ 5 (bgo #701078)
+- api: clarify lifetime and behavior of ActiveConnection's SpecificObject property (rh #1012309)
+- vpn: fix connecting to VPN (bgo #708255) (rh #1014716)
+- rdisc: do not crash on NDP init failures (rh #1012151)
+- cli: be more verbose when adding IP addresses in questionnaire (rh #1006450)
+- team: chain up parent dispose() in NMDeviceTeam dispose() (rh #1013593)
+- translation updates
+
+* Fri Sep 20 2013 Bill Nottingham <notting@redhat.com> - 0.9.9.0-12.git20130913
+- drop wimax subpackage
+
+* Fri Sep 13 2013 Dan Williams <dcbw@redhat.com> - 0.9.9.0-11.git20130913
+- core: actually enable ModemManager 1.0 support
+- libnm-glib: fix nm_remote_connection_delete() not calling callback (rh #997568)
+- cli: ensure terminal is reset after quitting
+- cli: set wep-key-type properly when editing (rh #1003945)
+- man: fix typo in nmcli examples manpage (rh #1004117)
+- core: fix setting VLAN ingress/egress mappings
+- core: allow creating VLANs from interfaces other than Ethernet (rh #1003180)
+- cli: fix input/output format conversion (rh #998929)
+
+* Fri Sep  6 2013 Dan Williams <dcbw@redhat.com> - 0.9.9.0-10.git20130906
+- core: fix bug which disallowed deleting connections (rh #997568)
+- core: add support for Team devices
+- core: enable NetworkManager-wait-online by default (rh #816655)
+- core: fix crash when 'gre' and 'macvlan' links change (rh #997396)
+- core: fail activation when invalid static routes are configured (rh #999544)
+- core: enhance connectivity checking to include portal detection
+- core: allow hyphens for MAC addresses (rh #1002553)
+- core: remove NetworkManager-created software devices when they are deactivated (rh #953300)
+- core: fix handling of some DHCP client identifiers (rh #999503)
+- core: correctly handle Open vSwitch interfaces as generic interfaces (rh #1004356)
+- core: better handle Layer-2-only connections (rh #979288)
+- cli: enhanced bash completion
+- cli: make the 'describe' command more visible (rh #998002)
+- cli: fix bug rejecting changes to Wi-Fi channels (rh #999999)
+- cli: update bash completion to suggest connection names (rh #997997)
+- cli: fix tab completion for aliases in edit mode
+- cli: ask whether to switch IP method to 'auto' when all addresses are deleted (rh #998137)
+- cli: request missing information when --ask is passed (rh #953291)
+- cli: add 'remove' command to edit mode
+- cli: fix creation of secure Wi-Fi connections (rh #997969) (rh #997555)
+- cli: default autoconnect to no and ask whether to activate on save (rh #953296)
+- man: clarify manpage text (rh #960071) (rh #953299)
+- man: fix errors in the nmcli help output and manpage (rh #997566)
+- ifcfg-rh: only write IPV6_DEFAULTGW when there's actually a default gateway (rh #997759)
+- ifcfg-rh: fix handling of legacy-format routes file with missing gateway
+
+* Wed Aug  7 2013 Dan Williams <dcbw@redhat.com> - 0.9.9.0-9.git20130807
+- core: fix assert on multi-hop routes (rh #989022)
+- core: fix dispatcher systemd unit enabling (rh #948433)
+- ifcfg-rh: ignore emacs temporary lockfiles (rh #987629)
+- core: fix various routing issues and interaction with kernel events
+- cli: confirm saving connections when autoconnect is enabled (rh #953296)
+- cli: automatically change method when static IP addresses are added
+- core: preserve externally added IPv4 routes and addresses
+
+* Thu Jul 25 2013 Dan Winship <danw@redhat.com> - 0.9.9.0-8.git20130724
+- Create NetworkManager-config-server package
+
+* Wed Jul 24 2013 Dan Williams <dcbw@redhat.com> - 0.9.9.0-7.git20130724
+- Update to git snapshot
+
+* Tue Jul  2 2013 Dan Winship <danw@redhat.com> - 0.9.9.0-6
+- Belatedly update udev directory for UsrMove
+- Fix incorrect dates in old changelog entries to avoid rpm warnings
+
+* Wed Jun 26 2013 Dan Winship <danw@redhat.com> - 0.9.9.0-5
+- build support for connectivity checking (rh #810457)
+
+* Tue Jun 25 2013 Jiří Klimeš <jklimes@redhat.com> - 0.9.9.0-4.git20130603
+- disable building WiMax for RHEL
+
+* Mon Jun  3 2013 Dan Williams <dcbw@redhat.com> - 0.9.9.0-3.git20130603
+- Update to new 0.9.10 snapshot
+
+* Wed May 15 2013 Dan Williams <dcbw@redhat.com> - 0.9.9.0-2.git20130515
+- Update for systemd network-online.target (rh #787314)
+- Add system service for the script dispatcher (rh #948433)
+
+* Tue May 14 2013 Dan Williams <dcbw@redhat.com> - 0.9.9.0-1.git20130514
+- Enable hardened build
+- Update to 0.9.10 snapshot
+- cli: new capabilities and somewhat re-arranged syntax
+- core: generic interface support
+- core: split config support; new "server mode" options
+- core: allow locking connections to interface names
+
+* Tue May  7 2013 Dan Williams <dcbw@redhat.com> - 0.9.8.1-2.git20130507
+- core: fix issue with UI not showing disconnected on rfkill
+- core: memory leak fixes
+- core: silence warning about failure reading permanent MAC address (rh #907912)
+- core: wait up to 120s for slow-connecting modems
+- core: don't crash on PPPoE connections without a wired setting
+- core: ensure the AvailableConnections property is always correct
+- keyfile: ensure all-default VLAN connections are read correctly
+- core: suppress kernel's automatic creation of bond0 (rh #953466)
+- libnm-glib: make NMSecretAgent usable with GObject Introspection
+- libnm-util: fix GObject Introspection annotations of nm_connection_need_secrets()
+- core: documentation updates
+
+* Wed Mar 27 2013 Dan Williams <dcbw@redhat.com> - 0.9.8.1-1.git20130327
+- Update to 0.9.8.2 snapshot
+- core: fix VLAN parent handling when identified by UUID
+- core: quiet warning about invalid interface index (rh #920145)
+- core: request 'static-routes' from DHCP servers (rh #922558)
+- core: fix crash when dbus-daemon is restarted (rh #918273)
+- core: copy leasefiles from /var/lib/dhclient to fix netboot (rh #916233)
+- core: memory leak and potential crash fixes
+- ifcfg-rh: ensure missing STP property is interpreted as off (rh #922702)
+
+* Wed Feb 27 2013 Jiří Klimeš <jklimes@redhat.com> - 0.9.8.0-1
+- Update to the 0.9.8.0 release
+- cli: fix a possible crash
+
+* Sat Feb  9 2013 Dan Williams <dcbw@redhat.com> - 0.9.7.997-2
+- core: use systemd for suspend/resume, not upower
+
+* Fri Feb  8 2013 Dan Williams <dcbw@redhat.com> - 0.9.7.997-1
+- Update to 0.9.8-beta2
+- core: ignore bridges managed by other tools (rh #905035)
+- core: fix libnl assert (rh #894653)
+- wifi: always use Proactive Key Caching with WPA Enterprise (rh #834444)
+- core: don't crash when Internet connection sharing fails to start (rh #883142)
+
+* Fri Jan  4 2013 Dan Winship <danw@redhat.com> - 0.9.7.0-12.git20121004
+- Set correct systemd KillMode to fix anaconda shutdown hangs (rh #876218)
+
+* Tue Dec 18 2012 Jiří Klimeš <jklimes@redhat.com> - 0.9.7.0-11.git20121004
+- ifcfg-rh: write missing IPv6 setting as IPv6 with "auto" method (rh #830434)
+
+* Wed Dec  5 2012 Dan Winship <danw@redhat.com> - 0.9.7.0-10.git20121004
+- Build vapi files and add them to the devel package
+
+* Wed Dec  5 2012 Dan Winship <danw@redhat.com> - 0.9.7.0-9.git20121004
+- Apply patch from master to read hostname from /etc/hostname (rh #831735)
+
+* Tue Nov 27 2012 Jiří Klimeš <jklimes@redhat.com> - 0.9.7.0-8.git20121004
+- Apply patch from master to update hostname (rh #875085)
+- spec: create /etc/NetworkManager/dnsmasq.d (rh #873621)
+
+* Tue Nov 27 2012 Daniel Drake <dsd@laptop.org> - 0.9.7.0-7.git20121004
+- Don't bring up uninitialized devices (fd #56929)
+
+* Mon Oct 15 2012 Dan Winship <danw@redhat.com> - 0.9.7.0-6.git20121004
+- Actually apply the patch from the previous commit...
+
+* Mon Oct 15 2012 Dan Winship <danw@redhat.com> - 0.9.7.0-5.git20121004
+- Apply patch from master to fix a crash (rh #865009)
+
+* Sat Oct  6 2012 Dan Winship <danw@redhat.com> - 0.9.7.0-4.git20121004
+- Apply patch from master so connections finish connecting properly (bgo #685581)
+
+* Fri Oct  5 2012 Dan Williams <dcbw@redhat.com> - 0.9.7.0-3.git20121004
+- Forward-port some forgotten fixes from F17
+- Fix networked-filesystem systemd dependencies (rh #787314)
+- Don't restart NM on upgrade, don't stop NM on uninstall (rh #811200)
+
+* Thu Oct  4 2012 Dan Winship <danw@redhat.com> - 0.9.7.0-2.git20121004
+- Update to git snapshot
+
+* Tue Aug 21 2012 Dan Winship <danw@redhat.com> - 0.9.7.0-1.git20120820
+- Update to 0.9.7.0 snapshot
+
+* Fri Jul 27 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:0.9.5.96-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Mon Jul 23 2012 Dan Williams <dcbw@redhat.com> - 0.9.5.96-1
+- Update to 0.9.6-rc2
+- core: fix race between parallel DHCP client invocations
+- core: suppress a useless warning (rh #840580)
+- ifcfg-rh: fix segfault with malformed values (rh #841391)
+- ifcfg-rh: ignore IP config on bond slave configurations (rh #838907)
+
+* Fri Jul 13 2012 Jiří Klimeš <jklimes@redhat.com> - 0.9.5.95-1.git20120713
+- Update to 0.9.5.95 (0.9.6-rc1) snapshot
+- core: add autoconnect, driver-versioni and firmware-version properties to NMDevice
+- core: various IPv6 improvements
+- core: reduce number of changes made to DNS information during connection setup
+- core: add Vala language bindings
+- vpn: support IPv6 over VPNs
+- wifi: add on-demand WiFi scan support
+
+* Mon May 21 2012 Jiří Klimeš <jklimes@redhat.com> - 0.9.4-5.git20120521
+- Update to git snapshot
+
+* Tue May  8 2012 Dan Winship <danw@redhat.com> - 0.9.4-4.git20120502
+- NM no longer uses /var/run/NetworkManager, so don't claim to own it.
+  (rh #656638)
+
+* Wed May  2 2012 Jiří Klimeš <jklimes@redhat.com> - 0.9.4-3.git20120502%{?dist}
+- Update to git snapshot
+
+* Wed Mar 28 2012 Colin Walters <walters@verbum.org> - 1:0.9.4-2.git20120328_2%{?dist}
+- Add _isa for internal requires; otherwise depsolving may pull in an
+  arbitrary architecture.
+
+* Wed Mar 28 2012 Jiří Klimeš <jklimes@redhat.com> - 0.9.4-1.git20120328_2
+- Update to 0.9.4
+
+* Mon Mar 19 2012 Dan Williams <dcbw@redhat.com> - 0.9.3.997-2
+- libnm-glib: updated for new symbols the applet wants
+
+* Mon Mar 19 2012 Dan Williams <dcbw@redhat.com> - 0.9.3.997-1
+- applet: move to network-manager-applet RPM
+- editor: move to nm-connection-editor RPM
+- libnm-gtk: move to libnm-gtk RPM
+
+* Mon Mar 19 2012 Dan Williams <dcbw@redhat.com> - 0.9.3.997-0.7
+- Update to 0.9.3.997 (0.9.4-rc1)
+- core: fix possible WiFi hang when connecting to Ad-Hoc networks
+- core: enhanced IPv6 compatibility
+- core: proxy DNSSEC data when using the 'dnsmasq' caching nameserver plugin
+- core: allow VPNs to specify multiple domain names given by the server
+- core: fix an issue creating new InfiniBand connections
+- core/applet/editor: disable WiFi Ad-Hoc WPA connections until kernel bugs are fixed
+
+* Wed Mar 14 2012 Dan Williams <dcbw@redhat.com> - 0.9.3.995-0.6
+- core: fix issue with carrier changes not being recognized (rh #800690)
+- editor: warn user if CA certificate is left blank
+
+* Tue Mar 13 2012 Dan Williams <dcbw@redhat.com> - 0.9.3.995-0.5
+- core: fix a crash with ipw2200 devices and adhoc networks
+- core: fix IPv6 addressing on newer kernels
+- core: fix issue with VPN plugin passwords (rh #802540)
+- cli: enhancements for Bonding, VLAN, and OLPC mesh devices
+- ifcfg-rh: fix quoting WPA passphrases that include quotes (rh #798102)
+- libnm-glib: fix some issues with duplicate devices shown in menus
+
+* Fri Mar  2 2012 Dan Williams <dcbw@redhat.com> - 0.9.3.995-0.4
+- Update to 0.9.3.995 (0.9.4-beta1)
+- core: add support for bonding and VLAN interfaces
+- core: add support for Internet connectivity detection
+- core: add support for IPv6 Privacy Extensions
+- core: fix interaction with firewalld restarts
+
+* Thu Mar  1 2012 Dan Horák <dan[at]danny.cz> - 0.9.3-0.3
+- disable WiMAX plugin on s390(x)
+
+* Thu Feb 16 2012 Dan Williams <dcbw@redhat.com> - 0.9.3-0.2
+- Put WiMAX plugin files in the right subpackage
+
+* Wed Feb 15 2012 Dan Williams <dcbw@redhat.com> - 0.9.3-0.1
+- Update to 0.9.4 snapshot
+- wimax: enable optional support for Intel WiMAX devices
+- core: use nl80211 for WiFi device control
+- core: add basic support for Infiniband IP interfaces
+- core: add basic support for bonded interfaces
+- core: in-process IP configuration no longer blocks connected state
+
+* Thu Jan 19 2012 Matthias Clasen <mclasen@redhat.com> - 0.9.2-4
+- Rebuild
+
+* Thu Jan 12 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:0.9.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Thu Nov 24 2011 Daniel Drake <dsd@laptop.org> - 0.9.2-2
+- Rebuild for libgnome-bluetooth.so.9
+
+* Wed Nov 09 2011 Dan Williams <dcbw@redhat.com> - 0.9.2-1
+- core: fix possible crash when talking to ModemManager
+- core: improve handling of rfkill on some machines (eeepc 1005HA and others)
+- ifcfg-rh: don't use spaces in ifcfg file names (rh #742273)
+- core: accept IPv6 Router Advertisements when forwarding is on
+- core: bump dnsmasq cache size to 400 entries
+- core: ensure IPv6 static routes are flushed when device is deactivated
+- ifcfg-rh: fix changing WPA connections to WEP
+- core: fix setting hostname from DHCP (rh #719100)
+- libnm-glib: fix various GObject introspection issues (rh #747302)
+- core: don't change routing or DNS if no devices are managed
+- core: ensure IPv6 RA-provided routes are honored
+
+* Wed Nov  9 2011 Adam Williamson <awilliam@redhat.com> - 1:0.9.1.90-5.git20110927
+- Rebuilt for glibc (rh #747377)
+- core: fix setting hostname from DHCP options (rh #719100)
+- skip a release to keep up with F16
+
+* Tue Sep 27 2011 Dan Williams <dcbw@redhat.com> - 0.9.1.90-3.git20110927
+- core: fix location of wifi.ui (rh #741448)
+
+* Tue Sep 27 2011 Jiří Klimeš <jklimes@redhat.com> - 0.9.1.90-2.git20110927
+- core: ifcfg-rh: remove newlines when writing to ifcfg files (CVE-2011-3364) (rh #737338)
+- core: change iscsiadm path to /sbin/iscsiadm in ifcfg-rh plugin (rh #740753)
+- core: fix refcounting when deleting a default wired connection (lp:797868)
+
+* Mon Sep 19 2011 Dan Williams <dcbw@redhat.com> - 0.9.1.90-1
+- Update to 0.9.1.90 (0.9.2-beta1)
+- core: fix IPv6 link-local DNS servers in the dnsmasq DNS plugin
+- cli: add ability to delete connections
+- keyfile: fix an issue with duplicated keyfile connections
+- core: ensure the 'novj' option is passed through to pppd
+- core: store timestamps for VPN connections too (rh #725353)
+
+* Fri Sep  9 2011 Tom Callaway <spot@fedoraproject.org> - 0.9.0-2
+- fix systemd scriptlets and trigger
+
+* Tue Aug 23 2011 Dan Williams <dcbw@redhat.com> - 0.9.0-1
+- Update to 0.9 release
+- core: fix issue where scan results could be ignored
+- core: ensure agent secrets are preserved when updating connections
+- core: don't autoconnect disabled modems
+- core: fix race when checking modem enabled/disabled status after disabling
+- core: ensure newly installed VPN plugins can actually talk to NM
+- core: add support for 802.1X certificate subject matching
+- libnm-glib: various introspection fixes
+- applet/editor: updated translations
+
+* Fri Aug 05 2011 Ray Strode <rstrode@redhat.com> 0.8.9997-7.git20110721
+- Add some patches for some blocker (rh #727501)
+
+* Thu Jul 21 2011 Dan Williams <dcbw@redhat.com> - 0.8.9997-6.git20110721
+- core: updated Russian translation (rh #652904)
+- core: fix possible crash if secrets are missing
+- core: append interface name for IPv6 link-local DNS server addresses (rh #720001)
+- core: fix setting hostname from DHCP options (rh #719100)
+- libnm-util: GObject introspection annotation fixes
+- libnm-util: ensure IP address/route prefixes are valid
+- ifcfg-rh: read anonymous identity for 802.1x PEAP connections (rh #708436)
+- applet: show notifications on CDMA home/roaming changes
+- applet: fix various issues saving VPN secrets
+- editor: allow exporting VPN secrets
+- editor: default to IPv6 "automatic" addressing mode
+
+* Sat Jul  2 2011 Dan Williams <dcbw@redhat.com> - 0.8.9997-5.git20110702
+- core: ensure users are authorized for shared wifi connections (CVE-2011-2176) (rh #715492)
+- core: retry failed connections after 5 minute timeout
+- core: immediately request new 802.1x 'always ask' passwords if they fail
+- core: add MAC blacklisting capability for WiFi and Wired connections
+- core: retry failed connections when new users log in (rh #706204)
+- applet: updated translations
+- core: drop compat interface now that KDE bits are updated to NM 0.9 API
+
+* Mon Jun 20 2011 Dan Williams <dcbw@redhat.com> - 0.8.9997-4.git20110620
+- core: don't cache "(none)" hostname at startup (rh #706094)
+- core: fix handling of VPN connections with only system-owned secrets
+- core: fix optional waiting for networking at startup behavior (rh #710502)
+- ifcfg-rh: fix possible crashes in error cases
+- ifcfg-rh: fix various IPv4 and IPv6 handling issues
+- applet: add notifications of GSM mobile broadband registration status
+- editor: move secrets when making connections available to all users or private
+- applet: don't show irrelevant options when asking for passwords
+
+* Mon Jun 13 2011 Dan Williams <dcbw@redhat.com> - 0.8.9997-3.git20110613
+- keyfile: better handling of missing certificates/private keys
+- core: fix issues handling "always-ask" wired and WiFi 802.1x connections (rh #703785)
+- core: fix automatic handling of hidden WiFi networks (rh #707406)
+- editor: fix possible crash after reading network connections (rh #706906)
+- editor: make Enter/Return key close WiFi password dialogs (rh #708666)
+
+* Fri Jun  3 2011 Dan Williams <dcbw@redhat.com> - 0.8.9997-2.git20110531
+- Bump for CVE-2011-1943 (no changes, only a rebuild)
+
+* Tue May 31 2011 Dan Williams <dcbw@redhat.com> - 0.8.9997-1.git20110531
+- editor: fix resizing of UI elements (rh #707269)
+- core: retry wired connections when cable is replugged
+- core: fix a few warnings and remove some left-over debugging code
+
+* Thu May 26 2011 Dan Williams <dcbw@redhat.com> - 0.8.999-3.git20110526
+- compat: fix activation/deactivation of VPN connections (rh #699786)
+- core: fix autodetection of previously-used hidden wifi networks
+- core: silence error if ConsoleKit database does not yet exist (rh #695617)
+- core: fix Ad-Hoc frequency handling (rh #699203)
+- core: fixes for migrated OpenConnect VPN plugin connections
+- core: various fixes for VPN connection secrets handling
+- core: send only short hostname to DHCP servers (rh #694758)
+- core: better handling of PKCS#8 private keys
+- core: fix dispatcher script interface name handling
+- editor: fix potential crash when connection is invalid (rh #704848)
+- editor: allow _ as a valid character for GSM APNs
+
+* Mon May  9 2011 Dan Williams <dcbw@redhat.com> - 0.8.999-2.git20110509
+- core: fix possible crash when connections are deleted
+- core: fix exported symbols in libnm-util and libnm-glib
+- core/applet: updated translations
+
+* Tue May  3 2011 Dan Williams <dcbw@redhat.com> - 0.8.999-1
+- core: ensure DER format certificates are correctly recognized (rh #699591)
+- core: fix WINS server handling in client helper libraries
+- core: enhance dispatcher script environment to include IPv6 and VPN details
+- applet: migrate openswan connections to 0.9
+- editor: improve usability of editing IP addresses (rh #698199)
+
+* Wed Apr 27 2011 Dan Williams <dcbw@redhat.com> - 0.8.998-4.git20110427
+- core: enable optimized background roaming for WPA Enterprise configs
+- core: better handling of WiFi and WiMAX rfkill (rh #599002)
+- applet: fix crash detecting Bluetooth DUN devices a second time
+- ifcfg-rh: fix managed/unmanaged changes when removing connections (rh #698202)
+
+* Tue Apr 19 2011 Dan Williams <dcbw@redhat.com> - 0.8.998-3.git20110419
+- core: systemd and startup enhancements for NFS mounts
+- core: more efficient startup process
+- core: fix handling of multiple logins when one is inactive
+- core: fix handling of S390/Hercules CTC network interfaces (rh #641986)
+- core: support Easytether interfaces for Android phones
+- core: fix handling of WWAN enable/disable states
+- ifcfg-rh: harmonize handling if IPADDR/PREFIX/NETMASK with initscripts (rh #658907)
+- applet: fix connection to WPA Enterprise networks (rh #694765)
+
+* Wed Apr 06 2011 Dan Williams <dcbw@redhat.com> - 0.8.998-2.git20110406
+- core: fix handling of infinite IPv6 RDNSS timeouts (rh #689291)
+
+* Mon Apr 04 2011 Dan Williams <dcbw@redhat.com> - 0.8.998-1
+- Update to 0.8.998 (0.9.0-rc1)
+- core: fix near-infinite requests for passwords (rh #692783)
+- core: fix handling of wired 802.1x connections
+- core: ignore Nokia PC-Suite ethernet devices we can't use yet
+- applet: migrate 0.8 OpenVPN passwords to 0.9 formats
+
+* Thu Mar 31 2011 Dan Williams <dcbw@redhat.com> - 0.8.997-8.git20110331
+- core: resurrect default VPN username
+- core: don't stomp on crypto library users by de-initing the crypto library
+
+* Wed Mar 30 2011 Dan Williams <dcbw@redhat.com> - 0.8.997-7.git20110330
+- core: fix creation of default wired connections
+- core: fix requesting new secrets when old ones fail (ex changing WEP keys)
+- editor: ensure all pages are sensitive after retrieving secrets
+- editor: fix crash when scrolling through connection lists (rh #693446)
+- applet: fix crash after using the wifi or wired secrets dialogs (rh #693446)
+
+* Mon Mar 28 2011 Christopher Aillon <caillon@redhat.com> - 0.8.997-6.git20110328
+- Fix trigger to enable the systemd service for upgrades (rh #678553)
+
+* Mon Mar 28 2011 Dan Williams <dcbw@redhat.com> - 0.8.997-5.git20110328
+- core: fix connection deactivation on the compat interface
+- core: give default wired connections a more friendly name
+- core: fix base type of newly created wired connections
+- applet: many updated translations
+
+* Fri Mar 25 2011 Dan Williams <dcbw@redhat.com> - 0.8.997-4.git20110325
+- core: fix possible libnm-glib crash when activating connections
+- applet: fix various naming and dialog title issues
+
+* Thu Mar 24 2011 Dan Williams <dcbw@redhat.com> - 0.8.997-3.git20110324
+- nm-version.h should be in NetworkManager-devel, not -glib-devel (rh #685442)
+
+* Thu Mar 24 2011 Dan Williams <dcbw@redhat.com> - 0.8.997-2.git20110324
+- core: add compatibility layer for KDE Plasma network infrastructure
+
+* Mon Mar 21 2011 Dan Williams <dcbw@redhat.com> - 0.8.997-1
+- Update to 0.8.997 (0.9-beta3)
+- ifcfg-rh: fix reading and writing of Dynamic WEP connections using LEAP as the eap method
+- wifi: fix signal strength for scanned access points with some drivers
+- applet: translation updates
+
+* Thu Mar 10 2011 Dan Williams <dcbw@redhat.com> - 0.8.996-1
+- Update to 0.8.996 (0.9-beta2)
+
+* Wed Mar  9 2011 Dan Williams <dcbw@redhat.com> - 0.8.995-4.git20110308
+- applet: fix bus name more
+
+* Wed Mar  9 2011 Dan Williams <dcbw@redhat.com> - 0.8.995-3.git20110308
+- applet: fix bus name
+
+* Tue Mar  8 2011 Matthias Clasen <mclasen@redhat.com> - 0.8.995-2.git20110308
+- Fix systemd requires
+
+* Mon Mar  7 2011 Dan Williams <dcbw@redhat.com> - 0.8.995-1.git20110308
+- Update to NetworkManager 0.9-beta1
+- core: consolidate user and system settings services into NM itself
+- core: add WiMAX support
+- applet: support Fast User Switching
+
+* Fri Feb 11 2011 Matthias Clasen <mclasen@redhat.com> - 0.8.2-8.git20101117
+- Rebuild against newer gtk
+
+* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:0.8.2-7.git20101117
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Wed Feb  2 2011 Matthias Clasen <mclasen@redhat.com> - 0.8.2-6.git20101117
+- Rebuild against new gtk
+
+* Tue Feb  1 2011 Dan Williams <dcbw@redhat.com> - 0.8.2-5.git20101117
+- Handle modem IP interface changes after device is recognized
+
+* Mon Jan 10 2011 Matthias Clasen <mclasen@redhat.com> - 0.8.2-4.git20101117
+- Rebuild against new gtk3
+
+* Tue Dec 21 2010 Dan Horák <dan[at]danny.cz> - 0.8.2-3.git20101117
+- use --force in autoreconf to fix FTBFS
+
+* Fri Dec  3 2010 Matthias Clasen <mclasen@redhat.com> - 0.8.2-2.git20101117
+- Rebuild against newer gtk
+
+* Sat Nov 27 2010 Dan Williams <dcbw@redhat.com> - 0.8.2-1.git20101117
+- Update to 0.8.2
+
+* Wed Nov  3 2010 Matthias Clasen <mclasen@redhat.com> - 0.8.1-10.1
+- Rebuild against libnotify 0.7
+- misc gtk build fixes
+
+* Mon Nov  1 2010 Dan Williams <dcbw@redhat.com> - 0.8.1-10
+- core: preserve WiFi Enabled state across reboot and suspend/resume
+
+* Fri Oct 15 2010 Dan Williams <dcbw@redhat.com> - 0.8.1-9
+- core: fix suspend/resume regression (rh #638640)
+- core: fix issue causing some nmcli requests to be ignored
+
+* Thu Oct  7 2010 Dan Williams <dcbw@redhat.com> - 0.8.1-8
+- core: preserve custom local-mapped hostnames in /etc/hosts (rh #627269)
+
+* Thu Oct  7 2010 Dan Williams <dcbw@redhat.com> - 0.8.1-7
+- core: remove stale /etc/hosts mappings (rh #630146)
+
+* Tue Aug 31 2010 Dan Williams <dcbw@redhat.com> - 0.8.1-6
+- core: add dispatcher events on DHCPv4 and DHCPv6 lease changes
+- core: enforce access permissions when enabling/disabling WiFi and WWAN (rh #626337)
+- core: listen for UPower suspend/resume signals
+- applet: fix disabled Enable Networking and Enable Wireless menu items (rh #627365)
+- applet: updated translations
+- applet: obscure Mobile Broadband PIN in secondary unlock dialog
+
+* Wed Aug 18 2010 Dan Williams <dcbw@redhat.com> - 0.8.1-5
+- core: fix some systemd interaction issues
+
+* Tue Aug 17 2010 Dan Williams <dcbw@redhat.com> - 0.8.1-4
+- core: rebuild to fix polkit 0.97 build issue
+- applet: updated translations
+
+* Fri Aug 13 2010 Dan Williams <dcbw@redhat.com> - 0.8.1-3
+- core: rebuild to fix dbus-glib security issue (CVE-2010-1172) (rh #585394)
+
+* Fri Aug 13 2010 Dan Williams <dcbw@redhat.com> - 0.8.1-2
+- core: quiet annoying warnings (rh #612991)
+- core: fix retrieval of various IP options in libnm-glib (rh #611141)
+- core: ship NetworkManager.conf instead of deprecated nm-system-settings.conf (rh #606160)
+- core: add short hostname to /etc/hosts too (rh #621910)
+- core: recheck autoactivation when new system connections appear
+- core: enable DHCPv6-only configurations (rh #612445)
+- core: don't fail connection immediately if DHCP lease expires (rh #616084) (rh #590874)
+- core: fix editing of PPPoE system connections
+- core: work around twitchy frequency reporting of various wifi drivers
+- core: don't tear down user connections on console changes (rh #614556)
+- cli: wait a bit for NM's permissions check to complete (rh #614866)
+- ifcfg-rh: ignore BRIDGE and VLAN configs and treat as unmanaged (rh #619863)
+- man: add manpage for nm-online
+- applet: fix crash saving ignore-missing-CA-cert preference (rh #619775)
+- applet: hide PIN/PUK by default in the mobile PIN/PUK dialog (rh #615085)
+- applet: ensure Enter closes the PIN/PUK dialog (rh #611831)
+- applet: fix another crash in ignore-CA-certificate handling (rh #557495)
+- editor: fix handling of Wired/s390 connections (rh #618620)
+- editor: fix crash when canceling editing in IP address pages (rh #610891)
+- editor: fix handling of s390-specific options
+- editor: really fix crash when changing system connections (rh #603566)
+
+* Thu Jul 22 2010 Dan Williams <dcbw@redhat.com> - 0.8.1-1
+- core: read nm-system-settings.conf before NetworkManager.conf (rh #606160)
+- core: fix editing system DSL connections when using keyfile plugin
+- core: work around inconsistent proprietary driver associated AP reporting
+- core: ensure empty VPN secrets are not used (rh #587784)
+- core: don't request WiFi scans when connection is locked to a specific BSSID
+- cli: show IPv6 settings and configuration
+- applet: updated translations
+- editor: fix a PolicyKit-related crash editing connections (rh #603566)
+- applet: fix saving the ignore-missing-CA-cert preference (rh #610084)
+- editor: fix listing connections on PPC64 (rh #608663)
+- editor: ensure editor windows are destroyed when closed (rh #572466)
+
+* Thu Jul  1 2010 Matthias Clasen <mclasen@redhatcom> - 0.8.1-0.5
+- Rebuild against new gnome-bluetooth
+
+* Fri Jun 25 2010 Dan Williams <dcbw@redhat.com> - 0.8.1-0.4
+- Update to 0.8.1 release candidate
+- core: fix WWAN hardware enable state tracking (rh #591622)
+- core: fix Red Hat initscript return value on double-start (rh #584321)
+- core: add multicast route entry for IPv4 link-local connections
+- core: fix connection sharing in cases where a dnsmasq config file exists
+- core: fix handling of Ad-Hoc wifi connections to indicate correct network
+- core: ensure VPN interface name is passed to dispatcher when VPN goes down
+- ifcfg-rh: fix handling of ASCII WEP keys
+- ifcfg-rh: fix double-quoting of some SSIDs (rh #606518)
+- applet: ensure deleted connections are actually forgotten (rh #618973)
+- applet: don't crash if the AP's BSSID isn't availabe (rh #603236)
+- editor: don't crash on PolicyKit events after windows are closed (rh #572466)
+
+* Wed May 26 2010 Dan Williams <dcbw@redhat.com> - 0.8.1-0.3
+- core: fix nm-online crash (rh #593677)
+- core: fix failed suspend disables network (rh #589108)
+- core: print out missing firmware errors (rh #594578)
+- applet: fix device descriptions for some mobile broadband devices
+- keyfile: bluetooth fixes
+- applet: updated translations (rh #589230)
+
+* Wed May 19 2010 Dan Williams <dcbw@redhat.com> - 0.8.1-0.2.git20100519
+- core: use GIO in local mode only (rh #588745)
+- core: updated translations (rh #589230)
+- core: be more lenient in IPv6 RDNSS server expiry (rh #590202)
+- core: fix headers to be C++ compatible (rh #592783)
+- applet: updated translations (rh #589230)
+- applet: lock connections with well-known SSIDs to their specific AP
+
+* Mon May 10 2010 Dan Williams <dcbw@redhat.com> - 0.8.1-0.1.git20100510
+- core: fix handling of IPv6 RA flags when router goes away (rh #588560)
+- bluetooth: fix crash configuring DUN connections from the wizard (rh #590666)
+
+* Sun May  9 2010 Dan Williams <dcbw@redhat.com> - 0.8-13.git20100509
+- core: restore initial accept_ra value for IPv6 ignored connections (rh #588619)
+- bluetooth: fix bad timeout on PAN connections (rh #586961)
+- applet: updated translations
+
+* Tue May  4 2010 Dan Williams <dcbw@redhat.com> - 0.8-12.git20100504
+- core: treat missing IPv6 configuration as ignored (rh #588814)
+- core: don't flush IPv6 link-local routes (rh #587836)
+- cli: update output formatting
+
+* Mon May  3 2010 Dan Williams <dcbw@redhat.com> - 0.8-11.git20100503
+- core: allow IP configuration as long as one method completes (rh #567978)
+- core: don't prematurely remove IPv6 RDNSS nameservers (rh #588192)
+- core: ensure router advertisements are only used when needed (rh #588613)
+- editor: add IPv6 gateway editing capability
+
+* Sun May  2 2010 Dan Williams <dcbw@redhat.com> - 0.8-10.git20100502
+- core: IPv6 autoconf, DHCP, link-local, and manual mode fixes
+- editor: fix saving IPv6 address in user connections
+
+* Thu Apr 29 2010 Dan Williams <dcbw@redhat.com> - 0.8-9.git20100429
+- core: fix crash when IPv6 is enabled and interface is deactivated
+
+* Mon Apr 26 2010 Dan Williams <dcbw@redhat.com> - 0.8-8.git20100426
+- core: fix issues with IPv6 router advertisement mishandling (rh #530670)
+- core: many fixes for IPv6 RA and DHCP handling (rh #538499)
+- core: ignore WWAN ethernet devices until usable (rh #585214)
+- ifcfg-rh: fix handling of WEP passphrases (rh #581718)
+- applet: fix crashes (rh #582938) (rh #582428)
+- applet: fix crash with multiple concurrent authorization requests (rh #585405)
+- editor: allow disabling IPv4 on a per-connection basis
+- editor: add support for IPv6 DHCP-only configurations
+
+* Thu Apr 22 2010 Dan Williams <dcbw@redhat.com> - 0.8-7.git20100422
+- core: fix crash during install (rh #581794)
+- wifi: fix crash when supplicant segfaults after resume (rh #538717)
+- ifcfg-rh: fix MTU handling for wired connections (rh #569319)
+- applet: fix display of disabled mobile broadband devices
+
+* Thu Apr  8 2010 Dan Williams <dcbw@redhat.com> - 0.8-6.git20100408
+- core: fix automatic WiFi connections on resume (rh #578141)
+
+* Thu Apr  8 2010 Dan Williams <dcbw@redhat.com> - 0.8-5.git20100408
+- core: more flexible logging
+- core: fix crash with OLPC mesh devices after suspend
+- applet: updated translations
+- applet: show mobile broadband signal strength and technology in the icon
+- applet: fix continuous password requests for 802.1x connections (rh #576925)
+- applet: many updated translations
+
+* Thu Mar 25 2010 Dan Williams <dcbw@redhat.com> - 0.8-4.git20100325
+- core: fix modem enable/disable
+- core: fix modem default route handling
+
+* Tue Mar 23 2010 Dan Williams <dcbw@redhat.com> - 0.8-3.git20100323
+- core: don't exit early on non-fatal state file errors
+- core: fix Bluetooth connection issues (rh #572340)
+- applet: fix some translations (rh #576056)
+- applet: better feedback when wrong PIN/PUK is entered
+- applet: many updated translations
+- applet: PIN2 unlock not required for normal modem functionality
+- applet: fix wireless secrets dialog display
+
+* Wed Mar 17 2010 Dan Williams <dcbw@redhat.com> - 0.8-2.git20100317
+- man: many manpage updates
+- core: determine classful prefix if non is given via DHCP
+- core: ensure /etc/hosts is always up-to-date and correct (rh #569914)
+- core: support GSM network and roaming preferences
+- applet: startup speed enhancements
+- applet: better support for OTP/token-based WiFi connections (rh #526383)
+- applet: show GSM and CDMA registration status and signal strength when available
+- applet: fix zombie GSM and CDMA devices in the menu
+- applet: remove 4-character GSM PIN/PUK code limit
+- applet: fix insensitive WiFi Create... button (rh #541163)
+- applet: allow unlocking of mobile devices immediately when plugged in
+
+* Fri Feb 19 2010 Dan Williams <dcbw@redhat.com> - 0.8-1.git20100219
+- core: update to final 0.8 release
+- core: fix Bluetooth DUN connections when secrets are needed
+- ifcfg-rh: add helper for initscripts to determine ifcfg connection UUIDs
+- applet: fix Bluetooth connection secrets requests
+- applet: fix rare conflict with other gnome-bluetooth plugins
+
+* Thu Feb 11 2010 Dan Williams <dcbw@redhat.com> - 0.8-0.4.git20100211
+- core: fix mobile broadband PIN handling (rh #543088) (rh #560742)
+- core: better handling of /etc/hosts if hostname was already added by the user
+- applet: crash less on D-Bus property errors (rh #557007)
+- applet: fix crash entering wired 802.1x connection details (rh #556763)
+
+* Tue Feb 09 2010 Kevin Kofler <Kevin@tigcc.ticalc.org> - 0.8-0.3.git20100129
+- core: validate the autostart .desktop file
+- build: fix nmcli for the stricter ld (fixes FTBFS)
+- build: fix nm-connection-editor for the stricter ld (fixes FTBFS)
+- applet: don't autostart in KDE on F13+ (#541353)
+
+* Fri Jan 29 2010 Dan Williams <dcbw@redhat.com> - 0.8-0.2.git20100129
+- core: add Bluetooth Dial-Up Networking (DUN) support (rh #136663)
+- core: start DHCPv6 on receipt of RA 'otherconf'/'managed' bits
+- nmcli: allow enable/disable of WiFi and WWAN
+
+* Fri Jan 22 2010 Dan Williams <dcbw@redhat.com> - 0.8-0.1.git20100122
+- ifcfg-rh: read and write DHCPv6 enabled connections (rh #429710)
+- nmcli: update
+
+* Thu Jan 21 2010 Dan Williams <dcbw@redhat.com> - 0.7.999-2.git20100120
+- core: clean NSS up later to preserve errors from crypto_init()
+
+* Wed Jan 20 2010 Dan Williams <dcbw@redhat.com> - 0.7.999-1.git20100120
+- core: support for managed-mode DHCPv6 (rh #429710)
+- ifcfg-rh: gracefully handle missing PREFIX/NETMASK
+- cli: initial preview of command-line client
+- applet: add --help to explain what the applet is (rh #494641)
+
+* Wed Jan  6 2010 Dan Williams <dcbw@redhat.com> - 0.7.998-1.git20100106
+- build: fix for new pppd (rh #548520)
+- core: add WWAN enable/disable functionality
+- ifcfg-rh: IPv6 addressing and routes support (rh #523288)
+- ifcfg-rh: ensure connection is updated when route/key files change
+- applet: fix crash when active AP isn't found (rh #546901)
+- editor: fix crash when editing connections (rh #549579)
+
+* Mon Dec 14 2009 Dan Williams <dcbw@redhat.com> - 0.7.997-2.git20091214
+- core: fix recognition of standalone 802.1x private keys
+- applet: clean notification text to ensure it passes libnotify validation
+
+* Mon Dec  7 2009 Dan Williams <dcbw@redhat.com> - 0.7.997-1
+- core: remove haldaemon from initscript dependencies (rh #542078)
+- core: handle PEM certificates without an ending newline (rh #507315)
+- core: fix rfkill reporting for ipw2x00 devices
+- core: increase PPPoE timeout to 30 seconds
+- core: fix re-activating system connections with secrets
+- core: fix crash when deleting automatically created wired connections
+- core: ensure that a VPN's DNS servers are used when sharing the VPN connection
+- ifcfg-rh: support routes files (rh #507307)
+- ifcfg-rh: warn when device will be managed due to missing HWADDR (rh #545003)
+- ifcfg-rh: interpret DEFROUTE as never-default (rh #528281)
+- ifcfg-rh: handle MODE=Auto correctly
+- rpm: fix rpmlint errors
+- applet: don't crash on various D-Bus and other errors (rh #545011) (rh #542617)
+- editor: fix various PolicyKit-related crashes (rh #462944)
+- applet+editor: notify user that private keys must be protected
+
+* Fri Nov 13 2009 Dan Williams <dcbw@redhat.com> - 0.7.996-7.git20091113
+- nm: better pidfile handing (rh #517362)
+- nm: save WiFi and Networking enabled/disabled states across reboot
+- nm: fix crash with missing VPN secrets (rh #532084)
+- applet: fix system connection usage from the "Connect to hidden..." dialog
+- applet: show Bluetooth connections when no other devices are available (rh #532049)
+- applet: don't die when autoconfigured connections can't be made (rh #532680)
+- applet: allow system administrators to disable the "Create new wireless network..." menu item
+- applet: fix missing username connecting to VPNs the second time
+- applet: really fix animation stuttering
+- editor: fix IP config widget tooltips
+- editor: allow unlisted countries in the mobile broadband wizard (rh #530981)
+- ifcfg-rh: ignore .rpmnew files (rh #509621)
+
+* Wed Nov 04 2009 Dan Williams <dcbw@redhat.com> - 0.7.996-6.git20091021
+- nm: fix PPPoE connection authentication (rh #532862)
+
+* Wed Oct 21 2009 Dan Williams <dcbw@redhat.com> - 0.7.996-5.git20091021
+- install: better fix for (rh #526519)
+- install: don't build Bluetooth bits on s390 (rh #529854)
+- nm: wired 802.1x connection activation fixes
+- nm: fix crash after modifying default wired connections like "Auto eth0"
+- nm: ensure VPN secrets are requested again after connection failure
+- nm: reset 'accept_ra' to previous value after deactivating IPv6 connections
+- nm: ensure random netlink events don't interfere with IPv6 connection activation
+- ifcfg-rh: fix writing out LEAP connections
+- ifcfg-rh: recognize 'static' as a valid BOOTPROTO (rh #528068)
+- applet: fix "could not find required resources" error (rh #529766)
+
+* Fri Oct  2 2009 Dan Williams <dcbw@redhat.com> - 0.7.996-4.git20091002
+- install: fix -gnome package pre script failures (rh #526519)
+- nm: fix failures validating private keys when using the NSS crypto backend
+- applet: fix crashes when clicking on menu but not associated (rh #526535)
+- editor: fix crash editing wired 802.1x settings
+- editor: fix secrets retrieval when editing connections
+
+* Mon Sep 28 2009 Dan Williams <dcbw@redhat.com> - 0.7.996-3.git20090928
+- nm: fix connection takeover when carrier is not on
+- nm: handle certificate paths (CA chain PEM files are now fully usable)
+- nm: defer action for 4 seconds when wired carrier drops
+- ifcfg-rh: fix writing WPA passphrases with odd characters
+- editor: fix editing of IPv4 settings with new connections (rh #525819)
+- editor: fix random crashes when editing due to bad widget refcounting
+- applet: debut reworked menu layout (not final yet...)
+
+* Wed Sep 23 2009 Matthias Clasen <mclasen@redhat.com> - 0.7.996-3.git20090921
+- Install GConf schemas
+
+* Mon Sep 21 2009 Dan Williams <dcbw@redhat.com> - 0.7.996-2.git20090921
+- nm: allow disconnection of all device types
+- nm: ensure that wired connections are torn down when their hardware goes away
+- nm: fix crash when canceling a VPN's request for secrets
+- editor: fix issues changing connections between system and user scopes
+- editor: ensure changes are thrown away when editing is canceled
+- applet: ensure connection changes are noticed by NetworkManager
+- applet: fix crash when creating new connections
+- applet: actually use wired 802.1x secrets after they are requested
+
+* Wed Aug 26 2009 Dan Williams <dcbw@redhat.com> - 0.7.996-1.git20090826
+- nm: IPv6 zeroconf support and fixes
+- nm: port to polkit (rh #499965)
+- nm: fixes for ehea devices (rh #511304) (rh #516591)
+- nm: work around PPP bug causing bogus nameservers for mobile broadband connections
+- editor: fix segfault with "Unlisted" plans in the mobile broadband assistant
+
+* Thu Aug 13 2009 Dan Williams <dcbw@redhat.com> - 0.7.995-3.git20090813
+- nm: add iSCSI support
+- nm: add connection assume/takeover support for ethernet (rh #517333)
+- nm: IPv6 fixes
+- nm: re-add OLPC XO-1 mesh device support (removed with 0.7.0)
+- applet: better WiFi dialog focus handling
+
+* Tue Aug 11 2009 Bastien Nocera <bnocera@redhat.com> 0.7.995-2.git20090804
+- Add patch to fix service detection on phones
+
+* Tue Aug  4 2009 Dan Williams <dcbw@redhat.com> - 0.7.995-1.git20090804
+- nm: IPv6 support for manual & router-advertisement modes
+
+* Sun Aug  2 2009 Matthias Clasen <mclasen@redhat.com> - 0.7.995-1.git20090728
+- Move some big docs to -devel to save space
+
+* Tue Jul 28 2009 Dan Williams <dcbw@redhat.com> - 0.7.995-0.git20090728
+- Update to upstream 'master' branch
+- Use modem-manager for better 3G modem support
+- Integrated system settings with NetworkManager itself
+- Use udev instead of HAL
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:0.7.1-9.git20090708
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Jul  9 2009 Dan Williams <dcbw@redhat.com> - 0.7.1-8.git20090708
+- applet: fix certificate validation in hidden wifi networks dialog (rh #508207)
+
+* Wed Jul  8 2009 Dan Williams <dcbw@redhat.com> - 0.7.1-7.git20090708
+- nm: fixes for ZTE/Onda modem detection
+- nm: prevent re-opening serial port when the SIM has a PIN
+- applet: updated translations
+- editor: show list column headers
+
+* Thu Jun 25 2009 Dan Williams <dcbw@redhat.com> - 0.7.1-6.git20090617
+- nm: fix serial port settings
+
+* Wed Jun 17 2009 Dan Williams <dcbw@redhat.com> - 0.7.1-5.git20090617
+- nm: fix AT&T Quicksilver modem connections (rh #502002)
+- nm: fix support for s390 bus types (rh #496820)
+- nm: fix detection of some CMOtech modems
+- nm: handle unsolicited wifi scans better
+- nm: resolv.conf fixes when using DHCP and overriding search domains
+- nm: handle WEP and WPA passphrases (rh #441070)
+- nm: fix removal of old APs when none are scanned
+- nm: fix Huawei EC121 and EC168C detection and handling (rh #496426)
+- applet: save WEP and WPA passphrases instead of hashed keys (rh #441070)
+- applet: fix broken notification bubble actions
+- applet: default to WEP encryption for Ad-Hoc network creation
+- applet: fix crash when connection editor dialogs are canceled
+- applet: add a mobile broadband provider wizard
+
+* Tue May 19 2009 Karsten Hopp <karsten@redhat.com> 0.7.1-4.git20090414.1
+- drop ExcludeArch s390 s390x, we need at least the header files
+
+* Tue May 05 2009 Adam Jackson <ajax@redhat.com> 1:0.7.1-4.git20090414
+- nm-save-the-leases.patch: Use per-connection lease files, and don't delete
+  them on interface deactivate.
+
+* Thu Apr 16 2009 Dan Williams <dcbw@redhat.com> - 1:0.7.1-3.git20090414
+- ifcfg-rh: fix problems noticing changes via inotify (rh #495884)
+
+* Tue Apr 14 2009 Dan Williams <dcbw@redhat.com> - 1:0.7.1-2.git20090414
+- ifcfg-rh: enable write support for wired and wifi connections
+
+* Sun Apr 12 2009 Dan Williams <dcbw@redhat.com> - 1:0.7.1-1
+- nm: update to 0.7.1
+- nm: fix startup race with HAL causing unmanaged devices to sometimes be managed (rh #494527)
+
+* Wed Apr  8 2009 Dan Williams <dcbw@redhat.com> - 1:0.7.0.100-2.git20090408
+- nm: fix recognition of Option GT Fusion and Option GT HSDPA (nozomi) devices (rh #494069)
+- nm: fix handling of spaces in DHCP 'domain-search' option
+- nm: fix detection of newer Option 'hso' devices
+- nm: ignore low MTUs returned by broken DHCP servers
+
+* Sun Apr  5 2009 Dan Williams <dcbw@redhat.com> - 1:0.7.0.100-1
+- Update to 0.7.1-rc4
+- nm: use PolicyKit for system connection secrets retrieval
+- nm: correctly interpret errors returned from chmod(2) when saving keyfile system connections
+- editor: use PolicyKit to get system connection secrets
+
+* Thu Mar 26 2009 Dan Williams <dcbw@redhat.com> - 1:0.7.0.99-5
+- nm: fix crashes with out-of-tree modules that provide no driver link (rh #492246)
+- nm: fix USB modem probing on recent udev versions
+
+* Tue Mar 24 2009 Dan Williams <dcbw@redhat.com> - 1:0.7.0.99-4
+- nm: fix communication with Option GT Max 3.6 mobile broadband cards
+- nm: fix communication with Huawei mobile broadband cards (rh #487663)
+- nm: don't look up hostname when HOSTNAME=localhost unless asked (rh #490184)
+- nm: fix crash during IP4 configuration (rh #491620)
+- nm: ignore ONBOOT=no for minimal ifcfg files (f9 & f10 only) (rh #489398)
+- applet: updated translations
+
+* Wed Mar 18 2009 Dan Williams <dcbw@redhat.com> - 1:0.7.0.99-3.5
+- nm: work around unhandled device removals due to missing HAL events (rh #484530)
+- nm: improve handling of multiple modem ports
+- nm: support for Sony Ericsson F3507g / MD300 and Dell 5530
+- applet: updated translations
+
+* Mon Mar  9 2009 Dan Williams <dcbw@redhat.com> - 1:0.7.0.99-3
+- Missing ONBOOT should actually mean ONBOOT=yes (rh #489422)
+
+* Mon Mar  9 2009 Dan Williams <dcbw@redhat.com> - 1:0.7.0.99-2
+- Fix conflict with NetworkManager-openconnect (rh #489271)
+- Fix possible crash when resynchronizing devices if HAL restarts
+
+* Wed Mar  4 2009 Dan Williams <dcbw@redhat.com> - 1:0.7.0.99-1
+- nm: make default wired "Auto ethX" connection modifiable if an enabled system settings
+    plugin supports modifying connections (rh #485555)
+- nm: manpage fixes (rh #447233)
+- nm: CVE-2009-0365 - GetSecrets disclosure
+- applet: CVE-2009-0578 - local users can modify the connection settings
+- applet: fix inability to choose WPA Ad-Hoc networks from the menu
+- ifcfg-rh: add read-only support for WPA-PSK connections
+
+* Wed Feb 25 2009 Dan Williams <dcbw@redhat.com> - 1:0.7.0.98-1.git20090225
+- Fix getting secrets for system connections (rh #486696)
+- More compatible modem autodetection
+- Better handle minimal ifcfg files
+
+* Mon Feb 23 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:0.7.0.97-6.git20090220
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Fri Feb 20 2009 Dan Williams <dcbw@redhat.com> - 1:0.7.0.97-5.git20090220
+- Use IFF_LOWER_UP for carrier detect instead of IFF_RUNNING
+- Add small delay before probing cdc-acm driven mobile broadband devices
+
+* Thu Feb 19 2009 Dan Williams <dcbw@redhat.com> - 1:0.7.0.97-4.git20090219
+- Fix PEAP version selection in the applet (rh #468844)
+- Match hostname behavior to 'network' service when hostname is localhost (rh #441453)
+
+* Thu Feb 19 2009 Dan Williams <dcbw@redhat.com> - 1:0.7.0.97-2
+- Fix 'noreplace' for nm-system-settings.conf
+
+* Wed Feb 18 2009 Dan Williams <dcbw@redhat.com> - 1:0.7.0.97-1
+- Update to 0.7.1rc1
+- nm: support for Huawei E160G mobile broadband devices (rh #466177)
+- nm: fix misleading routing error message (rh #477916)
+- nm: fix issues with 32-character SSIDs (rh #485312)
+- nm: allow root to activate user connections
+- nm: automatic modem detection with udev-extras
+- nm: massive manpage rewrite
+- applet: fix crash when showing the CA certificate ignore dialog a second time
+- applet: clear keyring items when deleting a connection
+- applet: fix max signal strength calculation in menu (rh #475123)
+- applet: fix VPN export (rh #480496)
+
+* Sat Feb  7 2009 Dan Williams <dcbw@redhat.com> - 1:0.7.0-2.git20090207
+- applet: fix blank VPN connection message bubbles
+- applet: better handling of VPN routing on update
+- applet: silence pointless warning (rh #484136)
+- applet: desensitize devices in the menu until they are ready (rh #483879)
+- nm: Expose WINS servers in the IP4Config over D-Bus
+- nm: Better handling of GSM Mobile Broadband modem initialization
+- nm: Handle DHCP Classless Static Routes (RFC 3442)
+- nm: Fix Mobile Broadband and PPPoE to always use 'noauth'
+- nm: Better compatibility with older dual-SSID AP configurations (rh #445369)
+- nm: Mark nm-system-settings.conf as config (rh #465633)
+- nm-tool: Show VPN connection information
+- ifcfg-rh: Silence message about ignoring loopback config (rh #484060)
+- ifcfg-rh: Fix issue with wrong gateway for system connections (rh #476089)
+
+* Fri Jan  2 2009 Dan Williams <dcbw@redhat.com> - 1:0.7.0-1.git20090102
+- Update to 0.7.1 pre-release
+- Allow connections to be ignored when determining the default route (rh #476089)
+- Own /usr/share/gnome-vpn-properties (rh #477155)
+- Fix log flooding due to netlink errors (rh #459205)
+- Pass connection UUID to dispatcher scripts via the environment
+- Fix possible crash after deactivating a VPN connection
+- Fix issues with editing wired 802.1x connections
+- Fix issues when using PKCS#12 certificates with 802.1x connections
+
+* Fri Nov 21 2008 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.12.svn4326
+- API and documentation updates
+- Fix PIN handling on 'hso' mobile broadband devices
+
+* Tue Nov 18 2008 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.12.svn4296
+- Fix PIN/PUK issues with high-speed Option HSDPA mobile broadband cards
+- Fix desensitized OK button when asking for wireless keys
+
+* Mon Nov 17 2008 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.12.svn4295
+- Fix issues reading ifcfg files
+- Previously fixed:
+- Doesn't send DHCP hostname (rh #469336)
+- 'Auto eth0' forgets settings (rh #468612)
+- DHCP renewal sometimes breaks VPN (rh #471852)
+- Connection editor menu item in the wrong place (rh #471495)
+- Cannot make system-wide connections (rh #471308)
+
+* Fri Nov 14 2008 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.12.svn4293
+- Update to NetworkManager 0.7.0 RC2
+- Handle gateways on a different subnet from the interface
+- Clear VPN secrets on connection failure to ensure they are requested again (rh #429287)
+- Add support for PKCS#12 private keys (rh #462705)
+- Fix mangling of VPN's default route on DHCP renew
+- Fix type detection of qemu/kvm network devices (rh #466340)
+- Clear up netmask/prefix confusion in the connection editor
+- Make the secrets dialog go away when it's not needed
+- Fix inability to add system connections (rh #471308)
+
+* Mon Oct 27 2008 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.11.svn4229
+- More reliable mobile broadband card initialization
+- Handle mobile broadband PINs correctly when PPP passwords are also used
+- Additional PolicyKit integration for editing system connections
+- Close the applet menu if a keyring password is needed (rh #353451)
+
+* 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
+
+* Sat Oct 11 2008 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.11.svn4174
+- Ensure that mobile broadband cards are powered up before trying to use them
+- Hostname changing support (rh #441453)
+- Fix mobile broadband secret requests to happen less often
+- Better handling of default devices and default routes
+- Better information in tooltips and notifications
+- Various UI cleanups; hide widgets that aren't used (rh #465397, rh #465395)
+- Accept different separators for DNS servers and searches
+- Make applet's icon accurately reflect signal strength of the current AP
+
+* Wed Oct  1 2008 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.11.svn4022.4
+- Fix connection comparison that could cause changes to get overwritten (rh #464417)
+
+* Tue Sep 30 2008 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.11.svn4022.3
+- Fix handling of VPN settings on upgrade (rh #460730, bgo #553465)
+
+* Thu Sep 11 2008 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.11.svn4022.2
+- Fix hang when reading system connections from ifcfg files
+
+* Thu Sep  4 2008 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.11.svn4022.1
+- Fix WPA Ad-Hoc connections
+
+* Wed Aug 27 2008 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.11.svn4022
+- Fix parsing of DOMAIN in ifcfg files (rh #459370)
+- Fix reconnection to mobile broadband networks after an auth failure
+- Fix recognition of timeouts of PPP during mobile broadband connection
+- More compatible connection sharing (rh #458625)
+- Fix DHCP in minimal environments without glibc locale information installed
+- Add support for Option mobile broadband devices (like iCON 225 and iCON 7.2)
+- Add IP4 config information to dispatcher script environment
+- Merge WEP ASCII and Hex key types for cleaner UI
+- Pre-fill PPPoE password when authentication fails
+- Fixed some changes not getting saved in the connection editor
+- Accept both prefix and netmask in the conection editor's IPv4 page
+
+* Mon Aug 11 2008 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.11.svn3930
+- Fix issue with mobile broadband connections that don't require authentication
+
+* Mon Aug 11 2008 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.11.svn3927
+- Expose DHCP-returned options over D-Bus and to dispatcher scripts
+- Add support for customized static routes
+- Handle multiple concurrent 3G or PPPoE connections
+- Fix GSM/CDMA username and password issues
+- Better handling of unmanaged devices from ifcfg files
+- Fix timeout handling of errors during 3G connections
+- Fix some routing issues (rh #456685)
+- Fix applet crashes after removing a device (rh #457380)
+
+* Thu Jul 24 2008 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.11.svn3846
+- Convert stored IPv4 static IP addresses to new prefix-based scheme automatically
+- Fix pppd connections to some 3G providers (rh #455348)
+- Make PPPoE "Show Password" option work
+- Hide IPv4 config options that don't make sense in certain configurations
+
+* Fri Jul 18 2008 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.11.svn3830
+- Expose server-returned DHCP options via D-Bus
+- Use avahi-autoipd rather than old built-in IPv4LL implementation
+- Send hostname to DHCP server if provided (DHCP_HOSTNAME ifcfg option)
+- Support sending DHCP Client Identifier to DHCP server
+- Allow forcing 802.1x PEAP Label to '0'
+- Make connection sharing more robust
+- Show status for shared and Ad-Hoc connections if no other connection is active
+
+* Fri Jul 11 2008 Matthias Clasen <mclasen@redhat.com> - 1:0.7.0-0.10.svn3801
+- Drop explicit hal dep in -gnome
+
+* Wed Jul 02 2008 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.10.svn3801
+- Move VPN configuration into connection editor
+- Fix mobile broadband username/password issues
+- Fix issues with broken rfkill setups (rh #448889)
+- Honor APN setting for GSM mobile broadband configurations
+- Fix adding CDMA connections in the connection editor
+
+* Wed Jun 11 2008 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.10.svn3747
+- Update to latest SVN
+- Enable connection sharing
+- Respect VPN-provided routes
+
+* Wed Jun  4 2008 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.9.4.svn3675
+- Move NM later in the shutdown process (rh #449070)
+- Move libnm-util into a subpackage to allow NM to be removed more easily (rh #351101)
+
+* Mon May 19 2008 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.9.3.svn3675
+- Read global gateway from /etc/sysconfig/network if missing (rh #446527)
+- nm-system-settings now terminates when dbus goes away (rh #444976)
+
+* Wed May 14 2008 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.9.3.svn3669
+- Fix initial carrier state detection on devices that are already up (rh #134886)
+
+* Tue May 13 2008 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.9.3.svn3667
+- Restore behavior of marking wifi devices as "down" when disabling wireless
+- Fix a crash on resume when a VPN was active when going to sleep
+
+* Tue May 13 2008 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.9.3.svn3665
+- Fix issues with the Fedora plugin not noticing changes made by
+    system-config-network (rh #444502)
+- Allow autoconnection of GSM and CDMA connections
+- Multiple IP address support for user connections
+- Fixes for Mobile Broadband cards that return line speed on connect
+- Implement PIN entry for GSM mobile broadband connections
+- Fix crash when editing unencrypted WiFi connections in the connection editor
+
+* Wed Apr 30 2008 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.9.3.svn3623
+- Clean up the dispatcher now that it's service is gone (rh #444798)
+
+* Wed Apr 30 2008 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.9.2.svn3623
+- Fix asking applets for the GSM PIN/PUK
+
+* Wed Apr 30 2008 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.9.2.svn3622
+- Guess WEP key type in applet when asking for new keys
+- Correct OK button sensitivity in applet when asking for new WEP keys
+
+* Wed Apr 30 2008 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.9.2.svn3620
+- Fix issues with Mobile Broadband connections caused by device init race patch
+
+* Tue Apr 29 2008 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.9.2.svn3619
+- Fix device initialization race that caused ethernet devices to get stuck on
+    startup
+- Fix PPPoE connections not showing up in the applet
+- Fix disabled OK button in connection editor some wireless and IP4 settings
+- Don't exit if HAL isn't up yet; wait for it
+- Fix a suspend/resume crash
+
+* Sun Apr 27 2008 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.9.2.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.9.2.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
+- Show Connection Information for the device with the default route only
+
+* Fri Apr 18 2008 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.9.2.svn3578
+- Add dbus-glib-devel BuildRequires for NetworkManager-glib-devel (rh #442978)
+- Add PPP settings page to connection editor
+- Fix a few crashes with PPPoE
+- Fix active connection state changes that confused clients 
+
+* Thu Apr 17 2008 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.9.2.svn3571
+- Fix build in pppd-plugin
+
+* Thu Apr 17 2008 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.9.2.svn3570
+- PPPoE authentication fixes
+- More robust handing of mobile broadband device communications
+
+* Wed Apr 16 2008 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.9.2.svn3566
+- Honor options from /etc/sysconfig/network for blocking until network is up
+
+* 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
+
+* Tue Apr  8 2008 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.9.1.svn3548
+- Fix builds due to glib2 breakage of GStaticMutex with gcc 4.3
+
+* Tue Apr  8 2008 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.9.1.svn3547
+- Fix WEP key index handling in UI
+- Fix handling of NM_CONTROLLED in ifcfg files
+- Show device managed state in applet menu
+- Show wireless enabled state in applet menu
+- Better handling of default DHCP connections for wired devices
+- Fix loading of connection editor on KDE (rh #435344)
+
+* Wed Apr  2 2008 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.9.1.svn3527
+- Honor MAC address locking for wired & wireless devices
+
+* 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
+
+* Tue Mar 18 2008 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.9.1.svn3473
+- Fix crashes when returning VPN secrets from the applet to NM
+
+* Tue Mar 18 2008 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.9.1.svn3472
+- Fix crashes on suspend/resume and exit (rh #437426)
+- Ensure there's always an option to chose the wired device
+- Never set default route via an IPv4 link-local addressed device (rh #437338)
+
+* Wed Mar 12 2008 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.9.1.svn3440
+- Fix DHCP rebind behavior
+- Preliminary PPPoE support
+
+* Mon Mar 10 2008 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.9.1.svn3417
+- Fix gnome-icon-theme Requires, should be on gnome subpackage
+
+* Mon Mar 10 2008 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.8.svn3417
+- Honor DHCP rebinds
+- Multiple active device support
+- Better error handling of mobile broadband connection failures
+- Allow use of interface-specific dhclient config files
+- Recognize system settings which have no TYPE item
+
+* Sun Mar  2 2008 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.8.svn3370
+- Fix crash of nm-system-settings on malformed ifcfg files (rh #434919)
+- Require gnome-icon-theme to pick up lock.png (rh #435344)
+- Fix applet segfault after connection removal via connection editor or GConf
+
+* Fri Feb 29 2008 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.8.svn3369
+- Don't create multiple connections for hidden access points
+- Fix scanning behavior
+
+* Thu Feb 14 2008 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.8.svn3319
+- Rework connection editor connection list
+
+* Tue Feb 12 2008 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.8.svn3312
+- Better handling of changes in the profile directory by the system settings
+	serivce
+
+* Thu Feb  7 2008 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.8.svn3302
+- Enable system settings service
+- Allow explicit disconnection of mobile broadband devices
+- Fix applet memory leaks (rh #430178)
+- Applet Connection Information dialog tweaks (gnome.org #505899)
+- Filter input characters to passphrase/key entry (gnome.org #332951)
+- Fix applet focus stealing prevention behavior
+
+* Mon Jan 21 2008 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.8.svn3261
+- Add CDMA mobile broadband support (if supported by HAL)
+- Rework applet connection and icon handling
+- Enable connection editor (only for deleting connections)
+
+* Fri Jan 11 2008 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.8.svn3235
+- Fix crash when activating a mobile broadband connection
+- Better handling of non-SSID-broadcasting APs on kernels that support it
+    (gnome.org #464215) (rh #373841)
+- Honor DHCP-server provided MTU if present (gnome.org #332953)
+- Use previous DNS settings if the VPN concentrator doesn't provide any
+    (gnome.org #346833)
+
+* Fri Jan  4 2008 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.8.svn3204
+- Fix WPA passphrase hashing on big endian (PPC, Sparc, etc) (rh #426233)
+
+* Tue Dec 18 2007 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.8.svn3181
+- Fixes to work better with new libnl (rh #401761)
+
+* Tue Dec 18 2007 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.8.svn3180
+- Fix WPA/WPA2 Enterprise Phase2 connections (rh #388471)
+
+* Wed Dec  5 2007 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.8.svn3138
+- Fix applet connection comparison which failed to send connection updated
+    signals to NM in some cases
+- Make VPN connection applet more robust against plugin failures
+
+* Tue Dec  4 2007 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.8.svn3134
+- 64-bit -Wall compile fixes
+
+* Tue Dec  4 2007 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.8.svn3133
+- Fix applet crash when choosing to ignore the CA certificate (rh #359001)
+- Fix applet crash when editing VPN properties and VPN connection failures (rh #409351)
+- Add file filter name in certificate file picker dialog (rh #410201)
+- No longer start named when starting NM (rh #381571)
+
+* Tue Nov 27 2007 Jeremy Katz <katzj@redhat.com> - 1:0.7.0-0.8.svn3109
+- Fix upgrading from an earlier rawhide snap
+
+* Mon Nov 26 2007 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.6.6.svn3109
+- Fix device descriptions shown in applet menu
+
+* Mon Nov 26 2007 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.6.5.svn3109
+- Fix crash when deactivating VPN connections
+
+* Mon Nov 19 2007 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.6.5.svn3096
+- Fix crash and potential infinite nag dialog loop when ignoring CA certificates
+
+* Mon Nov 19 2007 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.6.4.svn3096
+- Fix crash when ignoring CA certificate for EAP-TLS, EAP-TTLS, and EAP-PEAP
+
+* Mon Nov 19 2007 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.6.3.svn3096
+- Fix connections when picking a WPA Enterprise AP from the menu
+- Fix issue where applet would provide multiple same connections to NM
+
+* Thu Nov 15 2007 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.6.3.svn3094
+- Add support for EAP-PEAP (rh #362251)
+- Fix EAP-TLS private key handling
+
+* Tue Nov 13 2007 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.6.2.svn3080
+- Clarify naming of WPA & WPA2 Personal encryption options (rh #374861, rh #373831)
+- Don't require a CA certificate for applicable EAP methods (rh #359001)
+- Fix certificate and private key handling for EAP-TTLS and EAP-TLS (rh #323371)
+- Fix applet crash with USB devices (rh #337191)
+- Support upgrades from NM 0.6.x GConf settings
+
+* Thu Nov  1 2007 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.6.1.svn3030
+- Fix applet crash with USB devices that don't advertise a product or vendor
+    (rh #337191)
+
+* Sat Oct 27 2007 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.5.svn3030
+- Fix crash when getting WPA secrets (rh #355041)
+
+* Fri Oct 26 2007 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.4.svn3030
+- Bring up ethernet devices by default if no connections are defined (rh #339201)
+- Fix crash when switching networks or bringing up secrets dialog (rh #353091)
+- Fix crash when editing VPN connection properties a second time
+- Fix crash when cancelling the secrets dialog if another connection was
+    activated in the mean time
+- Fix disembodied notification bubbles (rh #333391)
+
+* Thu Oct 25 2007 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.4.svn3020
+- Handle PEM certificates
+- Hide WPA-PSK Type combo since it's as yet unused
+- Fix applet crash when AP security options changed and old secrets are still
+    in the keyring
+- Fix applet crash connecting to unencrypted APs via the other network dialog
+
+* Wed Oct 24 2007 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.3.svn3020
+- Fix WPA Enterprise connections that use certificates
+- Better display of SSIDs in the menu
+
+* Wed Oct 24 2007 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.3.svn3016
+- Fix getting current access point
+- Fix WPA Enterprise connections
+- Wireless dialog now defaults to sensible choices based on the connection
+- Tell nscd to restart if needed, don't silently kill it
+
+* Tue Oct 23 2007 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.3.svn3014
+- Suppress excessive GConf updates which sometimes caused secrets to be cleared
+    at the wrong times, causing connections to fail
+- Various EAP and LEAP related fixes
+
+* Tue Oct 23 2007 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.3.svn3008
+- Make WPA-EAP and Dynamic WEP options connect successfully
+- Static IPs are now handled correctly in NM itself
+
+* Mon Oct 22 2007 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.3.svn2995
+- Add Dynamic WEP as a supported authentication/security option
+
+* Sun Oct 21 2007 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.3.svn2994
+- Re-enable "Connect to other network"
+- Switch to new GUI bits for wireless security config and password entry
+
+* Tue Oct 16 2007 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.3.svn2983
+- Add rfkill functionality
+- Fix applet crash when choosing wired networks from the menu
+
+* Wed Oct 10 2007 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.3.svn2970
+- Fix segfault with deferred connections
+- Fix default username with vpnc VPN plugin
+- Hidden SSID fixes
+
+* Tue Oct  9 2007 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.3.svn2962
+- Fix merging of non-SSID-broadcasting APs into a device's scan list
+- Speed up opening of the applet menu
+
+* Tue Oct  9 2007 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.3.svn2961
+- New snapshot
+	- Add timestamps to networks to connect to last used wireless network
+	- Turn autoconnect on in the applet
+	- Hidden SSID support
+	- Invalidate failed or cancelled connections again
+	- Fix issues with reactivation of the same device
+	- Handle connection updates in the applet (ex. find new VPN connections)
+	- Fix vertical sizing of menu items
+	- Fix AP list on wireless devices other than the first device in the applet
+	- Fix matching of current AP with the right menu item
+
+* Fri Sep 28 2007 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.3.svn2914
+- New snapshot
+	- Add WPA passphrase support to password dialog
+	- Applet now reflects actual VPN behavior of one active connection
+	- Applet now notices VPN active connections on startup
+	- Fix connections with some WPA and WEP keys
+
+* Thu Sep 27 2007 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.3.svn2907
+- New snapshot
+	- VPN support (only vpnc plugin ported at this time)
+
+* Tue Sep 25 2007 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.3.svn2886
+- New snapshot
+	- Make wired device carrier state work in the applet
+	- Fix handling of errors with unencrypted APs
+	- Fix "frozen" applet icon by reporting NM state better
+	- Fix output of AP frequency in nm-tool
+
+* Tue Sep 25 2007 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.3.svn2880
+- New snapshot
+	- Fix applet icon sizing on start (mclasen)
+	- Fix nm-tool installation (mclasen)
+	- Fix 'state' method call return (#303271)
+	- Fix 40-bit WEP keys (again)
+	- Fix loop when secrets were wrong/invalid
+	- Fix applet crash when clicking Cancel in the password dialog
+	- Ensure NM doesn't get stuck waiting for the supplicant to re-appear
+		if it crashes or goes away
+	- Make VPN properties applet work again
+	- Increase timeout for network password entry
+
+* Fri Sep 21 2007 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.3.svn2852
+- New snapshot (fix unencrypted & 40 bit WEP)
+
+* Fri Sep 21 2007 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.3.svn2849
+- New snapshot
+
+* Fri Sep 21 2007 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.3.svn2844
+- New snapshot
+
+* Thu Sep 20 2007 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.2.svn2833
+- New SVN snapshot of 0.7 that sucks less
+
+* Thu Aug 30 2007 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.1.svn2736
+- Update to SVN snapshot of 0.7
+
+* Mon Aug 13 2007 Christopher Aillon <caillon@redhat.com> 1:0.6.5-9
+- Update the license tag
+
+* Wed Aug  8 2007 Christopher Aillon <caillon@redhat.com> 1:0.6.5-8
+- Own /etc/NetworkManager/dispatcher.d and /etc/NetworkManager/VPN (#234004)
+
+* Wed Jun 27 2007 Dan Williams <dcbw@redhat.com> 1:0.6.5-7
+- Fix Wireless Enabled checkbox when no killswitches are present
+
+* Thu Jun 21 2007 Dan Williams <dcbw@redhat.com> 1:0.6.5-6
+- Update to stable branch snapshot:
+    - More fixes for ethernet link detection (gnome #354565, rh #194124)
+    - Support for HAL-detected rfkill switches
+
+* Sun Jun 10 2007 Dan Williams <dcbw@redhat.com> 1:0.6.5-5
+- Fix applet crash on 64-bit platforms when choosing
+    "Connect to other wireless network..." (gnome.org #435036)
+- Add debug output for ethernet device link changes
+
+* Thu Jun  7 2007 Dan Williams <dcbw@redhat.com> 1:0.6.5-4
+- Fix ethernet link detection (gnome #354565, rh #194124)
+- Fix perpetual credentials request with private key passwords in the applet
+- Sleep a bit before activating wireless cards to work around driver bugs
+
+* Mon Jun  4 2007 Dan Williams <dcbw@redhat.com> 1:0.6.5-3
+- Don't spawn wpa_supplicant with -o
+
+* Wed Apr 25 2007 Christopher Aillon <caillon@redhat.com> 1:0.6.5-2
+- Fix requires macro (237806)
+
+* Thu Apr 19 2007 Christopher Aillon <caillon@redhat.com> 1:0.6.5-1
+- Update to 0.6.5 final
+- Don't lose scanned security information
+
+* 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)
+
+* Sun Mar 25 2007 Matthias Clasen <mclasen@redhat.com> 1:0.6.5-0.5.svn2474
+- Fix a directory ownership issue.  (#233763)
+
+* Thu Mar 15 2007 Dan Williams <dcbw@redhat.com> - 1:0.6.5-0.4.svn2474
+- Update to pre-0.6.5 snapshot
+
+* Thu Feb  8 2007 Christopher Aillon <caillon@redhat.com> - 1:0.6.5-0.3.cvs20061025
+- Guard against D-Bus LimitExceeded messages
+
+* Fri Feb  2 2007 Christopher Aillon <caillon@redhat.com> - 1:0.6.5-0.2.cvs20061025
+- Move .so file to -devel package
+
+* Sat Nov 25 2006 Matthias Clasen <mclasen@redhat.com> 
+- Own the /etc/NetworkManager/dispatcher.d directory
+- Require pkgconfig for the -devel packages
+- Fix compilation with dbus 1.0
+
+* Wed Oct 25 2006 Dan Williams <dcbw@redhat.com> - 1:0.6.5-0.cvs20061025
+- Update to a stable branch snapshot
+    - Gnome applet timeout/redraw suppression when idle
+    - Backport of LEAP patch from HEAD (from Thiago Bauermann)
+    - Backport of asynchronous scanning patch from HEAD
+    - Make renaming of VPN connections work (from Tambet Ingo)
+    - Dial down wpa_supplicant debug spew
+    - Cleanup of key/passphrase request scenarios (from Valentine Sinitsyn)
+    - Shut down VPN connections on logout (from Robert Love)
+    - Fix WPA passphrase hashing on PPC
+
+* Thu Oct 19 2006 Christopher Aillon <caillon@redhat.com> - 1:0.6.4-6
+- Own /usr/share/NetworkManager and /usr/include/NetworkManager
+
+* Mon Sep  4 2006 Christopher Aillon <caillon@redhat.com> - 1:0.6.4-5
+- Don't wake up to redraw if NM is inactive (#204850)
+
+* Wed Aug 30 2006 Bill Nottingham <notting@redhat.com> - 1:0.6.4-4
+- add epochs in requirements
+
+* Wed Aug 30 2006 Dan Williams <dcbw@redhat.com> - 1:0.6.4-3
+- Fix FC-5 buildreqs
+
+* Wed Aug 30 2006 Dan Williams <dcbw@redhat.com> - 1:0.6.4-2
+- Revert FC6 to latest stable NM
+- Update to stable snapshot
+- Remove bind/caching-nameserver hard requirement
+
+* Tue Aug 29 2006 Christopher Aillon <caillon@redhat.com> - 0.7.0-0.cvs20060529.7
+- BuildRequire wireless-tools-devel and perl-XML-Parser
+- Update the BuildRoot tag
+
+* Wed Aug 16 2006 Ray Strode <rstrode@redhat.com> - 0.7.0-0.cvs20060529.6
+- add patch to make networkmanager less verbose (bug 202832)
+
+* Wed Aug  9 2006 Ray Strode <rstrode@redhat.com> - 0.7.0-0.cvs20060529.5
+- actually make the patch in 0.7.0-0.cvs20060529.4 apply
+
+* Fri Aug  4 2006 Ray Strode <rstrode@redhat.com> - 0.7.0-0.cvs20060529.4
+- Don't ever elect inactive wired devices (bug 194124).
+
+* Wed Jul 19 2006 John (J5) Palmieri <johnp@redhat.com> - 0.7.0-0.cvs20060529.3
+- Add patch to fix deprecated dbus functions
+
+* Tue Jul 18 2006 John (J5) Palmieri <johnp@redhat.com> - 0.7.0-0.cvs20060529.2
+- Add BR for dbus-glib-devel
+
+* Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 0.7.0-0.cvs20060529.1.1
+- rebuild
+
+* Mon May 29 2006 Dan Williams <dcbw@redhat.com> - 0.7.0-0.cvs20060529
+- Update to latest CVS
+	o Gnome.org #333420: dialog do not have window icons
+	o Gnome.org #336913: HIG tweaks for vpn properties pages
+	o Gnome.org #336846: HIG tweaks for nm-vpn-properties
+	o Gnome.org #336847: some bugs in nm-vpn-properties args parsing
+	o Gnome.org #341306: nm-vpn-properties crashes on startup
+	o Gnome.org #341263: Version 0.6.2-0ubuntu5 crashes on nm_device_802_11_wireless_get_type
+	o Gnome.org #341297: displays repeated keyring dialogs on resume from suspend
+	o Gnome.org #342400: Building libnm-util --without-gcrypt results in linker error
+	o Gnome.org #342398: Eleminate Gnome dependency for NetworkManager
+	o Gnome.org #336532: declaration of 'link' shadows a global declaration
+- Specfile fixes (#rh187489#)
+
+* Sun May 21 2006 Dan Williams <dcbw@redhat.com> - 0.7.0-0.cvs20060521
+- Update to latest CVS
+- Drop special-case-madwifi.patch, since WEXT code is in madwifi-ng trunk now
+
+* Fri May 19 2006 Bill Nottingham <notting@redhat.com> - 0.6.2-3.fc6
+- use the same 0.6.2 tarball as FC5, so we have the same VPN interface
+  (did he fire ten args, or only nine?)
+
+* Thu Apr 27 2006 Jeremy Katz <katzj@redhat.com> - 0.6.2-2.fc6
+- use the hal device type instead of poking via ioctl so that wireless 
+  devices are properly detected even if the kill switch has been used
+
+* Thu Mar 30 2006 Dan Williams <dcbw@redhat.com> - 0.6.2-1
+- Update to 0.6.2:
+	* Fix various WPA-related bugs
+	* Clean up leaks
+	* Increased DHCP timeout to account for slow DHCP servers, or STP-enabled
+		switches
+	* Allow applet to reconnect on dbus restarts
+	* Add "Dynamic WEP" support
+	* Allow hiding of password/key entry text
+	* More responsive connection switching
+
+* Tue Mar 14 2006 Peter Jones <pjones@redhat.com> - 0.6.0-3
+- Fix device bringup on resume
+
+* Mon Mar  6 2006 Dan Williams <dcbw@redhat.com> 0.6.0-2
+- Don't let wpa_supplicant perform scanning with non-WPA drivers
+
+* Mon Mar  6 2006 Dan Williams <dcbw@redhat.com> 0.6.0-1
+- Update to 0.6.0 release
+- Move autostart file to /usr/share/gnome/autostart
+
+* Thu Mar  2 2006 Jeremy Katz <katzj@redhat.com> - 0.5.1-18.cvs20060302
+- updated cvs snapshot.  seems to make airo much less neurotic
+
+* Thu Mar  2 2006 Christopher Aillon <caillon@redhat.com>
+- Move the unversioned libnm_glib.so to the -devel package
+
+* Wed Mar  1 2006 Dan Williams <dcbw@redhat.com> 0.5.1-18.cvs20060301
+- Fix VPN-related crash
+- Fix issue where NM would refuse to activate a VPN connection once it had timed out
+- Log wpa_supplicant output for better debugging
+
+* Tue Feb 28 2006 Christopher Aillon <caillon@redhat.com> 0.5.1-17.cvs20060228
+- Tweak three-scan-prune.patch
+
+* Mon Feb 27 2006 Christopher Aillon <caillon@redhat.com> 0.5.1-16.cvs20060227
+- Don't prune networks until they've gone MIA for three scans, not one.
+
+* Mon Feb 27 2006 Christopher Aillon <caillon@redhat.com> 0.5.1-15.cvs20060227
+- Update snapshot, which fixes up the libnotify stuff.
+
+* Fri Feb 24 2006 Dan Williams <dcbw@redhat.coM> 0.5.1-14.cvs20060221
+- Move libnotify requires to NetworkManager-gnome, not core NM package
+
+* Tue Feb 21 2006 Dan Williams <dcbw@redhat.com> 0.5.1-13.cvs20060221
+- Add BuildRequires: libnl-devel (#rh179438#)
+- Fix libnm_glib to not clobber an application's existing dbus connection
+	(#rh177546#, gnome.org #326572)
+- libnotify support
+- AP compatibility fixes
+
+* Mon Feb 13 2006 Dan Williams <dcbw@redhat.com> 0.5.1-12.cvs20060213
+- Minor bug fixes
+- Update to VPN dbus API for passing user-defined routes to vpn service
+
+* Sun Feb 12 2006 Christopher Aillon <caillon@redhat.com> 0.5.1-11.cvs20060205
+- Rebuild
+
+* Tue Feb 07 2006 Jesse Keating <jkeating@redhat.com> 0.5.1-10.cvs20060205.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
+* Sun Feb  5 2006 Dan Williams <dcbw@redhat.com> 0.5.1-10.cvs20060205
+- Workarounds for madwifi/Atheros cards
+- Do better with non-SSID-broadcasting access points
+- Fix hangs when access points change settings
+
+* Thu Feb  2 2006 Dan Williams <dcbw@redhat.com> 0.5.1-9.cvs20060202
+- Own /var/run/NetworkManager, fix SELinux issues
+
+* Tue Jan 31 2006 Dan Williams <dcbw@redhat.com> 0.5.1-8.cvs20060131
+- Switch to autostarting the applet instead of having it be session-managed
+- Work better with non-broadcasting access points
+- Add more manufacturer default SSIDs to the blacklist
+
+* Tue Jan 31 2006 Dan Williams <dcbw@redhat.com> 0.5.1-7.cvs20060131
+- Longer association timeout
+- Fix some SELinux issues
+- General bug and cosmetic fixes
+
+* Fri Jan 27 2006 Dan Williams <dcbw@redhat.com> 0.5.1-6.cvs20060127
+- Snapshot from CVS
+- WPA Support!  Woohoo!
+
+* Fri Dec 09 2005 Jesse Keating <jkeating@redhat.com>
+- rebuilt
+
+* Thu Dec 01 2005 John (J5) Palmieri <johnp@redhat.com> - 0.5.1-5
+- rebuild for new dbus
+
+* Fri Nov 18 2005 Peter Jones <pjones@redhat.com> - 0.5.1-4
+- Don't kill the network connection when you upgrade the package.
+
+* Fri Oct 21 2005 Christopher Aillon <caillon@redhat.com> - 0.5.1-3
+- Split out the -glib subpackage to have a -glib-devel package as well
+- Add epoch to version requirements for bind and wireless-tools
+- Update URL of project
+
+* Wed Oct 19 2005 Christopher Aillon <caillon@redhat.com> - 0.5.1-2
+- NetworkManager 0.5.1
+
+* Mon Oct 17 2005 Christopher Aillon <caillon@redhat.com> - 0.5.0-2
+- NetworkManager 0.5.0
+
+* Mon Oct 10 2005 Dan Williams <dcbw@redaht.com> - 0.4.1-5.cvs20051010
+- Fix automatic wireless connections
+- Remove usage of NMLoadModules callout, no longer needed
+- Try to fix deadlock when menu is down and keyring dialog pops up
+
+* Sun Oct 09 2005 Dan Williams <dcbw@redhat.com> - 0.4.1-4.cvs20051009
+- Update to latest CVS
+	o Integrate connection progress with applet icon (Chris Aillon)
+	o More information in "Connection Information" dialog (Robert Love)
+	o Shorten time taken to sleep
+	o Make applet icon wireless strength levels a bit more realistic
+	o Talk to named using DBUS rather than spawning our own
+		- You need to add "-D" to the OPTIONS line in /etc/sysconfig/named
+		- You need to set named to start as a service on startup
+
+* Thu Sep 22 2005 Dan Williams <dcbw@redhat.com> - 0.4.1-3.cvs20050922
+- Update to current CVS to fix issues with routing table and /sbin/ip
+
+* Mon Sep 12 2005 Jeremy Katz <katzj@redhat.com> - 0.4.1-2.cvs20050912
+- update to current CVS and rebuild (workaround for #168120)
+
+* Fri Aug 19 2005 Dan Williams <dcbw@redhat.com> - 0.4.1-2.cvs20050819
+- Fix occasional hang in NM caused by the applet
+
+* Wed Aug 17 2005 Dan Williams <dcbw@redhat.com> - 0.4.1
+- Update to NetworkManager 0.4.1
+
+* Tue Aug 16 2005 Dan Williams <dcbw@redhat.com> - 0.4-36.cvs20050811
+- Rebuild against new cairo/gtk
+
+* Thu Aug 11 2005 Dan Williams <dcbw@redhat.com> - 0.4-35.cvs20050811
+- Update to latest CVS
+	o Use DHCP server address as gateway address if the DHCP server doesn't give
+		us a gateway address #rh165698#
+	o Fixes to the applet (Robert Love)
+	o Better caching of information in the applet (Bill Moss)
+	o Generate automatic suggested Ad-Hoc network name from machine's hostname
+		(Robert Love)
+	o Update all network information on successfull connect, not just 
+		authentication method
+
+* Fri Jul 29 2005 Ray Strode  <rstrode@redhat.com> - 0.4-34.cvs20050729
+- Update to latest CVS to get fix for bug 165683.
+
+* Mon Jul 11 2005 Dan Williams <dcbw@redhat.com> - 0.4-34.cvs20050629
+- Move pkgconfig file to devel package (#162316, thanks to Michael Schwendt)
+
+* Wed Jun 29 2005 David Zeuthen <davidz@redhat.com> - 0.4-33.cvs20050629
+- Update to latest CVS to get latest VPN interface settings to satisfy
+  BuildReq for NetworkManager-vpnc in Fedora Extras Development
+- Latest CVS also contains various bug- and UI-fixes
+
+* Fri Jun 17 2005 Dan Williams <dcbw@redhat.com> - 0.4-32.cvs20050617
+- Update to latest CVS
+	o VPN connection import/export capability
+	o Fix up some menu item names
+- Move nm-vpn-properties.glade to the gnome subpackage
+
+* Thu Jun 16 2005 Dan Williams <dcbw@redhat.com> - 0.4-31.cvs20050616
+- Update to latest CVS
+	o Clean up wording in Wireless Network Discovery menu
+	o Robert Love's applet beautify patch
+
+* Wed Jun 15 2005 Dan Williams <dcbw@redhat.com> - 0.4-30.cvs20050615
+- Update to latest CVS
+
+* Mon May 16 2005 Dan Williams <dcbw@redhat.com> - 0.4-15.cvs30050404
+- Fix dispatcher and applet CFLAGS so they gets compiled with FORTIFY_SOURCE
+
+* Mon May 16 2005 Dan Williams <dcbw@redhat.com> - 0.4-14.cvs30050404
+- Fix segfault in NetworkManagerDispatcher, add an initscript for it
+
+* Mon May 16 2005 Dan Williams <dcbw@redhat.com> - 0.4-13.cvs30050404
+- Fix condition that may have resulted in DHCP client returning success
+	when it really timed out
+
+* Sat May 14 2005 Dan Williams <dcbw@redhat.com> - 0.4-12.cvs20050404
+- Enable OK button correctly in Passphrase and Other Networks dialogs when
+	using ASCII or Hex WEP keys
+
+* Thu May  5 2005 Dan Williams <dcbw@redhat.com> - 0.4-11.cvs20050404
+- #rh154391# NetworkManager dies on startup (don't force-kill nifd)
+
+* Wed May  4 2005 Dan Williams <dcbw@redhat.com> - 0.4-10.cvs20050404
+- Fix leak of a socket in DHCP code
+
+* Wed May  4 2005 Dan Williams <dcbw@redhat.com> - 0.4-9.cvs20050404
+- Fix some memory leaks (Tom Parker)
+- Join to threads rather than spinning for their completion (Tom Parker)
+- Fix misuse of a g_assert() (Colin Walters)
+- Fix return checking of an ioctl() (Bill Moss)
+- Better detection and matching of hidden access points (Bill Moss)
+- Don't use varargs, and therefore don't crash on PPC (Peter Jones)
+
+* Wed Apr 27 2005 Jeremy Katz <katzj@redhat.com> - 0.4-8.cvs20050404
+- fix build with newer dbus
+
+* Wed Apr 27 2005 Jeremy Katz <katzj@redhat.com> - 0.4-7.cvs20050404
+- silence %%post
+
+* Mon Apr  4 2005 Dan Williams <dcbw@redhat.com> 0.4-6.cvs20050404
+- #rh153234# NetworkManager quits/cores just as a connection is made
+
+* Sat Apr  2 2005 Dan Williams <dcbw@redhat.com> 0.4-5.cvs20050402
+- Update from latest CVS HEAD
+
+* Fri Mar 25 2005 Christopher Aillon <caillon@redhat.com> 0.4-4.cvs20050315
+- Update the GTK+ theme icon cache on (un)install
+
+* Tue Mar 15 2005 Ray Strode <rstrode@redhat.com> 0.4-3.cvs20050315
+- Pull from latest CVS HEAD
+
+* Tue Mar 15 2005 Ray Strode <rstrode@redhat.com> 0.4-2.cvs20050315
+- Upload new source tarball (woops)
+
+* Tue Mar 15 2005 Ray Strode <rstrode@redhat.com> 0.4-1.cvs20050315
+- Pull from latest CVS HEAD (hopefully works again)
+
+* Mon Mar  7 2005 Ray Strode <rstrode@redhat.com> 0.4-1.cvs20050307
+- Pull from latest CVS HEAD
+- Commit broken NetworkManager to satisfy to dbus dependency
+
+* Fri Mar  4 2005 Dan Williams <dcbw@redhat.com> 0.3.4-1.cvs20050304
+- Pull from latest CVS HEAD
+- Rebuild for gcc 4.0
+
+* Tue Feb 22 2005 Dan Williams <dcbw@redhat.com> 0.3.3-2.cvs20050222
+- Update from CVS
+
+* Mon Feb 14 2005 Dan Williams <dcbw@redhat.com> 0.3.3-2.cvs20050214.x.1
+- Fix free of invalid pointer for multiple search domains
+
+* Mon Feb 14 2005 Dan Williams <dcbw@redhat.com> 0.3.3-2.cvs20050214
+- Never automatically choose a device that doesn't support carrier detection
+- Add right-click menu to applet, can now "Pause/Resume" scanning through it
+- Fix DHCP Renew/Rebind timeouts
+- Fix frequency cycling problem on some cards, even when scanning was off
+- Play better with IPv6
+- Don't send kernel version in DHCP packets, and ensure DHCP packets are at
+	least 300 bytes in length to work around broken router
+- New DHCP options D-BUS API by Dan Reed
+- Handle multiple domain search options in DHCP responses
+
+* Wed Feb  2 2005 Dan Williams <dcbw@redhat.com> 0.3.3-1.cvs20050202
+- Display wireless network name in applet tooltip
+- Hopefully fix double-default-route problem
+- Write out valid resolv.conf when we exit
+- Make multi-domain search options work
+- Rework signal strength code to be WEXT conformant, if strength is
+	still wierd then its 95% surely a driver problem
+- Fix annoying instances of suddenly dropping and reactivating a
+	wireless device (Cisco cards were worst offenders here)
+- Fix some instances of NetworkManager not remembering your WEP key
+- Fix some races between NetworkManager and NetworkManagerInfo where
+	NetworkManager wouldn't recognize changes in the allowed list
+- Don't shove Ad-Hoc Access Point MAC addresses into GConf
+
+* Tue Jan 25 2005 Dan Williams <dcbw@redhat.com> 0.3.3-1.cvs20050125
+- Play nice with dbus 0.23
+- Update our list of Allowed Wireless Networks more quickly
+
+* Mon Jan 24 2005 Dan Williams <dcbw@redhat.com> 0.3.3-1.cvs20050124
+- Update to latest CVS
+- Make sure we start as late as possible so that we ensure dbus & HAL
+	are already around
+- Fix race in initial device activation
+
+* Mon Jan 24 2005 Than Ngo <than@redhat.com> 0.3.3-1.cvs20050112.4
+- rebuilt against new wireless tool
+
+* Fri Jan 21 2005 <dcbw@redhat.com> - 0.3.3-1.cvs20050118
+- Fix issue where NM wouldn't recognize that access points were
+	encrypted, and then would try to connect without encryption
+- Refine packaging to put client library in separate package
+- Remove bind+caching-nameserver dep for FC-3, use 'nscd -i hosts'
+	instead.  DNS queries may timeout now right after device
+	activation due to this change.
+
+* Wed Jan 12 2005 <dcbw@redhat.com> - 0.3.3-1.cvs20050112
+- Update to latest CVS
+- Fixes to DHCP code
+- Link-Local (ZeroConf/Rendezvous) support
+- Use bind in "caching-nameserver" mode to work around stupidity
+	in glibc's resolver library not recognizing resolv.conf changes
+- #rh144818# Clean up the specfile (Patch from Matthias Saou)
+- Ad-Hoc mode support with Link-Local addressing only (for now)
+- Fixes for device activation race conditions
+- Wireless scanning in separate thread
+
+* Wed Dec  8 2004 <dcbw@redhat.com> - 0.3.2-4.3.cvs20041208
+- Update to CVS
+- Updates to link detection, DHCP code
+- Remove NMLaunchHelper so we start up faster and don't
+	block for a connection.  This means services that depend
+	on the network may fail if they start right after NM
+- Make sure DHCP renew/rebinding works
+
+* Wed Nov 17 2004 <dcbw@redhat.com> - 0.3.2-3.cvs20041117
+- Update to CVS
+- Fixes to link detection
+- Better detection of non-ESSID-broadcasting access points
+- Don't dialog-spam the user if a connection fails
+
+* Thu Nov 11 2004 <dcbw@redhat.com> - 0.3.2-2.cvs20041115
+- Update to CVS
+- Much better link detection, works with Open System authentication
+- Blacklist wireless cards rather than whitelisting them
+
+* Fri Oct 29 2004 <dcbw@redhat.com> - 0.3.2-2.cvs20041029
+- #rh134893# NetworkManagerInfo and the panel-icon life-cycle
+- #rh134895# Status icon should hide when in Wired-only mode
+- #rh134896# Icon code needs rewrite
+- #rh134897# "Other Networks..." dialog needs implementing
+- #rh135055# Menu highlights incorrectly in NM
+- #rh135648# segfault with cipsec0
+- #rh135722# NetworkManager will not allow zaurus to sync via usb0
+- #rh135999# NetworkManager-0.3.1 will not connect to 128 wep
+- #rh136866# applet needs tooltips
+- #rh137047# lots of applets, yay!
+- #rh137341# Network Manager dies after disconnecting from wired network second time
+- Better checking for wireless devices
+- Fix some memleaks
+- Fix issues with dhclient declining an offered address
+- Fix an activation thread deadlock
+- More accurately detect "Other wireless networks" that are encrypted
+- Don't bring devices down as much, won't hotplug-spam as much anymore
+	about firmware
+- Add a "network not found" dialog when the user chooses a network that could
+	not be connected to
+
+* Tue Oct 26 2004 <dcbw@redhat.com> - 0.3.1-2
+- Fix escaping of ESSIDs in gconf
+
+* Tue Oct 19 2004  <jrb@redhat.com> - 0.3.1-1
+- minor point release to improve error handling and translations
+
+* Fri Oct 15 2004 Dan Williams <dcbw@redhat.com> 0.3-1
+- Update from CVS, version 0.3
+
+* Tue Oct 12 2004 Dan Williams <dcbw@redhat.com> 0.2-4
+- Update from CVS
+- Improvements:
+	o Better link checking on wireless cards
+	o Panel applet now a Notification Area icon
+	o Static IP configuration support
+
+* Mon Sep 13 2004 Dan Williams <dcbw@redhat.com> 0.2-3
+- Update from CVS
+
+* Sat Sep 11 2004 Dan Williams <dcbw@redhat.com> 0.2-2
+- Require gnome-panel, not gnome-panel-devel
+- Turn off by default
+
+* Thu Aug 26 2004 Dan Williams <dcbw@redhat.com> 0.2-1
+- Update to 0.2
+
+* Thu Aug 26 2004 Florian La Roche <Florian.LaRoche@redhat.de>
+- spec-changes to req glib2 instead of glib
+
+* Fri Aug 20 2004 Dan Williams <dcbw@redhat.com> 0.1-3
+- First public release
+