diff --git a/ChangeLog b/ChangeLog
index b3066c3898..bbde30641a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-09-04  Dan Williams  <dcbw@redhat.com>
+
+	Patch from John Palmieri <johnp@redhat.com>
+	* gnome/applet/nm-device.c
+		- (nm_device_unref): clear network_device's memory _before_ freeing it
+
 2005-09-02  Christopher Aillon  <caillon@redhat.com>
 
 	* gnome/applet/applet.c: Use a check menu item for Wireless Enabled
diff --git a/gnome/applet/nm-device.c b/gnome/applet/nm-device.c
index 9e3ad54c0e..1105fd69d1 100644
--- a/gnome/applet/nm-device.c
+++ b/gnome/applet/nm-device.c
@@ -150,8 +150,8 @@ void network_device_unref (NetworkDevice *dev)
 		g_free (dev->udi);
 		g_free (dev->desc);
 		g_free (dev->addr);
-		g_free (dev);
 		memset (dev, 0, sizeof (NetworkDevice));
+		g_free (dev);
 	}
 }