diff --git a/epan/dissectors/packet-usb.c b/epan/dissectors/packet-usb.c
index 587f540bbb..b6cae2e83c 100644
--- a/epan/dissectors/packet-usb.c
+++ b/epan/dissectors/packet-usb.c
@@ -145,7 +145,24 @@ static const value_string usb_langid_vals[] = {
 };
 
 static const value_string usb_interfaceclass_vals[] = {
-    {IF_CLASS_MASSTORAGE,	"Mass Storage Class"},
+    {IF_CLASS_FROM_INTERFACE_DESC,	"Use class info in Interface Descriptor"},
+    {IF_CLASS_AUDIO,			"AUDIO"},
+    {IF_CLASS_COMMUNICATIONS,		"COMMUNICATIONS"},
+    {IF_CLASS_HID,			"HID"},
+    {IF_CLASS_PHYSICAL,			"PHYSICAL"},
+    {IF_CLASS_IMAGE,			"IMAGE"},
+    {IF_CLASS_PRINTER,			"PRINTER"},
+    {IF_CLASS_MASSTORAGE,		"MASSTORAGE"},
+    {IF_CLASS_HUB,			"HUB"},
+    {IF_CLASS_CDC_DATA,			"CDC_DATA"},
+    {IF_CLASS_SMART_CARD,		"SMART_CARD"},
+    {IF_CLASS_CONTENT_SECURITY,		"CONTENT_SECURITY"},
+    {IF_CLASS_VIDEO,			"VIDEO"},
+    {IF_CLASS_DIAGNOSTIC_DEVICE,	"DIAGNOSTIC_DEVICE"},
+    {IF_CLASS_WIRELESS_CONTROLLER,	"WIRELESS_CONTROLLER"},
+    {IF_CLASS_MISCELLANEOUS,		"MISCELLANEOUS"},
+    {IF_CLASS_APPLICATION_SPECIFIC,	"APPLICATION_SPECIFIC"},
+    {IF_CLASS_VENDOR_SPECIFIC,		"VENDOR_SPECIFIC"},
     {0, NULL}
 };
 
diff --git a/epan/dissectors/packet-usb.h b/epan/dissectors/packet-usb.h
index 2c55681d1d..1505b1bd84 100644
--- a/epan/dissectors/packet-usb.h
+++ b/epan/dissectors/packet-usb.h
@@ -66,6 +66,23 @@ struct _usb_conv_info_t {
 
 
 #define IF_CLASS_UNKNOWN		0xffff
+#define IF_CLASS_FROM_INTERFACE_DESC	0x00
+#define IF_CLASS_AUDIO			0x01
+#define IF_CLASS_COMMUNICATIONS		0x02
+#define IF_CLASS_HID			0x03
+#define IF_CLASS_PHYSICAL		0x05
+#define IF_CLASS_IMAGE			0x06
+#define IF_CLASS_PRINTER		0x07
 #define IF_CLASS_MASSTORAGE		0x08
+#define IF_CLASS_HUB			0x09
+#define IF_CLASS_CDC_DATA		0x0a
+#define IF_CLASS_SMART_CARD		0x0b
+#define IF_CLASS_CONTENT_SECURITY	0x0d
+#define IF_CLASS_VIDEO			0x0e
+#define IF_CLASS_DIAGNOSTIC_DEVICE	0xdc
+#define IF_CLASS_WIRELESS_CONTROLLER	0xe0
+#define IF_CLASS_MISCELLANEOUS		0xef
+#define IF_CLASS_APPLICATION_SPECIFIC	0xfe
+#define IF_CLASS_VENDOR_SPECIFIC	0xff
 
 #endif