diff --git a/docs/Config_Changes.md b/docs/Config_Changes.md
index fc59b66c..b5640587 100644
--- a/docs/Config_Changes.md
+++ b/docs/Config_Changes.md
@@ -6,6 +6,10 @@ All dates in this document are approximate.
 
 # Changes
 
+20191121: The USB name has changed on lpc176x.  It now uses the unique
+chip id by default.  Update the "serial" setting in the "mcu" config
+section accordingly.
+
 20191112: The tmc stepper driver virtual enable capability is now
 automatically enabled if the stepper does not have a dedicated stepper
 enable pin.  Remove references to tmcXXXX:virtual_enable from the
diff --git a/src/generic/usb_cdc.c b/src/generic/usb_cdc.c
index fa1c5cb1..e213a07c 100644
--- a/src/generic/usb_cdc.c
+++ b/src/generic/usb_cdc.c
@@ -124,7 +124,11 @@ DECL_TASK(usb_bulk_out_task);
 #define CONCAT1(a, b) a ## b
 #define CONCAT(a, b) CONCAT1(a, b)
 #define USB_STR_MANUFACTURER u"Klipper"
+#if CONFIG_HAVE_CHIPID // Temporarily limit new names to boards with CHIPID
+#define USB_STR_PRODUCT CONCAT(u,CONFIG_MCU)
+#else
 #define USB_STR_PRODUCT u"Klipper firmware"
+#endif
 #define USB_STR_SERIAL CONCAT(u,CONFIG_USB_SERIAL_NUMBER)
 
 // String descriptors