diff --git a/ipmitool/lib/ipmi_strings.c b/ipmitool/lib/ipmi_strings.c
index bc21dd8..a29ebcc 100644
--- a/ipmitool/lib/ipmi_strings.c
+++ b/ipmitool/lib/ipmi_strings.c
@@ -162,18 +162,26 @@ const struct valstr entity_id_vals[] = {
 	{ 0x26, "Remote Management Device" },
 	{ 0x27, "External Environment" },
 	{ 0x28, "Battery" },
-    { 0x29, "Processing Blade" },
-    { 0x2A, "Connectivity Switch" },
-    { 0x2B, "Processor/Memory Module" },
-    { 0x2C, "I/O Module" },
-    { 0x2D, "Processor/IO Module" },
-    { 0x2E, "Management Controller Firmware" },
-    { 0x2F, "IPMI Channel" },
-    { 0x30, "PCI Bus" },
-    { 0x31, "PCI Express Bus" },
-    { 0x32, "SCSI Bus (parallel)" },
-    { 0x33, "SATA/SAS Bus" },
-    { 0x34, "Processor/Front-Side Bus" },
+   { 0x29, "Processing Blade" },
+   { 0x2A, "Connectivity Switch" },
+   { 0x2B, "Processor/Memory Module" },
+   { 0x2C, "I/O Module" },
+   { 0x2D, "Processor/IO Module" },
+   { 0x2E, "Management Controller Firmware" },
+   { 0x2F, "IPMI Channel" },
+   { 0x30, "PCI Bus" },
+   { 0x31, "PCI Express Bus" },
+   { 0x32, "SCSI Bus (parallel)" },
+   { 0x33, "SATA/SAS Bus" },
+   { 0x34, "Processor/Front-Side Bus" },
+   /* PICMG */
+   { 0xA0, "PICMG Front Board" },
+   { 0xC0, "PICMG Rear Transition Module" },
+   { 0xC1, "PICMG AdvancedMC Module" },
+   { 0xF0, "PICMG Shelf Management Controller" },
+   { 0xF1, "PICMG Filtration Unit" },
+   { 0xF2, "PICMG Shelf FRU Information" },
+   { 0xF3, "PICMG Alarm Panel" },
 	{ 0x00, NULL },
 };