--- a/browser/app/blocklist.xml
+++ b/browser/app/blocklist.xml
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<blocklist lastupdate="1483471392954" xmlns="http://www.mozilla.org/2006/addons-blocklist">
+<blocklist lastupdate="1500496563565" xmlns="http://www.mozilla.org/2006/addons-blocklist">
   <emItems>
     <emItem blockID="i988" id="{b12785f5-d8d0-4530-a3ea-5c4263b85bef}">
       <prefs/>
       <versionRange minVersion="0" maxVersion="*" severity="1"/>
     </emItem>
     <emItem blockID="i398" id="{377e5d4d-77e5-476a-8716-7e70a9272da0}">
       <prefs/>
       <versionRange minVersion="0" maxVersion="*" severity="1"/>
@@ -2283,16 +2283,22 @@
       <match exp="npmozax\.dll" name="filename"/>
       <versionRange maxVersion="*" minVersion="0"/>
     </pluginItem>
     <pluginItem blockID="p1419" os="Linux">
       <match exp="libflashplayer\.so" name="filename"/>
       <infoURL>https://get.adobe.com/flashplayer/</infoURL>
       <versionRange maxVersion="11.2.202.643" minVersion="11.2.202.637" severity="0" vulnerabilitystatus="1"/>
     </pluginItem>
+    <pluginItem blockID="33147281-45b2-487e-9fea-f66c6517252d">
+      <match exp="Java\(TM\) Platform SE 8 U(7[6-9]|[8-9]\d|1([0-3]\d|40))(\s[^\d\._U]|$)" name="name"/>
+      <match exp="npjp2\.dll" name="filename"/>
+      <infoURL>https://java.com/</infoURL>
+      <versionRange severity="0" vulnerabilitystatus="1"/>
+    </pluginItem>
     <pluginItem blockID="p80">
       <match exp="\(TM\)" name="name"/>
       <match exp="(npjp2\.dll)|(libnpjp2\.so)" name="filename"/>
       <match exp="[^\d\._]((0(\.\d+(\.\d+([_\.]\d+)?)?)?)|(1\.(([0-5](\.\d+([_\.]\d+)?)?)|(6(\.0([_\.](0?\d|1\d|2\d|30))?)?)|(7(\.0([_\.][0-2])?)?))))([^\d\._]|$)" name="description"/>
       <versionRange severity="1"/>
     </pluginItem>
     <pluginItem blockID="p1415">
       <match exp="(NPSWF32.*\.dll)|(NPSWF64.*\.dll)|(Flash\ Player\.plugin)" name="filename"/>
@@ -2356,16 +2362,22 @@
       <infoURL>https://get.adobe.com/reader/</infoURL>
       <versionRange maxVersion="15.006.30244" minVersion="15.006" severity="0" vulnerabilitystatus="1"/>
     </pluginItem>
     <pluginItem blockID="41bf48ab-7e0c-4349-8e3f-6890311b2f83">
       <match exp="(NPSWF32.*\.dll)|(NPSWF64.*\.dll)|(Flash\ Player\.plugin)" name="filename"/>
       <infoURL>https://get.adobe.com/flashplayer/</infoURL>
       <versionRange maxVersion="25.0.0.171" minVersion="25.0.0.163" severity="0" vulnerabilitystatus="1"/>
     </pluginItem>
+    <pluginItem blockID="427f5ec6-d1a7-4725-ac29-d5c5e51de537">
+      <match exp="Java\(TM\) Platform SE 7 U(97|98|99|1([0-4][0-9]|50))(\s[^\d\._U]|$)" name="name"/>
+      <match exp="npjp2\.dll" name="filename"/>
+      <infoURL>https://java.com/</infoURL>
+      <versionRange severity="0" vulnerabilitystatus="1"/>
+    </pluginItem>
     <pluginItem blockID="43b45ad8-a373-42c1-89c6-64e2746885e5">
       <match exp="(nppdf32\.dll)|(AdobePDFViewerNPAPI\.plugin)" name="filename"/>
       <infoURL>https://get.adobe.com/reader/</infoURL>
       <versionRange maxVersion="15.020.20042" minVersion="15.020" severity="0" vulnerabilitystatus="1"/>
     </pluginItem>
     <pluginItem blockID="p366">
       <match exp="Scorch\.plugin" name="filename"/>
       <versionRange maxVersion="6.2.0" minVersion="6.2.0" severity="1"/>
@@ -2770,16 +2782,22 @@
       <match exp="NPSWF32\.dll" name="filename"/>
       <infoURL>https://get.adobe.com/flashplayer/</infoURL>
       <versionRange maxVersion="10.2.9999" minVersion="0" severity="0" vulnerabilitystatus="1">
         <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">
           <versionRange maxVersion="16.*" minVersion="4.0"/>
         </targetApplication>
       </versionRange>
     </pluginItem>
