diff --git a/boards.js b/boards.js
index 11c0f40..0ea4381 100644
--- a/boards.js
+++ b/boards.js
@@ -6,14 +6,16 @@ var boards = [
     pageSize: 128,
     numPages: 256,
     timeout: 400,
-    productId: ['0x0043', '0x7523', '0x0001', '0xea60'],
+    vendorId: ['0x2341', '0x2341', '0x2A03', '0x2341', '0x0000', '0x0000', '0x0403'],
+    productId: ['0x0043', '0x0001', '0x0043', '0x0243', '0x7523', '0xea60', '0x6015'],
     protocol: 'stk500v1'
   },
   {
     name: 'micro',
     baud: 57600,
     signature: new Buffer([0x43, 0x41, 0x54, 0x45, 0x52, 0x49, 0x4e]),
-    productId: ['0x0037', '0x8037', '0x0036', '0x0237'],
+    vendorId: ['0x2341', '0x2341', '0x2A03', '0x2A03', '0x2341', '0x2341', '0x0000'],
+    productId: ['0x0037', '0x8037', '0x0037', '0x8037', '0x0237', '0x8237', '0x0036'],
     protocol: 'avr109'
   },
   {
@@ -27,7 +29,8 @@ var boards = [
     name: 'leonardo',
     baud: 57600,
     signature: new Buffer([0x43, 0x41, 0x54, 0x45, 0x52, 0x49, 0x4e]),
-    productId: ['0x0036', '0x8036', '0x800c'],
+    vendorId: ['0x2341', '0x2341', '0x2A03', '0x2A03', '0x0000'],
+    productId: ['0x0036', '0x8036', '0x0036', '0x8036', '0x800c'],
     protocol: 'avr109'
   },
   {
@@ -125,7 +128,8 @@ var boards = [
     byteDelay:0x00,
     pollValue:0x53,
     pollIndex:0x03,
-    productId: ['0x0042', '0x6001', '0x0010', '0x7523'],
+    vendorId: ['0x2341', '0x2341', '0x2A03', '0x2A03', '0x2341', '0x2341', '0x0000', '0x0000'],
+    productId: ['0x0010', '0x0042', '0x0010', '0x0042', '0x0210', '0x0242', '0x6001', '0x7523'],
     protocol: 'stk500v2'
   },
   {
@@ -142,7 +146,8 @@ var boards = [
     byteDelay:0x00,
     pollValue:0x53,
     pollIndex:0x03,
-    productId: ['0x0044', '0x6001', '0x003F'],
+    vendorId: ['0x2341', '0x2341', '0x2A03', '0x2A03', '0x0000'],
+    productId: ['0x003f', '0x0044', '0x003f', '0x0044', '0x6001'],
     protocol: 'stk500v2'
   },
   {
@@ -182,6 +187,7 @@ var boards = [
     byteDelay:0x00,
     pollValue:0x53,
     pollIndex:0x03,
+    vendorId: ['0x1d50'],
     productId: ['0x6051'],
     protocol: 'stk500v2'
   },
@@ -189,6 +195,7 @@ var boards = [
     name: 'lilypad-usb',
     baud: 57600,
     signature: new Buffer([0x43, 0x41, 0x54, 0x45, 0x52, 0x49, 0x4e]),
+    vendorId: ['0x1B4F', '0x1B4F', '0x0000'],
     productId: ['0x9207', '0x9208', '0x1B4F'],
     protocol: 'avr109'
   },
@@ -196,20 +203,23 @@ var boards = [
     name: 'yun',
     baud: 57600,
     signature: new Buffer([0x43, 0x41, 0x54, 0x45, 0x52, 0x49, 0x4e]),
-    productId: ['0x0041', '0x8041'],
+    vendorId: ['0x2341', '0x2341', '0x2A03', '0x2A03'],
+    productId: ['0x0041', '0x8041', '0x0041', '0x8041'],
     protocol: 'avr109'
   },
   {
     name: 'esplora',
     baud: 57600,
     signature: new Buffer([0x43, 0x41, 0x54, 0x45, 0x52, 0x49, 0x4e]),
-    productId: ['0x003C', '0x803C'],
+    vendorId: ['0x2341', '0x2341', '0x2A03', '0x2A03'],
+    productId: ['0x003C', '0x803C', '0x003C', '0x803C'],
     protocol: 'avr109'
   }, 
   {
     name: 'circuit-playground-classic',
     baud: 57600,
     signature: new Buffer([0x43, 0x41, 0x54, 0x45, 0x52, 0x49, 0x4e]),
+    vendorId: ['0x239A', '0x0000'],
     productId: ['0x0011', '0x8011'],
     protocol: 'avr109'
   },