diff --git a/ChangeLog b/ChangeLog
index 7c32f55d66..78b3cb98c4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-10-04  Robert Love  <rml@novell.com>
+
+	* src/nm-dbus-device.c: Use iw_ether_ntop(), not ether_ntoa_r(), to
+	  convert an ether_addr structure's MAC into a string, because the
+	  latter will drop leading zero's and uses lower-case, e.g. 7:3b:4
+	  versus 07:3B:04, while the former will not.
+
 2005-10-04  Robert Love  <rml@novell.com>
 
 	* gnome/applet/applet-dbus-devices.c, gnome/applet/applet.c,
diff --git a/src/nm-dbus-device.c b/src/nm-dbus-device.c
index 7370c97a3a..2db3c9c276 100644
--- a/src/nm-dbus-device.c
+++ b/src/nm-dbus-device.c
@@ -121,7 +121,7 @@ static DBusMessage *nm_dbus_device_get_hw_address (DBusConnection *connection, D
 
 		nm_device_get_hw_address (dev, &addr);
 		memset (char_addr, 0, 20);
-		ether_ntoa_r (&addr, &char_addr[0]);
+		iw_ether_ntop (&addr, char_addr);
 		dbus_message_append_args (reply, DBUS_TYPE_STRING, &ptr, DBUS_TYPE_INVALID);
 	}
 
@@ -353,7 +353,7 @@ static DBusMessage *nm_dbus_device_get_properties (DBusConnection *connection, D
 
 		nm_device_get_hw_address (dev, &hw_addr);
 		memset (hw_addr_buf, 0, 20);
-		ether_ntoa_r (&hw_addr, &hw_addr_buf[0]);
+		iw_ether_ntop (&hw_addr, hw_addr_buf);
 
 		ip4config = nm_device_get_ip4_config (dev);
 		if (ip4config)