diff --git a/src/ua-parser.js b/src/ua-parser.js
index a0231bc..b405ca2 100755
--- a/src/ua-parser.js
+++ b/src/ua-parser.js
@@ -588,7 +588,7 @@
             /(lenovo)\s?(S(?:5000|6000)+(?:[-][\w+]))/i                         // Lenovo tablets
             ], [VENDOR, MODEL, [TYPE, TABLET]], [
 
-            /(htc)[;_\s-]+([\w\s]+(?=\))|\w+)*/i,                               // HTC
+            /(htc)[;_\s-]+([\w\s]+(?=\)|\sbuild)|\w+)/i,                        // HTC
             /(zte)-(\w*)/i,                                                     // ZTE
             /(alcatel|geeksphone|lenovo|nexian|panasonic|(?=;\s)sony)[_\s-]?([\w-]*)/i
                                                                                 // Alcatel/GeeksPhone/Lenovo/Nexian/Panasonic/Sony
diff --git a/test/device-test.json b/test/device-test.json
index ecae4eb..a4fad68 100644
--- a/test/device-test.json
+++ b/test/device-test.json
@@ -34,6 +34,15 @@
             "type": "mobile"
         }
     },
+    {
+        "desc": "HTC Desire 820",
+        "ua": "Mozilla/5.0 (Linux; Android 6.0.1; HTC Desire 820 Build/MMB29M) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.76 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "HTC",
+            "model": "Desire 820",
+            "type": "mobile"
+        }
+    },
     {
         "desc": "HTC Evo Shift 4G",
         "ua": "Mozilla/5.0 (Linux; U; Android 2.3.4; en-us; Sprint APA7373KT Build/GRJ22) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0",