diff --git a/config/jsdoc/api/plugins/api.js b/config/jsdoc/api/plugins/api.js
index 0de3c3a89a..16a67593fe 100644
--- a/config/jsdoc/api/plugins/api.js
+++ b/config/jsdoc/api/plugins/api.js
@@ -78,8 +78,10 @@ function includeAugments(doclet) {
 
 function extractTypes(item) {
   item.type.names.forEach(function(type) {
-    types[type] = true;
-    //TODO handle Array.<type> etc.
+    var match = type.match(/^(.*<)?([^>]*)>?$/);
+    if (match) {
+      types[match[2]] = true;
+    }
   });
 }