+    <pluginItem blockID="ab59635e-2e93-423a-9d57-871dde8ae675">
+      <match exp="Java(\(TM\))? Plug-in 11\.(7[6-9]|[8-9]\d|1([0-3]\d|40))(\.\d+)?([^\d\._]|$)" name="name"/>
+      <match exp="libnpjp2\.so" name="filename"/>
+      <infoURL>https://java.com/</infoURL>
+      <versionRange severity="0" vulnerabilitystatus="1"/>
+    </pluginItem>
     <pluginItem blockID="p129">
       <match exp="Silverlight\.plugin" name="filename"/>
       <versionRange maxVersion="5.0.99999" minVersion="0" severity="1"/>
     </pluginItem>
     <pluginItem blockID="p294">
       <match exp="Java\(TM\) Platform SE 7 U1[2-5](\s[^\d\._U]|$)" name="name"/>
       <match exp="npjp2\.dll" name="filename"/>
       <versionRange severity="0" vulnerabilitystatus="1">
@@ -3036,16 +3054,21 @@
       <match exp="Java\(TM\) Platform SE 6 U(39|40|41)(\s[^\d\._U]|$)" name="name"/>
       <match exp="npjp2\.dll" name="filename"/>
       <versionRange severity="0" vulnerabilitystatus="1">
         <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">
           <versionRange maxVersion="*" minVersion="17.0"/>
         </targetApplication>
       </versionRange>
     </pluginItem>
+    <pluginItem blockID="d70fdf87-0441-479c-833f-2213b769eb40">
+      <match exp="JavaAppletPlugin\.plugin" name="filename"/>
+      <infoURL>https://java.com/</infoURL>
+      <versionRange maxVersion="Java 7 Update 150" minVersion="Java 7 Update 97" severity="0" vulnerabilitystatus="1"/>
+    </pluginItem>
     <pluginItem blockID="p240">
       <match exp="DivXBrowserPlugin\.plugin" name="filename"/>
       <versionRange maxVersion="1.4" minVersion="0" severity="1"/>
     </pluginItem>
     <pluginItem blockID="p1254">
       <match exp="(NPSWF32.*\.dll)|(NPSWF64.*\.dll)|(Flash\ Player\.plugin)" name="filename"/>
       <infoURL>https://get.adobe.com/flashplayer/</infoURL>
       <versionRange maxVersion="22.0.0.192" minVersion="21.0.0.242" severity="0" vulnerabilitystatus="1"/>
@@ -3186,16 +3209,21 @@
       <match exp="npCiscoWebCommunicator\.dll" name="filename"/>
       <versionRange maxVersion="3.0.5.99999999999999" minVersion="0" severity="0" vulnerabilitystatus="1"/>
     </pluginItem>
     <pluginItem blockID="p932" os="Linux">
       <match exp="libflashplayer\.so" name="filename"/>
       <infoURL>https://get.adobe.com/flashplayer/</infoURL>
       <versionRange maxVersion="11.2.202.467" minVersion="11.2.202.442" severity="0" vulnerabilitystatus="1"/>
     </pluginItem>
+    <pluginItem blockID="f24ffd6f-e02b-4cf4-91d9-d54cd793e4bf">
+      <match exp="JavaAppletPlugin\.plugin" name="filename"/>
+      <infoURL>https://java.com/</infoURL>
+      <versionRange maxVersion="Java 8 Update 140" minVersion="Java 8 Update" severity="0" vulnerabilitystatus="1"/>
+    </pluginItem>
     <pluginItem blockID="p906">
       <match exp="Java\(TM\) Platform SE 7 U(4[5-9]|(5|6)\d|7[0-8])(\s[^\d\._U]|$)" name="name"/>
       <match exp="npjp2\.dll" name="filename"/>
       <infoURL>https://java.com/</infoURL>
       <versionRange severity="0" vulnerabilitystatus="1"/>
     </pluginItem>
     <pluginItem blockID="p910">
       <match exp="Java(\(TM\))? Plug-in 10\.(4[5-9]|(5|6)\d|7[0-8])(\.[0-9]+)?([^\d\._]|$)" name="name"/>
@@ -3228,16 +3256,22 @@
       <infoURL>https://get.adobe.com/flashplayer/</infoURL>
       <versionRange maxVersion="11.2.202.569" minVersion="11.2.202.559" severity="0" vulnerabilitystatus="1"/>
     </pluginItem>
     <pluginItem blockID="p1224" os="Linux">
       <match exp="libflashplayer\.so" name="filename"/>
       <infoURL>https://get.adobe.com/flashplayer/</infoURL>
       <versionRange maxVersion="11.2.202.616" minVersion="11.2.202.577" severity="0" vulnerabilitystatus="1"/>
     </pluginItem>
+    <pluginItem blockID="fdc40de3-95ab-41a5-94cf-9b400221a713">
+      <match exp="Java(\(TM\))? Plug-in 10\.(97|98|99|1([0-4]\d|50))(\.\d+)?([^\d\._]|$)" name="name"/>
+      <match exp="libnpjp2\.so" name="filename"/>
+      <infoURL>https://java.com/</infoURL>
+      <versionRange severity="0" vulnerabilitystatus="1"/>
+    </pluginItem>
   </pluginItems>
   <gfxItems>
     <gfxBlacklistEntry blockID="g35">
       <os>WINNT 6.1</os>
       <vendor>0x10de</vendor>
       <feature>DIRECT2D</feature>
       <featureStatus>BLOCKED_DRIVER_VERSION</featureStatus>
       <driverVersion>8.17.12.5896</driverVersion>