--- a/components/hwdata/hwdata.p5m	Fri Jun 13 10:00:52 2014 -0600
+++ b/components/hwdata/hwdata.p5m	Fri Jun 13 12:36:52 2014 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri \
@@ -41,9 +41,9 @@
 file usb.ids path=usr/share/hwdata/usb.ids
 license pci.ids.license license="BSD (pci.ids)" \
     com.oracle.info.description="the pci.ids list of PCI device & vendor IDs" \
-    com.oracle.info.name=pci.ids com.oracle.info.tpno=7530 \
+    com.oracle.info.name=pci.ids com.oracle.info.tpno=$(TPNO_PCI) \
     com.oracle.info.version=$(COMPONENT_VERSION_pci.ids)
 license usb.ids.license license="BSD (usb.ids)" \
     com.oracle.info.description="the usb.ids list of USB device & vendor IDs" \
-    com.oracle.info.name=usb.ids com.oracle.info.tpno=7831 \
+    com.oracle.info.name=usb.ids com.oracle.info.tpno=$(TPNO_USB) \
     com.oracle.info.version=$(COMPONENT_VERSION_usb.ids)