diff --git a/assets/checksums.txt b/assets/checksums.txt
index 6e02fcdce..3526dc515 100644
--- a/assets/checksums.txt
+++ b/assets/checksums.txt
@@ -1,11 +1,11 @@
 4d0e777a82576a2ec771742abb91925b assets/ublock/unbreak.txt
 62111a29f0a5cb361ba8dbae92054adb assets/ublock/redirect-resources.txt
 6c077d6d5b39e8a5a407966ad62c9c32 assets/ublock/privacy.txt
-527f9f064f164a3445801d39caff3c6b assets/ublock/filters.txt
+247b8a7885dde94c5f1f3339be0cca45 assets/ublock/filters.txt
 146704ad1c0393e342afdb416762c183 assets/ublock/badware.txt
 5baa90e2da7cd6a73edff2010557ee57 assets/ublock/redirect.txt
 d6f734c851d5077bd545d0fa39e8bb8d assets/ublock/experimental.txt
-2f7339c072133f487c25f90d4da0632a assets/ublock/resources.txt
+4e1ab9845d9fc92cd3f6f22e5e878b0f assets/ublock/resources.txt
 6c9d89c5dc6db345de36c8c966fff575 assets/ublock/filter-lists.json
 50573388b525ede1a920cd4b4ee7fbf0 assets/thirdparties/easylist-downloads.adblockplus.org/easyprivacy.txt
 61cc16cf02e034370f0f47bc17c46551 assets/thirdparties/easylist-downloads.adblockplus.org/easylist.txt
diff --git a/assets/ublock/filters.txt b/assets/ublock/filters.txt
index 1f529bd7f..e425b9792 100644
--- a/assets/ublock/filters.txt
+++ b/assets/ublock/filters.txt
@@ -171,7 +171,6 @@ bild.de##script:contains(Javascript)
 commentcamarche.net,foot01.com,metronews.fr##script:contains(/[Ll]igatus/)
 dayt.se##script:contains(adblock.php)
 dpstream.net,jeux-porno.net##script:contains(/^\s*?var\s+?uniqueParam\s*?=/)
-extremetube.com,gaytube.com,keezmovies.com,mofosex.com,pornhub.com,redtube.com,spankwire.com,thumbzilla.com,tube8.*,xtube.com,youporn.com,youporngay.com##script:contains(FastPopSessionRequestNumber)
 finanzen.ch##script:contains(/^\s*function\s+UABPInject/)
 getvids.de,podcast.de,sommerhaus.de,spielespielen24.de##script:contains(/^\s*function\s+gS/)
 jav4.me##script:contains(adblock.htm)
@@ -240,6 +239,10 @@ skystreaming.net###fanback + style + div[id]
 # Yavli ads
 activistpost.com,alfonzorachel.com,aplus.com,breathecast.com,bulletsfirst.net,clashdaily.com,comicallyincorrect.com,conservativebyte.com,cowboybyte.com,dailysurge.com,dccrimestories.com,drhotze.com,explosm.net,genfringe.com,girlsjustwannahaveguns.com,joeforamerica.com,latinpost.com,mensfitness.com,minutemennews.com,mobilelikez.com,muscleandfitness.com,naturalblaze.com,oddee.com,okmagazine.com,patriotoutdoornews.com,pitgrit.com,radaronline.com,redmaryland.com,segmentnext.com,shark-tank.com,theblacksphere.net,thegatewaypundit.com,themattwalshblog.com,thepoke.co.uk,unilad.co.uk,valuewalk.com,vcpost.com,victoriajackson.com,viralnova.com##script:inject(yavli-defuser.js)
 
