diff --git a/src/chrome/content/rules/Advertising.com.xml b/src/chrome/content/rules/Advertising.com.xml
index a67a3a6389db..437a2074dd10 100644
--- a/src/chrome/content/rules/Advertising.com.xml
+++ b/src/chrome/content/rules/Advertising.com.xml
@@ -1,80 +1,215 @@
 <!--
 	For problematic rules, see Advertising.com-mismatches.xml.
-
-
 	For other AOL coverage, see AOL.xml.
 
-
-	Problematic subdomains:
-
-		- ace-tag *
-		- cte.ace.beta		(mismatched, CN: servedby.advertising.com)
-		- leadback *
-
-	* Cert only matches secure.foo
-
-
-	Fully covered subdomains:
-
-		- *.ace	(→ secure):
-
-			- beta
-			- cs
-			- cte
-			- p
-			- r1
-			- r1-ads
-			- r2
-			- secure
-			- sr-r3
-
-		- ace-tag		(→ secure.ace-tag)
-		- secure.ace-tag
-		- sync.adaptv
-		- leadback		(→ secure.leadback)
-		- secure.leadback
-		- servedby
-		- uac		(→ secure.uac)
-		- secure.uac
-
-
-	Insecure cookies are set for these domains: ᶜ
-
-		- .advertising.com
-		- .adaptv.advertising.com
-
-	ᶜ See https://owasp.org/index.php/SecureFlag
+		Cert expired:
+			- jp.advertising.com
+
+		Cert mismatch:
+			- cmap.adt.ace.advertising.com
+			- cmap.am.ace.advertising.com
+			- cmap.an.ace.advertising.com
+			- extmap.an.ace.advertising.com
+			- cmap.at.ace.advertising.com
+			- r1.beta.ace.advertising.com
+			- an-imp.bid.ace.advertising.com
+			- imp.bid.ace.advertising.com
+			- cmap.dc.ace.advertising.com
+			- cmap.fb.ace.advertising.com
+			- cmap.ox.ace.advertising.com
+			- cmap.pub.ace.advertising.com
+			- cmap.rm.ace.advertising.com
+			- cmap.rub.ace.advertising.com
+			- extmap.rub.ace.advertising.com
+			- cmap.uac.ace.advertising.com
+			- ace-lb.advertising.com
+			- ace2.advertising.com
+			- adlearnop.advertising.com
+			- jp.adlearnop.advertising.com
+			- uk.adlearnop.advertising.com
+			- ags.beta.advertising.com
+			- dbs.advertising.com
+			- help.advertising.com
+			- helpcenter.advertising.com
+			- stage-secure.leadback.advertising.com
+			- sr.mads.advertising.com
+			- one.advertising.com
+			- oneapi-qa.advertising.com
+			- servedby1.advertising.com
+			- servedby2.advertising.com
+			- servedby3.advertising.com
+
+	Connection refused:
+			- advertising.com
+			- www.advertising.com
+			- beta.mobile.ace.advertising.com
+			- ads.mtc.ace.advertising.com
+			- ads.ntc.ace.advertising.com
+			- optout.adaptv.advertising.com
+			- adportal.advertising.com
+			- blog.advertising.com
+			- clients.advertising.com
+			- secure-leadback.asda.db.advertising.com
+			- secure-leadback.buycom.db.advertising.com
+			- secure-leadback.callme.db.advertising.com
+			- dbs.charter2.db.advertising.com
+			- leadback.daysinn.db.advertising.com
+			- secure-leadback.drugstore.db.advertising.com
+			- leadback.firstchoice.db.advertising.com
+			- secure-leadback.fossil.db.advertising.com
+			- dbs.hotelsjp.db.advertising.com
+			- leadback.hotelsjp.db.advertising.com
+			- leadback.hotwire.db.advertising.com
+			- dbs.ihg.db.advertising.com
+			- leadback.ihg.db.advertising.com
+			- secure-leadback.ihg.db.advertising.com
+			- leadback.ihg2.db.advertising.com
+			- leadback.jetsetter.db.advertising.com
+			- dbs.nestle2.db.advertising.com
+			- dbs.nestle3.db.advertising.com
+			- secure-leadback.pccity.db.advertising.com
+			- leadback.petmeds.db.advertising.com
+			- secure-leadback.petmeds.db.advertising.com
+			- secure-leadback.rumbo.db.advertising.com
+			- secure-leadback.stubhub.db.advertising.com
+			- leadback.ticketsnow.db.advertising.com
+			- secure-leadback.ticketsnow.db.advertising.com
+			- leadback.tmobile.db.advertising.com
+			- leadback.tradera.db.advertising.com
+			- secure-leadback.tradera.db.advertising.com
+			- dbs.transunionbt.db.advertising.com
+			- dbs.transuniongeo.db.advertising.com
+			- leadback.tui.db.advertising.com
+			- leadback.wellpack.db.advertising.com
+			- dbs.zipcar.db.advertising.com
+			- de.advertising.com
+			- www.de.advertising.com
+			- es.advertising.com
+			- email.advertising.com
+			- fr.advertising.com
+			- fi.advertising.com
+			- ftp.advertising.com
+			- inventory.advertising.com
+			- jobs.advertising.com
+			- mads.advertising.com
+			- admarvel.mads.advertising.com
+			- nexage.mads.advertising.com
+			- smaato.mads.advertising.com
+			- madseu.advertising.com
+			- msg.advertising.com
+			- nl.advertising.com
+			- no.advertising.com
+			- optout.advertising.com
+			- se.advertising.com
+			- storm.advertising.com
+			- software.advertising.com
+			- uk.advertising.com
+			- web.advertising.com
+			- wireless.advertising.com
+
+		Timeout:
+			- barracuda.advertising.com
+			- creative.advertising.com
+			- demo.advertising.com
+			- ns2.advertising.com
+
+		TLS errors:
+			dialup.advertising.com
+			mail.advertising.com
+			mailhost.advertising.com
+			meeting.advertising.com
+			owa.advertising.com
+			testvpn.advertising.com
+			vpn.advertising.com
+			vpn-backup.advertising.com
+			vpn2.advertising.com
+			webvpn.advertising.com
 
 -->
 <ruleset name="Advertising.com (partial)">
 
