diff --git a/_bump.sh b/_bump.sh
deleted file mode 100755
index 37d5fdde..00000000
--- a/_bump.sh
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/bin/sh
-# This script bumps the version and updates the rc files and git tree accordingly
-# !!!THIS SCRIPT IS FOR INTERNAL DEVELOPER USE ONLY!!!
-
-type -P sed &>/dev/null || { echo "sed command not found. Aborting." >&2; exit 1; }
-type -P git &>/dev/null || { echo "git command not found. Aborting." >&2; exit 1; }
-
-if [ ! -n "$1" ]; then
-  TAG=$(git describe --tags --abbrev=0 2>/dev/null)
-  if [ ! -n "$TAG" ]; then
-    echo Unable to read tag - aborting.
-    exit 1
-  fi
-else
-  TAG=$1
-fi
-if [ ! ${TAG:0:1} = 'b' ]; then
-  echo Tag "$TAG" does not start with 'b' - aborting
-  exit 1
-fi
-TAGVER=${TAG:1}
-case $TAGVER in *[!0-9]*) 
-  echo "$TAGVER is not a number - aborting"
-  exit 1
-esac
-TAGVER=`expr $TAGVER + 1`
-echo Bumping version to w$TAGVER
-
-cat > cmd.sed <<\_EOF
-s/^[ \t]*FILEVERSION[ \t]*\(.*\),\(.*\),\(.*\),.*/ FILEVERSION \1,\2,\3,@@TAGVER@@/
-s/^[ \t]*PRODUCTVERSION[ \t]*\(.*\),\(.*\),\(.*\),.*/ PRODUCTVERSION \1,\2,\3,@@TAGVER@@/
-s/^\([ \t]*\)VALUE[ \t]*"FileVersion",[ \t]*"\(.*\)\..*"/\1VALUE "FileVersion", "\2.@@TAGVER@@"/
-s/^\([ \t]*\)VALUE[ \t]*"ProductVersion",[ \t]*"\(.*\)\..*"/\1VALUE "ProductVersion", "\2.@@TAGVER@@"/
-s/^\(.*\)adig v\(.*\)\.\(.*\)"\(.*\)/\1adig v\2.@@TAGVER@@"\4/
-s/^zadig_version=\(.*\)\..*/zadig_version=\1.@@TAGVER@@/
-s/^\(.*\)"Version \(.*\) (Build \(.*\))"\(.*\)/\1"Version \2 (Build @@TAGVER@@)"\4/
-_EOF
-
-# First run sed to substitute our variable in the sed command file
-sed -e "s/@@TAGVER@@/$TAGVER/g" cmd.sed > cmd.sed~
-mv cmd.sed~ cmd.sed
-
-# Run sed to update the .rc files minor version
-sed -f cmd.sed libwdi/libwdi.rc > libwdi/libwdi.rc~
-mv libwdi/libwdi.rc~ libwdi/libwdi.rc
-sed -f cmd.sed examples/zadic.rc > examples/zadic.rc~
-mv examples/zadic.rc~ examples/zadic.rc
-sed -f cmd.sed examples/zadig.rc > examples/zadig.rc~
-mv examples/zadig.rc~ examples/zadig.rc
-sed -f cmd.sed examples/zadig.h > examples/zadig.h~
-mv examples/zadig.h~ examples/zadig.h
-sed -f cmd.sed examples/wdi-simple.rc > examples/wdi-simple.rc~
-mv examples/wdi-simple.rc~ examples/wdi-simple.rc
-sed -f cmd.sed _bm.sh > _bm.sh~
-mv _bm.sh~ _bm.sh
-
-rm cmd.sed
-
-# Update VID data while we're at it
-cd libwdi
-. vid_data.sh
-cd ..
-
-git commit -a -m "[internal] bumped internal version" -e
-git tag "b$TAGVER"
\ No newline at end of file
diff --git a/_bz.cmd b/_bz.cmd
new file mode 100644
index 00000000..145731fb
--- /dev/null
+++ b/_bz.cmd
@@ -0,0 +1,13 @@
+@echo off
+
+call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\Tools\VsDevCmd.bat" -arch=x86 -host_arch=amd64
+cd /d "%~dp0"
+rem *** Get the version
+for /f "tokens=3" %%i in ('findstr FileVersion examples\zadig.rc') do set "ver=%%i"
+set ver=%ver:"=%
+for /f "tokens=1,2 delims=." %%i in ("%ver%") do set "ZADIG_VERSION=%%i.%%j"
+msbuild libwdi.sln /m /p:Project=Zadig;Configuration=Release,Platform=Win32 /t:Rebuild
+copy Win32\Release\examples\zadig.exe zadig-%ZADIG_VERSION%.exe
+upx --lzma zadig-%ZADIG_VERSION%.exe
+"C:\Program Files (x86)\Windows Kits\10\bin\10.0.16299.0\x64\signtool" sign /v /sha1 9ce9a71ccab3b38a74781b975f1c228222cf7d3b /fd SHA256 /tr http://sha256timestamp.ws.symantec.com/sha256/timestamp zadig-%ZADIG_VERSION%.exe
+pause
diff --git a/_coverity.cmd b/_coverity.cmd
index f82d2b0f..6224c769 100644
--- a/_coverity.cmd
+++ b/_coverity.cmd
@@ -1,7 +1,7 @@
 @rem *** Internal developer script to run Coverity ***
 @echo off
 call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\Tools\VsDevCmd.bat"
