diff --git a/ChangeLog b/ChangeLog
index 5a43d8ba06..fb289fb99a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2007-11-13  Dan Williams  <dcbw@redhat.com>
+
+	* libnm-glib/nm-device-802-11-wireless.h
+	  libnm-glib/nm-device-802-11-wireless.c
+		- (nm_device_802_11_wireless_get_hw_address): return should be const
+
+	* test/nm-tool.c
+	  libnm-glib/libnm-glib-test.c
+		- Fixes for above change
+
 2007-11-12  Dan Williams  <dcbw@redhat.com>
 
 	* src/supplicant-manager/nm-supplicant-settings-verify.c
diff --git a/libnm-glib/libnm-glib-test.c b/libnm-glib/libnm-glib-test.c
index e69304eb94..603a6f1e48 100644
--- a/libnm-glib/libnm-glib-test.c
+++ b/libnm-glib/libnm-glib-test.c
@@ -148,7 +148,7 @@ dump_access_point (NMAccessPoint *ap)
 static void
 dump_wireless (NMDevice80211Wireless *device)
 {
-	char *str;
+	const char *str;
 	GSList *iter;
 	GSList *aps;
 
@@ -157,7 +157,6 @@ dump_wireless (NMDevice80211Wireless *device)
 
 	str = nm_device_802_11_wireless_get_hw_address (device);
 	g_print ("MAC: %s\n", str);
-	g_free (str);
 
 	g_print ("AccessPoints:\n");
 	aps = nm_device_802_11_wireless_get_access_points (device);
diff --git a/libnm-glib/nm-device-802-11-wireless.c b/libnm-glib/nm-device-802-11-wireless.c
index bd390b3d90..a2e64abeb2 100644
--- a/libnm-glib/nm-device-802-11-wireless.c
+++ b/libnm-glib/nm-device-802-11-wireless.c
@@ -73,7 +73,7 @@ nm_device_802_11_wireless_set_hw_address (NMDevice80211Wireless *self,
 	g_object_notify (G_OBJECT (self), NM_DEVICE_802_11_WIRELESS_HW_ADDRESS);
 }
 
-char *
+const char *
 nm_device_802_11_wireless_get_hw_address (NMDevice80211Wireless *device)
 {
 	NMDevice80211WirelessPrivate *priv;
diff --git a/libnm-glib/nm-device-802-11-wireless.h b/libnm-glib/nm-device-802-11-wireless.h
index 2c912c3d41..456d77d574 100644
--- a/libnm-glib/nm-device-802-11-wireless.h
+++ b/libnm-glib/nm-device-802-11-wireless.h
@@ -36,7 +36,7 @@ GType nm_device_802_11_wireless_get_type (void);
 NMDevice80211Wireless *nm_device_802_11_wireless_new         (DBusGConnection *connection,
 															  const char *path);
 
-char *          nm_device_802_11_wireless_get_hw_address           (NMDevice80211Wireless *device);
+const char *    nm_device_802_11_wireless_get_hw_address           (NMDevice80211Wireless *device);
 int             nm_device_802_11_wireless_get_mode                 (NMDevice80211Wireless *device);
 guint32         nm_device_802_11_wireless_get_bitrate              (NMDevice80211Wireless *device);
 guint32         nm_device_802_11_wireless_get_capabilities         (NMDevice80211Wireless *device);
diff --git a/test/nm-tool.c b/test/nm-tool.c
index 3770254116..511e908517 100644
--- a/test/nm-tool.c
+++ b/test/nm-tool.c
@@ -207,7 +207,7 @@ detail_device (gpointer data, gpointer user_data)
 	if (NM_IS_DEVICE_802_3_ETHERNET (device))
 		tmp = nm_device_802_3_ethernet_get_hw_address (NM_DEVICE_802_3_ETHERNET (device));
 	else if (NM_IS_DEVICE_802_11_WIRELESS (device))
-		tmp = nm_device_802_11_wireless_get_hw_address (NM_DEVICE_802_11_WIRELESS (device));
+		tmp = g_strdup (nm_device_802_11_wireless_get_hw_address (NM_DEVICE_802_11_WIRELESS (device)));
 
 	if (tmp) {
 		print_string ("HW Address", tmp);