-	<!--	Direct rewrites:
-					-->
+	<target host="ace.advertising.com" />
+	<target host="adservingbase.ace.advertising.com" />
+	<target host="bannerfarm.ace.advertising.com" />
+	<target host="secure.bannerfarm.ace.advertising.com" />
+	<target host="conversion.ace.advertising.com" />
+	<target host="beta2.ace.advertising.com" />
+	<target host="cmap.ace.advertising.com" />
+	<target host="cs.ace.advertising.com" />
+	<target host="fb-clk.ace.advertising.com" />
+	<target host="p.ace.advertising.com" />
+	<target host="pxl.ace.advertising.com" />
+	<target host="adt.pxl.ace.advertising.com" />
+	<target host="an.pxl.ace.advertising.com" />
+	<target host="brx.pxl.ace.advertising.com" />
+	<target host="bsw.pxl.ace.advertising.com" />
+	<target host="cas.pxl.ace.advertising.com" />
+	<target host="dc.pxl.ace.advertising.com" />
+	<target host="li.pxl.ace.advertising.com" />
+	<target host="mobile.ace.advertising.com" />
+	<target host="mmex.pxl.ace.advertising.com" />
+	<target host="moat.pxl.ace.advertising.com" />
+	<target host="ox.pxl.ace.advertising.com" />
+	<target host="pub.pxl.ace.advertising.com" />
+	<target host="rm.pxl.ace.advertising.com" />
+	<target host="rmx.pxl.ace.advertising.com" />
+	<target host="rub.pxl.ace.advertising.com" />
+	<target host="triplelift.pxl.ace.advertising.com" />
+	<target host="r1.ace.advertising.com" />
+	<target host="sr-r3.ace.advertising.com" />
+	<target host="r1-ads.ace.advertising.com" />
+	<target host="r2.ace.advertising.com" />
+	<target host="secure.ace.advertising.com" />
+	<target host="secure.ace-lb.advertising.com" />
+	<target host="ace-tag.advertising.com" />
 	<target host="secure.ace-tag.advertising.com" />