-set COV_DIR=D:\cov-analysis-win64-8.7.0
+set COV_DIR=D:\cov-analysis-win64-2017.07
 set PATH=%PATH%;%COV_DIR%\bin
 set PWD=%~dp0
 set TARGET=Win32
diff --git a/_sign.cmd b/_sign.cmd
index 7b74a33c..804d4bd1 100644
--- a/_sign.cmd
+++ b/_sign.cmd
@@ -1,6 +1,3 @@
 @echo off
-"C:\Program Files (x86)\Windows Kits\10\bin\x64\signtool" sign /v /sha1 655f6413a8f721e3286ace95025c9e0ea132a984 /fd SHA1 /tr http://timestamp.comodoca.com/rfc3161 /td SHA1 %1
-if ERRORLEVEL 1 goto out
-"C:\Program Files (x86)\Windows Kits\10\bin\x64\signtool" sign /as /v /sha1 5759b23dc8f45e9120a7317f306e5b6890b612f0 /fd SHA256 /tr http://timestamp.comodoca.com/rfc3161 /td SHA256 %1
-:out
+"C:\Program Files (x86)\Windows Kits\10\bin\10.0.16299.0\x64\signtool" sign /v /sha1 9ce9a71ccab3b38a74781b975f1c228222cf7d3b /fd SHA256 /tr http://sha256timestamp.ws.symantec.com/sha256/timestamp %1
 exit
diff --git a/examples/wdi-simple.rc b/examples/wdi-simple.rc
index b9d4d042..e245fa54 100644
--- a/examples/wdi-simple.rc
+++ b/examples/wdi-simple.rc
@@ -7,8 +7,8 @@
 #endif
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,3,718,0
- PRODUCTVERSION 1,3,718,0
+ FILEVERSION 1,3,719,0
+ PRODUCTVERSION 1,3,719,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -25,13 +25,13 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "akeo.ie"
             VALUE "FileDescription", "WDI-Simple"
-            VALUE "FileVersion", "1.3.718"
+            VALUE "FileVersion", "1.3.719"
             VALUE "InternalName", "WDI-Simple"
-            VALUE "LegalCopyright", "© 2010-2017 Pete Batard (LGPL v3)"
+            VALUE "LegalCopyright", "© 2010-2018 Pete Batard (LGPL v3)"
             VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/lesser.html"
             VALUE "OriginalFilename", "wdi-simple.exe"
             VALUE "ProductName", "WDI-Simple"
-            VALUE "ProductVersion", "1.3.718"
+            VALUE "ProductVersion", "1.3.719"
             VALUE "Comments", "http://libwdi.akeo.ie"
         END
     END
diff --git a/examples/zadic.rc b/examples/zadic.rc
index a2a634f5..679a6eb1 100644
--- a/examples/zadic.rc
+++ b/examples/zadic.rc
@@ -56,8 +56,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,3,718,0
- PRODUCTVERSION 1,3,718,0
+ FILEVERSION 1,3,719,0
+ PRODUCTVERSION 1,3,719,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -74,13 +74,13 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "akeo.ie"
             VALUE "FileDescription", "Zadic"