+# https://github.com/gorhill/uBlock/issues/1094
+extremetube.com,pornhub.com,redtube.com,spankwire.com,tube8.*,youporn.com,youporngay.com##script:inject(pornhub-popup-defuser.js)
+
+
 # The following filters will be removed once 1.5.0 is widespread
 # AdDefend
 1erforum.de,20min.ch,abendzeitung-muenchen.de,allgemeine-zeitung.de,arcor.de,ariva.de,auto-motor-und-sport.de,autoextrem.de,boerse-online.de,buerstaedter-zeitung.de,computerbild.de,comunio.de,echo-online.de,fanfiktion.de,fem.com,finanzen.net,focus.de,gamestar.de,gelnhaeuser-tageblatt.de,general-anzeiger-bonn.de,giessener-anzeiger.de,hochheimer-zeitung.de,hofheimer-zeitung.de,kabeleins.de,kreis-anzeiger.de,lampertheimer-zeitung.de,lauterbacher-anzeiger.de,lpgforum.de,lustich.de,main-spitze.de,motorradonline.de,notebookcheck.net,oberhessische-zeitung.de,pcwelt.de,prosieben.de,prosiebenmaxx.de,rhein-main-presse.de,rp-online.de,sat1.de,sat1gold.de,serienjunkies.de,sixx.de,spiegel.de,spox.com,shz.de,teccentral.de,the-voice-of-germany.de,transfermarkt.de,tvspielfilm.de,tvtoday.de,usinger-anzeiger.de,webfail.com,wetter.com,wetteronline.at,wetteronline.de,wiesbadener-kurier.de,wiesbadener-tagblatt.de,wn.de,wormser-zeitung.de##script:contains(uabInject)
@@ -251,3 +254,5 @@ activistpost.com,alfonzorachel.com,aplus.com,breathecast.com,bulletsfirst.net,cl
 ||edge.quantserve.com/quant.js$script,redirect=yavli-defuser.js,domain=alfonzorachel.com|aplus.com|breathecast.com|bulletsfirst.net|clashdaily.com|comicallyincorrect.com|conservativebyte.com|cowboybyte.com|dailysurge.com|dccrimestories.com|drhotze.com|explosm.net|genfringe.com|girlsjustwannahaveguns.com|joeforamerica.com|latinpost.com|minutemennews.com|mobilelikez.com|muscleandfitness.com|naturalblaze.com|patriotoutdoornews.com|pitgrit.com|redmaryland.com|shark-tank.com|theblacksphere.net|thegatewaypundit.com|themattwalshblog.com|unilad.co.uk|vcpost.com|victoriajackson.com|viralnova.com
 ||native.sharethrough.com/assets/tag.js$script,redirect=yavli-defuser.js,domain=thepoke.co.uk
 ||ziccardia.com/adBlockDetector/$script,redirect=yavli-defuser.js,domain=oddee.com
+# Pornhub et al.
+extremetube.com,gaytube.com,keezmovies.com,mofosex.com,pornhub.com,redtube.com,spankwire.com,thumbzilla.com,tube8.*,xtube.com,youporn.com,youporngay.com##script:contains(FastPopSessionRequestNumber)
diff --git a/assets/ublock/resources.txt b/assets/ublock/resources.txt
index 9644b2eea..ea955c418 100644
--- a/assets/ublock/resources.txt
+++ b/assets/ublock/resources.txt
@@ -222,3 +222,23 @@ uabinject-defuser.js application/javascript
 (function() {
     window.uabpdl = window.uabInject = window.uabDetect = true;
 })();
+
+
+# https://github.com/gorhill/uBlock/issues/1094
+pornhub-popup-defuser.js application/javascript
+(function() {
+    var w = window;
+    var count = Math.ceil(8+Math.random()*4);
+    var tomorrow = new Date(Date.now() + 86400);
+    var expire = tomorrow.toString();
+    document.cookie = 'FastPopSessionRequestNumber=' + count + '; expires=' + expire;
+    var db;
+    if ( (db = w.localStorage) ) {
+        db.setItem('InfNumFastPops', count);
+        db.setItem('InfNumFastPopsExpire', expire);
+    }
+    if ( (db = w.sessionStorage) ) {
+        db.setItem('InfNumFastPops', count);
+        db.setItem('InfNumFastPopsExpire', expire);
+    }
+})();