+	<target host="ads.adaptv.advertising.com" />
+	<target host="ads-ap.adaptv.advertising.com" />
+	<target host="ads-eu.adaptv.advertising.com" />
+	<target host="ads-direct-wc.adaptv.advertising.com" />
+	<target host="ads-ec.adaptv.advertising.com" />
+	<target host="ads-test.adaptv.advertising.com" />
+	<target host="cdn.adaptv.advertising.com" />
+	<target host="conversions.adaptv.advertising.com" />
+	<target host="log.adaptv.advertising.com" />
+	<target host="ads-wc.adaptv.advertising.com" />
+	<target host="log-wc-b.adaptv.advertising.com" />
+	<target host="optout3.adaptv.advertising.com" />
+	<target host="segments.adaptv.advertising.com" />
 	<target host="sync.adaptv.advertising.com" />
+	<target host="video.adaptv.advertising.com" />
+	<target host="video-stage.adaptv.advertising.com" />
+	<target host="post.update.wtag.adaptv.advertising.com" />
+	<target host="s.update.wtag.adaptv.advertising.com" />
+	<target host="adserver.adtech.advertising.com" />
+	<target host="adserver-eu.adtech.advertising.com" />
+	<target host="adserver-us.adtech.advertising.com" />
+	<target host="hb-us.adtech.advertising.com" />
+	<target host="adserver-as.adtech.advertising.com" />
+	<target host="hb-as.adtech.advertising.com" />
+	<target host="eu.content.cmp.advertising.com" />
+	<target host="eu.event.cmp.advertising.com" />
+	<target host="us.content.cmp.advertising.com" />
+	<target host="us.event.cmp.advertising.com" />
+	<target host="services.cmp.advertising.com" />
+	<target host="dtm.advertising.com" />
+	<target host="getcoding.advertising.com" />
+	<target host="ingest.advertising.com" />
+	<target host="leadback.advertising.com" />
 	<target host="secure.leadback.advertising.com" />
-	<target host="secure.uac.advertising.com" />
+	<target host="mobileapi.advertising.com" />
+	<target host="tearsheet.onevideo.advertising.com" />
+	<target host="optout3.advertising.com" />
+	<target host="pixel.advertising.com" />
+	<target host="edge2.pixel.advertising.com" />
 	<target host="servedby.advertising.com" />
-
-	<!--	Special cases:
-				-->
-	<target host="ace.advertising.com" />
-	<target host="*.ace.advertising.com" />
-	<target host="ace-tag.advertising.com" />
-	<target host="leadback.advertising.com" />
+	<target host="smrtpxl.advertising.com" />
 	<target host="uac.advertising.com" />
+	<target host="secure.uac.advertising.com" />
+	<target host="origin.uac.advertising.com" />
+	<target host="vlibs.advertising.com" />
 
-		<test url="http://r1.ace.advertising.com/" />
-		<test url="http://r1-ads.ace.advertising.com/" />
-
-
-	<!--	Not secured by server:
-					-->
-	<!--securecookie host="^\.advertising\.com$" name="^^(ACID|ASCID|C2|GUID|LB)$" /-->
-	<!--securecookie host="^\.adaptv\.advertising\.com$" name="^rtbData0$" /-->
-
-	<securecookie host="^\.(?:adaptv\.)?advertising\.com$" name=".+" />
-
+	<securecookie host=".+" name=".+" />
 
 	<rule from="^http://(?:[\w-]+\.)?ace\.advertising\.com/"
 		to="https://secure.ace.advertising.com/" />