-            VALUE "FileVersion", "1.3.718"
+            VALUE "FileVersion", "1.3.719"
             VALUE "InternalName", "Zadic"
-            VALUE "LegalCopyright", "© 2010-2017 Pete Batard (LGPL v3)"
+            VALUE "LegalCopyright", "© 2010-2018 Pete Batard (LGPL v3)"
             VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/lesser.html"
             VALUE "OriginalFilename", "zadic.exe"
             VALUE "ProductName", "Zadic"
-            VALUE "ProductVersion", "1.3.718"
+            VALUE "ProductVersion", "1.3.719"
             VALUE "Comments", "http://libwdi.akeo.ie"
         END
     END
diff --git a/examples/zadig.h b/examples/zadig.h
index 68d76486..32855b5b 100644
--- a/examples/zadig.h
+++ b/examples/zadig.h
@@ -1,6 +1,6 @@
 /*
  * Zadig: Automated Driver Installer for USB devices (GUI version)
- * Copyright (c) 2010-2017 Pete Batard <pete@akeo.ie>
+ * Copyright (c) 2010-2018 Pete Batard <pete@akeo.ie>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -35,18 +35,18 @@
 
 #define APPLICATION_NAME            "Zadig"
 #define COMPANY_NAME                "Akeo Consulting"
-#define APPLICATION_URL             "http://zadig.akeo.ie"
+#define APPLICATION_URL             "https://zadig.akeo.ie"
 #define STR_BUFFER_SIZE             512
 #define NOTIFICATION_DELAY          1000
 #define MAX_TOOLTIPS                32
 #define MAX_LOG_SIZE                0x7FFFFFFE
 #define MAX_PROGRESS                (0xFFFF-1)
 #define INI_NAME                    "zadig.ini"
-#define LIBWDI_URL                  "http://libwdi.akeo.ie"
-#define LIBUSB_URL                  "http://windows.libusb.info"
-#define LIBUSB0_URL                 "http://sourceforge.net/apps/trac/libusb-win32/wiki"
+#define LIBWDI_URL                  "https://github.com/pbatard/libwdi"
+#define LIBUSB_URL                  "https://github.com/libusb/libusb/wiki/Windows"
+#define LIBUSB0_URL                 "https://sourceforge.net/p/libusb-win32/wiki/Home/"
 #define LIBUSBK_URL                 "http://libusbk.sourceforge.net/UsbK3/index.html"
-#define WINUSB_URL                  "https://msdn.microsoft.com/en-us/library/windows/hardware/ff540174.aspx"
+#define WINUSB_URL                  "https://docs.microsoft.com/en-us/windows-hardware/drivers/usbcon/winusb"
 #define HELP_URL                    "https://github.com/pbatard/libwdi/wiki/Zadig"
 #define WCID_URL                    "https://github.com/pbatard/libwdi/wiki/WCID-Devices"
 #define USB_IDS_URL                 "http://www.linux-usb.org/usb-ids.html"
@@ -59,7 +59,7 @@
 #define FIELD_ORANGE                RGB(255,240,200)
 #define ARROW_GREEN                 RGB(92,228,65)
 #define ARROW_ORANGE                RGB(253,143,56)
-#define APP_VERSION                 "Zadig 2.3.718"
+#define APP_VERSION                 "Zadig 2.4.719"
 
 // These are used to flag end users about the driver they are going to replace
 enum driver_type {
diff --git a/examples/zadig.rc b/examples/zadig.rc
index 846804a4..6ef07732 100644
--- a/examples/zadig.rc
+++ b/examples/zadig.rc
@@ -246,8 +246,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,3,718,0
- PRODUCTVERSION 2,3,718,0
+ FILEVERSION 2,4,719,0
+ PRODUCTVERSION 2,4,719,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -264,13 +264,13 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "akeo.ie"
             VALUE "FileDescription", "Zadig"
-            VALUE "FileVersion", "2.3.718"
+            VALUE "FileVersion", "2.4.719"
             VALUE "InternalName", "Zadig"
-            VALUE "LegalCopyright", "© 2010-2017 Pete Batard (GPL v3)"
+            VALUE "LegalCopyright", "© 2010-2018 Pete Batard (GPL v3)"
             VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html"
             VALUE "OriginalFilename", "zadig.exe"
             VALUE "ProductName", "Zadig"
-            VALUE "ProductVersion", "2.3.718"
+            VALUE "ProductVersion", "2.4.719"
             VALUE "Comments", "http://libwdi.akeo.ie"
         END
     END
diff --git a/examples/zadig_README.creole b/examples/zadig_README.creole
index 86c02092..0bd071c5 100644
--- a/examples/zadig_README.creole
+++ b/examples/zadig_README.creole
@@ -1,3 +1,9 @@
+=== v2.4 (2018.07.26) ===
+* Update URLs
+* Improve error reporting
+* Fix Windows 7 showing a "Trusted Publisher" dialog
+* Embedded drivers: WinUSB v6.1.7600.16385, libusb-win32 v1.2.6.0, libusbK v3.0.7.0 & usbser (native)
+
 === v2.3 (2017.04.18) ===
 * Fix issues with extended characters in current user directory
 * Drop Windows XP and Windows Vista support
diff --git a/examples/zadig_license.h b/examples/zadig_license.h
index 4ab40bfe..ba4ea675 100644
--- a/examples/zadig_license.h
+++ b/examples/zadig_license.h
@@ -1,6 +1,6 @@
 /*
  * Zadig: Automated Driver Installer for USB devices (GUI version)
- * Copyright (c) 2010-2017 Pete Batard <pete@akeo.ie>
+ * Copyright (c) 2010-2018 Pete Batard <pete@akeo.ie>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,7 +21,7 @@ const char* about_blurb_format =
 "{\\b\\fs20Zadig - The Automated Driver Installer}\\line\n"
 "\\fs18Version %d.%d (Build %d)\\line\n"
 "\\line\n"
-"Copyright © 2010-2017 Pete Batard / Akeo\\line\n"
+"Copyright © 2010-2018 Pete Batard / Akeo\\line\n"
 APPLICATION_URL "\\line\n"
 "\\line\n"
 "Report bugs or request enhancements at:\\line\n"
@@ -32,7 +32,7 @@ APPLICATION_URL "\\line\n"
 const char* additional_copyrights =
 "{\\rtf1\\ansi\n"
 "Windows Driver Installer library, libwdi:\\line\n"
-"Copyright © 2010-2017 by Pete Batard et al.\\line\n"
+"Copyright © 2010-2018 by Pete Batard et al.\\line\n"
 "GNU Lesser General Public License (LGPL) v3 or later\\line\n"
 "https://github.com/pbatard/libwdi/wiki\\line\n"
 "\\line\n"
diff --git a/libwdi/libwdi.rc b/libwdi/libwdi.rc
index a565fb02..303ff529 100644
--- a/libwdi/libwdi.rc
+++ b/libwdi/libwdi.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,3,718,0
- PRODUCTVERSION 1,3,718,0
+ FILEVERSION 1,3,719,0
+ PRODUCTVERSION 1,3,719,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -68,13 +68,13 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "akeo.ie"
             VALUE "FileDescription", "libwdi: Windows Driver Installer Library"
-            VALUE "FileVersion", "1.3.718"
+            VALUE "FileVersion", "1.3.719"
             VALUE "InternalName", "libwdi"
             VALUE "LegalCopyright", "© 2010-2017 Pete Batard (LGPL v3)"
             VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/lesser.html"
             VALUE "OriginalFilename", "libwdi"
             VALUE "ProductName", "libwdi"
-            VALUE "ProductVersion", "1.3.718"
+            VALUE "ProductVersion", "1.3.719"
             VALUE "Comments", "http://libwdi.akeo.ie"
         END
     END
diff --git a/libwdi/vid_data.c b/libwdi/vid_data.c
index 6751a405..529c6eb4 100644
--- a/libwdi/vid_data.c
+++ b/libwdi/vid_data.c
@@ -29,7 +29,7 @@ struct vendor_name {
 
 /*
  * http://www.linux-usb.org/usb.ids
- * Version: 2017.02.12
+ * Version: 2018.07.03
  */
 static struct vendor_name usb_vendor[] = {
 	{ 0x0001, "Fry's Electronics" },
@@ -38,7 +38,9 @@ static struct vendor_name usb_vendor[] = {
 	{ 0x0004, "Nebraska Furniture Mart" },
 	{ 0x0011, "Unknown" },
 	{ 0x0053, "Planex" },
+	{ 0x0078, "Microntek" },
 	{ 0x0079, "DragonRise Inc." },
+	{ 0x0085, "Boeye Technology Co., Ltd." },
 	{ 0x0105, "Trust International B.V." },
 	{ 0x0127, "IBP" },
 	{ 0x0145, "Unknown" },
@@ -47,12 +49,13 @@ static struct vendor_name usb_vendor[] = {
 	{ 0x0204, "Chipsbank Microelectronics Co., Ltd" },
 	{ 0x0218, "Hangzhou Worlde" },
 	{ 0x02ad, "HUMAX Co., Ltd." },
-	{ 0x0300, "MM300 eBook Reader" },
+	{ 0x0303, "Mini Automation Controller" },
 	{ 0x0324, "OCZ Technology Inc" },
 	{ 0x0325, "OCZ Technology Inc" },
 	{ 0x0386, "LTS" },
 	{ 0x03d9, "Shenzhen Sinote Tech-Electron Co., Ltd" },
 	{ 0x03da, "Bernd Walter Computer Technology" },
+	{ 0x03e7, "Intel" },
 	{ 0x03e8, "EndPoints, Inc." },
 	{ 0x03e9, "Thesys Microelectronics" },
 	{ 0x03ea, "Data Broadcasting Corp." },
@@ -60,7 +63,7 @@ static struct vendor_name usb_vendor[] = {
 	{ 0x03ec, "Iwatsu America, Inc." },
 	{ 0x03ed, "Mitel Corp." },
 	{ 0x03ee, "Mitsumi" },
-	{ 0x03f0, "Hewlett-Packard" },
+	{ 0x03f0, "HP, Inc" },
 	{ 0x03f1, "Genoa Technology" },
 	{ 0x03f2, "Oak Technology, Inc." },
 	{ 0x03f3, "Adaptec, Inc." },
@@ -584,7 +587,7 @@ static struct vendor_name usb_vendor[] = {
 	{ 0x0627, "Adomax Technology Co., Ltd" },
 	{ 0x0628, "Tasking Software, Inc." },
 	{ 0x0629, "Zida Technologies, Ltd" },
-	{ 0x062a, "Creative Labs" },
+	{ 0x062a, "MosArt Semiconductor Corp." },
 	{ 0x062b, "Greatlink Electronics Taiwan, Ltd" },
 	{ 0x062c, "Institute for Information Industry" },
 	{ 0x062d, "Taiwan Tai-Hao Enterprises Co., Ltd" },
@@ -760,6 +763,7 @@ static struct vendor_name usb_vendor[] = {
 	{ 0x071c, "Xionics Document Technologies, Inc." },
 	{ 0x071d, "Eicon Networks Corp." },
 	{ 0x071e, "Ariston Technologies" },
+	{ 0x0720, "Keyence Corp." },
 	{ 0x0723, "Centillium Communications Corp." },
 	{ 0x0726, "Vanguard International Semiconductor-America" },
 	{ 0x0729, "Amitm" },
@@ -790,8 +794,9 @@ static struct vendor_name usb_vendor[] = {
 	{ 0x074e, "Digital Stream Corp." },
 	{ 0x0755, "Aureal Semiconductor" },
 	{ 0x0757, "Network Technologies, Inc." },
+	{ 0x0758, "Carl Zeiss Microscopy GmbH" },
 	{ 0x075b, "Sophisticated Circuits, Inc." },
-	{ 0x0763, "Midiman" },
+	{ 0x0763, "M-Audio" },
 	{ 0x0764, "Cyber Power System, Inc." },
 	{ 0x0765, "X-Rite, Inc." },
 	{ 0x0766, "Jess-Link Products Co., Ltd" },
@@ -1093,7 +1098,7 @@ static struct vendor_name usb_vendor[] = {
 	{ 0x094f, "Yano" },
 	{ 0x0951, "Kingston Technology" },
 	{ 0x0954, "RPM Systems Corp." },
-	{ 0x0955, "NVidia Corp." },
+	{ 0x0955, "NVIDIA Corp." },
 	{ 0x0956, "BSquare Corp." },
 	{ 0x0957, "Agilent Technologies, Inc." },
 	{ 0x0958, "CompuLink Research, Inc." },
@@ -1102,6 +1107,7 @@ static struct vendor_name usb_vendor[] = {
 	{ 0x095b, "Medialogic Corp." },
 	{ 0x095c, "K-Tec Electronics" },
 	{ 0x095d, "Polycom, Inc." },
+	{ 0x0964, "BITRAN" },
 	{ 0x0967, "Acer NeWeb Corp." },
 	{ 0x0968, "Catalyst Enterprises, Inc." },
 	{ 0x096e, "Feitian Technologies, Inc." },
@@ -1469,6 +1475,7 @@ static struct vendor_name usb_vendor[] = {
 	{ 0x0c26, "Prolific Technology Inc." },
 	{ 0x0c27, "RFIDeas, Inc" },
 	{ 0x0c2e, "Metrologic Instruments" },
+	{ 0x0c30, "Mutoh Industries Ltd" },
 	{ 0x0c35, "Eagletron, Inc." },
 	{ 0x0c36, "E Ink Corp." },
 	{ 0x0c37, "e.Digital" },
@@ -2017,6 +2024,7 @@ static struct vendor_name usb_vendor[] = {
 	{ 0x1060, "Easthome Industrial Co., Ltd" },
 	{ 0x1063, "Motorola Electronics Taiwan, Ltd [hex]" },
 	{ 0x1065, "CCYU Technology" },
+	{ 0x1068, "Micropi Elettronica" },
 	{ 0x106a, "Loyal Legend, Ltd" },
 	{ 0x106c, "Curitel Communications, Inc." },
 	{ 0x106d, "San Chieh Manufacturing, Ltd" },
@@ -2034,6 +2042,7 @@ static struct vendor_name usb_vendor[] = {
 	{ 0x108b, "Grand-tek Technology Co., Ltd" },
 	{ 0x108c, "Robert Bosch GmbH" },
 	{ 0x108e, "Lotes Co., Ltd." },
+	{ 0x1091, "Numerik Jena" },
 	{ 0x1099, "Surface Optics Corp." },
 	{ 0x109a, "DATASOFT Systems GmbH" },
 	{ 0x109b, "Hisense" },
@@ -2096,6 +2105,7 @@ static struct vendor_name usb_vendor[] = {
 	{ 0x1136, "CTS Electronincs" },
 	{ 0x113c, "Arin Tech Co., Ltd" },
 	{ 0x113d, "Mapower Electronics Co., Ltd" },
+	{ 0x113f, "Integrated Biometrics, LLC" },
 	{ 0x1141, "V One Multimedia, Pte., Ltd" },
 	{ 0x1142, "CyberScan Technologies, Inc." },
 	{ 0x1145, "Japan Radio Company" },
@@ -2139,6 +2149,7 @@ static struct vendor_name usb_vendor[] = {
 	{ 0x11ac, "Nike" },
 	{ 0x11b0, "ATECH FLASH TECHNOLOGY" },
 	{ 0x11be, "R&D International NV" },
+	{ 0x11c0, "Betop" },
 	{ 0x11c5, "Inmax" },
 	{ 0x11ca, "VeriFone Inc" },
 	{ 0x11db, "Topfield Co., Ltd." },
@@ -2152,6 +2163,7 @@ static struct vendor_name usb_vendor[] = {
 	{ 0x120f, "Magellan" },
 	{ 0x1210, "DigiTech" },
 	{ 0x121e, "Jungsoft Co., Ltd" },
+	{ 0x1220, "TC Electronic" },
 	{ 0x1221, "Unknown manufacturer" },
 	{ 0x1223, "SKYCABLE ENTERPRISE. CO., LTD." },
 	{ 0x1228, "Datapaq Limited" },
@@ -2182,6 +2194,7 @@ static struct vendor_name usb_vendor[] = {
 	{ 0x1292, "Innomedia" },
 	{ 0x1293, "Belkin Components [hex]" },
 	{ 0x1294, "RISO KAGAKU CORP." },
+	{ 0x1297, "DekTec" },
 	{ 0x129b, "CyberTAN Technology" },
 	{ 0x12a7, "Trendchip Technologies Corp." },
 	{ 0x12ab, "Honey Bee Electronic International Ltd." },
@@ -2198,6 +2211,7 @@ static struct vendor_name usb_vendor[] = {
 	{ 0x12d8, "Araneus Information Systems Oy" },
 	{ 0x12e6, "Waldorf Music GmbH" },
 	{ 0x12ef, "Tapwave, Inc." },
+	{ 0x12f2, "ViewPlus Technologies, Inc." },
 	{ 0x12f5, "Dynamic System Electronics Corp." },
 	{ 0x12f7, "Memorex Products, Inc." },
 	{ 0x12fd, "AIN Comm. Technology Co., Ltd" },
@@ -2208,6 +2222,7 @@ static struct vendor_name usb_vendor[] = {
 	{ 0x1312, "ICS Electronics" },
 	{ 0x1313, "ThorLabs" },
 	{ 0x131d, "Natural Point" },
+	{ 0x1325, "ams AG" },
 	{ 0x132a, "Envara Inc." },
 	{ 0x132b, "Konica Minolta" },
 	{ 0x133e, "Kemper Digital GmbH" },
@@ -2226,6 +2241,7 @@ static struct vendor_name usb_vendor[] = {
 	{ 0x1370, "Swissbit" },
 	{ 0x1371, "CNet Technology Inc." },
 	{ 0x1376, "Vimtron Electronics Co., Ltd." },
+	{ 0x1377, "Sennheiser electronic GmbH & Co. KG" },
 	{ 0x137b, "SCAPS GmbH" },
 	{ 0x1385, "Netgear, Inc" },
 	{ 0x138a, "Validity Sensors, Inc." },
@@ -2268,6 +2284,7 @@ static struct vendor_name usb_vendor[] = {
 	{ 0x1415, "Nam Tai E&E Products Ltd. or OmniVision Technologies, Inc." },
 	{ 0x1419, "ABILITY ENTERPRISE CO., LTD." },
 	{ 0x1421, "Sensor Technology" },
+	{ 0x1424, "Posnet Polska S.A." },
 	{ 0x1429, "Vega Technologies Industrial (Austria) Co." },
 	{ 0x142a, "Thales E-Transactions" },
 	{ 0x142b, "Arbiter Systems, Inc." },
@@ -2278,6 +2295,8 @@ static struct vendor_name usb_vendor[] = {
 	{ 0x143c, "Altek Corporation" },
 	{ 0x1443, "Digilent" },
 	{ 0x1446, "X.J.GROUP" },
+	{ 0x1451, "Force Dimension" },
+	{ 0x1452, "Dai Nippon Printing, Inc" },
 	{ 0x1453, "Radio Shack" },
 	{ 0x1456, "Extending Wire & Cable Co., Ltd." },
 	{ 0x1457, "First International Computer, Inc." },
@@ -2326,6 +2345,7 @@ static struct vendor_name usb_vendor[] = {
 	{ 0x1516, "CompUSA" },
 	{ 0x1518, "Cheshire Engineering Corp." },
 	{ 0x1519, "Comneon" },
+	{ 0x151f, "Opal Kelly Incorporated" },
 	{ 0x1520, "Bitwire Corp." },
 	{ 0x1524, "ENE Technology Inc" },
 	{ 0x1527, "Silicon Portals" },
@@ -2380,6 +2400,7 @@ static struct vendor_name usb_vendor[] = {
 	{ 0x15ec, "Belcarra Technologies Corp." },
 	{ 0x15f4, "HanfTek" },
 	{ 0x1604, "Tascam" },
+	{ 0x1605, "ACCES I/O Products, Inc." },
 	{ 0x1606, "Umax" },
 	{ 0x1608, "Inside Out Networks [hex]" },
 	{ 0x160a, "VIA Technologies, Inc." },
@@ -2387,6 +2408,7 @@ static struct vendor_name usb_vendor[] = {
 	{ 0x1614, "Amoi Electronics" },
 	{ 0x1617, "Sony Corp." },
 	{ 0x1619, "L & K Precision Technology Co., Ltd." },
+	{ 0x161c, "Digitech Systems" },
 	{ 0x1621, "Wionics Research" },
 	{ 0x1628, "Stonestreet One, Inc." },
 	{ 0x162a, "Airgo Networks Inc." },
@@ -2436,6 +2458,7 @@ static struct vendor_name usb_vendor[] = {
 	{ 0x16d6, "JABLOCOM s.r.o." },
 	{ 0x16d8, "CMOTECH Co., Ltd." },
 	{ 0x16dc, "Wiener, Plein & Baus" },
+	{ 0x16de, "Telemecanique" },
 	{ 0x16df, "King Billion Electronics Co., Ltd." },
 	{ 0x16f0, "GN ReSound A/S" },
 	{ 0x16f5, "Futurelogic Inc." },
@@ -2451,6 +2474,7 @@ static struct vendor_name usb_vendor[] = {
 	{ 0x1733, "Cellink Technology Co., Ltd" },
 	{ 0x1736, "CANON IMAGING SYSTEM TECHNOLOGIES INC." },
 	{ 0x1737, "Linksys" },
+	{ 0x173a, "Roche" },
 	{ 0x173d, "QSENN" },
 	{ 0x1740, "Senao" },
 	{ 0x1743, "General Atomics" },
@@ -2769,6 +2793,7 @@ static struct vendor_name usb_vendor[] = {
 	{ 0x1d50, "OpenMoko, Inc." },
 	{ 0x1d57, "Xenta" },
 	{ 0x1d5b, "Smartronix, Inc." },
+	{ 0x1d5c, "Fresco Logic" },
 	{ 0x1d6b, "Linux Foundation" },
 	{ 0x1d90, "Citizen" },
 	{ 0x1d9d, "Sigma Sport" },
@@ -2787,6 +2812,7 @@ static struct vendor_name usb_vendor[] = {
 	{ 0x1e71, "NZXT" },
 	{ 0x1e74, "Coby Electronics Corporation" },
 	{ 0x1e7d, "ROCCAT" },
+	{ 0x1ea7, "SHARKOON Technologies GmbH" },
 	{ 0x1ebb, "NuCORE Technology, Inc." },
 	{ 0x1eda, "AirTies Wireless Networks" },
 	{ 0x1edb, "Blackmagic design" },
@@ -2842,6 +2868,7 @@ static struct vendor_name usb_vendor[] = {
 	{ 0x2184, "GW Instek" },
 	{ 0x21a1, "Emotiv Systems Pty. Ltd." },
 	{ 0x21d6, "Agecodagis SARL" },
+	{ 0x2207, "Fuzhou Rockchip Electronics Company" },
 	{ 0x2222, "MacAlly" },
 	{ 0x2227, "SAMWOO Enterprise" },
 	{ 0x2232, "Silicon Motion" },
@@ -2856,6 +2883,7 @@ static struct vendor_name usb_vendor[] = {
 	{ 0x2304, "Pinnacle Systems, Inc." },
 	{ 0x2318, "Shining Technologies, Inc. [hex]" },
 	{ 0x2341, "Arduino SA" },
+	{ 0x2357, "TP-Link" },
 	{ 0x2373, "Pumatronix Ltda" },
 	{ 0x2375, "Digit@lway, Inc." },
 	{ 0x2406, "SANHO Digital Electronics Co., Ltd." },
@@ -2864,6 +2892,8 @@ static struct vendor_name usb_vendor[] = {
 	{ 0x248a, "Maxxter" },
 	{ 0x249c, "M2Tech s.r.l." },
 	{ 0x24e1, "Paratronic" },
+	{ 0x2516, "Cooler Master Co., Ltd." },
+	{ 0x2548, "Pulse-Eight" },
 	{ 0x2632, "TwinMOS" },
 	{ 0x2639, "Xsens" },
 	{ 0x2650, "Electronics For Imaging, Inc. [hex]" },
@@ -2878,12 +2908,14 @@ static struct vendor_name usb_vendor[] = {
 	{ 0x2899, "Toptronic Industrial Co., Ltd" },
 	{ 0x289b, "Dracal/Raphnet technologies" },
 	{ 0x2931, "Jolla Oy" },
+	{ 0x2939, "Zaber Technologies Inc." },
 	{ 0x2a03, "dog hunter AG" },
 	{ 0x2a37, "RTD Embedded Technologies, Inc." },
 	{ 0x2a45, "Meizu Corp." },
 	{ 0x2b24, "KeepKey LLC" },
 	{ 0x2c02, "Planex Communications" },
 	{ 0x2c1a, "Dolphin Peripherals" },
+	{ 0x2c7c, "Quectel Wireless Solutions Co., Ltd." },
 	{ 0x2dcf, "Dialog Semiconductor" },
 	{ 0x2fb2, "Fujitsu, Ltd" },
 	{ 0x3125, "Eagletron" },