diff --git a/ipmitool/include/ipmitool/helper.h b/ipmitool/include/ipmitool/helper.h
index 031da22..7033766 100644
--- a/ipmitool/include/ipmitool/helper.h
+++ b/ipmitool/include/ipmitool/helper.h
@@ -57,7 +57,7 @@ struct valstr {
 	const char * str;
 };
 struct oemvalstr {
-	uint16_t oem;
+	uint32_t oem;
    uint16_t val;
 	const char * str;
 };
diff --git a/ipmitool/lib/helper.c b/ipmitool/lib/helper.c
index 3109dfe..369d897 100644
--- a/ipmitool/lib/helper.c
+++ b/ipmitool/lib/helper.c
@@ -130,7 +130,7 @@ const char * oemval2str(uint32_t oem, uint16_t val,
 	static char un_str[32];
 	int i;
 
-	for (i = 0; vs[i].oem != 0x00 &&  vs[i].str != NULL; i++) {
+	for (i = 0; vs[i].oem != 0xffffff &&  vs[i].str != NULL; i++) {
       /* FIXME: for now on we assume PICMG capability on all IANAs */
       if
       (