diff --git a/ChangeLog b/ChangeLog
index eb41b284cb..dd98573bdb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-11-15  Dan Williams  <dcbw@redhat.com>
+
+	* libnm-glib/nm-device.h
+	  libnm-glib/nm-device.c
+		- (nm_device_get_product, nm_device_get_vendor): should be returning
+			const char *
+
 2007-11-15  Dan Williams  <dcbw@redhat.com>
 
 	* libnm-glib/nm-device.c
diff --git a/libnm-glib/nm-device.c b/libnm-glib/nm-device.c
index c1c58edac3..82d9b3fb3d 100644
--- a/libnm-glib/nm-device.c
+++ b/libnm-glib/nm-device.c
@@ -383,7 +383,7 @@ nm_device_update_description (NMDevice *device)
 	g_free (pd_parent_udi);
 }
 
-char *
+const char *
 nm_device_get_product (NMDevice *device)
 {
 	NMDevicePrivate *priv;
@@ -396,7 +396,7 @@ nm_device_get_product (NMDevice *device)
 	return priv->product;
 }
 
-char *
+const char *
 nm_device_get_vendor (NMDevice *device)
 {
 	NMDevicePrivate *priv;
diff --git a/libnm-glib/nm-device.h b/libnm-glib/nm-device.h
index 57c1516828..121994278a 100644
--- a/libnm-glib/nm-device.h
+++ b/libnm-glib/nm-device.h
@@ -44,8 +44,8 @@ guint32       nm_device_get_capabilities (NMDevice *device);
 guint32       nm_device_get_ip4_address  (NMDevice *device);
 NMIP4Config  *nm_device_get_ip4_config   (NMDevice *device);
 NMDeviceState nm_device_get_state        (NMDevice *device);
-char         *nm_device_get_product      (NMDevice *device);
-char         *nm_device_get_vendor       (NMDevice *device);
+const char   *nm_device_get_product      (NMDevice *device);
+const char   *nm_device_get_vendor       (NMDevice *device);
 gboolean      nm_device_get_carrier      (NMDevice *device);
 
 NMDeviceType  nm_device_type_for_path    (DBusGConnection *connection,