diff --git a/src/chrome/content/rules/NLnet-Labs-cacert.xml b/src/chrome/content/rules/NLnet-Labs-cacert.xml
deleted file mode 100644
index b3df0f46fca1..000000000000
--- a/src/chrome/content/rules/NLnet-Labs-cacert.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<ruleset name="NLnet Labs CACert" platform="cacert">
-	<target host="behemoth.nlnetlabs.nl"/>
-	<target host="blogs.nlnetlabs.nl"/>
-
-	<rule from="^http:"
-		to="https:"/>
-</ruleset>
diff --git a/src/chrome/content/rules/NLnet-Labs.xml b/src/chrome/content/rules/NLnet-Labs.xml
deleted file mode 100644
index b183cd46fc32..000000000000
--- a/src/chrome/content/rules/NLnet-Labs.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<!--
-	Other NLnet Labs rulesets:
-
-		- NLnet-Labs-cacert.xml
-		- Unbound.net.xml
-
-
-	These altnames don't exist:
-
-		- mail.net-dns.org
-
-
-	^opendnssec.org doesn't exist.
-
-	Refused:
-		- sane.nlnetlabs.nl
--->
-<ruleset name="NLnet Labs">
-
-	<!--	Direct rewrites:
-				-->
-	<target host="net-dns.org"/>
-	<target host="www.net-dns.org"/>
-	<target host="nlnetlabs.nl"/>
-	<target host="www.nlnetlabs.nl"/>
-	<target host="dicht.nlnetlabs.nl"/>
-	<target host="git.nlnetlabs.nl"/>
-	<target host="open.nlnetlabs.nl"/>
-	<target host="unbound.nlnetlabs.nl"/>
-	<target host="svn.opendnssec.org"/>
-	<target host="wiki.opendnssec.org"/>
-	<target host="www.opendnssec.org"/>
-
-	<securecookie host="^wiki\.opendnssec\.org$" name=".*"/>
-
-	<rule from="^http:"
-		to="https:" />
-</ruleset>
diff --git a/src/chrome/content/rules/NLnet_Labs.nl.xml b/src/chrome/content/rules/NLnet_Labs.nl.xml
new file mode 100644
index 000000000000..66f0d0e0fc53
--- /dev/null
+++ b/src/chrome/content/rules/NLnet_Labs.nl.xml
@@ -0,0 +1,126 @@
+<!--
+	Other NLnet Labs related ruleset:
+		- OpenDNSSEC.org.xml
+
+	Non-functional hosts
+		Couldn't connect to server:
+			 - afgepunt.nlnetlabs.nl
+			 - agenda.nlnetlabs.nl
+			 - alcatraz.nlnetlabs.nl
+			 - alpha.nlnetlabs.nl
+			 - area51.nlnetlabs.nl
+			 - axiom.nlnetlabs.nl
+			 - azkaban.nlnetlabs.nl
+			 - bakkie.nlnetlabs.nl
+			 - balou.nlnetlabs.nl
+			 - bartok.nlnetlabs.nl
+			 - bgpplayground.nlnetlabs.nl
+			 - dolguldur.nlnetlabs.nl
+			 - dromedary.nlnetlabs.nl
+			 - fluffy.nlnetlabs.nl
+			 - gary.nlnetlabs.nl
+			 - gloom.nlnetlabs.nl
+			 - gorilla.nlnetlabs.nl
+			 - guts.nlnetlabs.nl
+			 - hp2055dn.nlnetlabs.nl
+			 - iii.nlnetlabs.nl
+			 - kimai.nlnetlabs.nl
+			 - lummel.nlnetlabs.nl
+			 - lustra.nlnetlabs.nl
+			 - magnesium.nlnetlabs.nl
+			 - nagini.nlnetlabs.nl
+			 - nagios.nlnetlabs.nl
+			 - cu1.nccoelab.nlnetlabs.nl
+			 - ns.nlnetlabs.nl
+			 - ns-ext.nlnetlabs.nl
+			 - ns-pt.nlnetlabs.nl
+			 - obelisk.nlnetlabs.nl
+			 - overview.nlnetlabs.nl
+			 - pan.nlnetlabs.nl
+			 - parrot.nlnetlabs.nl
+			 - phobos.nlnetlabs.nl
+			 - radius.nlnetlabs.nl
+			 - bind.resolver.nlnetlabs.nl
+			 - unbound.resolver.nlnetlabs.nl
+			 - rt.nlnetlabs.nl
+			 - rt4.nlnetlabs.nl
+			 - rurapenthe.nlnetlabs.nl
+			 - dmz.rurapenthe.nlnetlabs.nl
+			 - se-dns-probe.nlnetlabs.nl
+			 - shada.nlnetlabs.nl
+			 - sidnlabs.nlnetlabs.nl
+			 - snom0.nlnetlabs.nl
+			 - sparc5.nlnetlabs.nl
+			 - switch1.nlnetlabs.nl
+			 - switch7.nlnetlabs.nl
+			 - switch8.nlnetlabs.nl
+			 - titanium.nlnetlabs.nl
+			 - umbra.nlnetlabs.nl
+			 - uren.nlnetlabs.nl
+			 - vijfje.nlnetlabs.nl
+			 - xmpp.nlnetlabs.nl
+			 - yobro.nlnetlabs.nl
+			 - ziz.nlnetlabs.nl
+			 - zoidberg.nlnetlabs.nl
+
+		Timeout was reached:
+			 - dmz.alcatraz.nlnetlabs.nl
+			 - dmz.dolguldur.nlnetlabs.nl
+			 - klaaswierenga.friends.nlnetlabs.nl
+			 - hathi.nlnetlabs.nl
+			 - kern.nlnetlabs.nl
+			 - mcvax.nlnetlabs.nl
+			 - poudriere.nlnetlabs.nl
+			 - secure.ripe-hackathon2.nlnetlabs.nl
+			 - salt.nlnetlabs.nl
+			 - sane.nlnetlabs.nl
+			 - spider.nlnetlabs.nl
+
+		SSL connect error:
+			 - bijgepunt.nlnetlabs.nl
+
+		SSL peer certificate was not OK:
+			 - dns-lg.nlnetlabs.nl
+			 - internetnl.nlnetlabs.nl
+			 - new.nlnetlabs.nl
+			 - odstools.nlnetlabs.nl
+			 - opendnssec.nlnetlabs.nl
+
+		Peer certificate cannot be authenticated with given CA certificates:
+			 - behemoth.nlnetlabs.nl
+			 - zus.nlnetlabs.nl
+
+		Incomplete certificate chain error:
+			 - willemtoorop.friends.nlnetlabs.nl
+
+		4xx client error:
+			 - redmine.nlnetlabs.nl
+			 - twiki-bela.nlnetlabs.nl
+
+		5xx server error:
+			 - ieniemienie.nlnetlabs.nl
+
+		Different content:
+			 - getdns.nlnetlabs.nl
+-->
+<ruleset name="NLnet Labs.nl (partial)">
+	<target host="nlnetlabs.nl" />
+	<target host="www.nlnetlabs.nl" />
+	<target host="bela.nlnetlabs.nl" />
+	<target host="blogs.nlnetlabs.nl" />
+	<target host="nlnetlabs.blogs.nlnetlabs.nl" />
+	<target host="dicht.nlnetlabs.nl" />
+	<target host="git.nlnetlabs.nl" />
+	<target host="gitlab.nlnetlabs.nl" />
+	<target host="new.gitlab.nlnetlabs.nl" />
+	<target host="gitlab-ci.nlnetlabs.nl" />
+	<target host="imap.nlnetlabs.nl" />
+	<target host="mine.nlnetlabs.nl" />
+	<target host="open.nlnetlabs.nl" />
+	<target host="smtp.nlnetlabs.nl" />
+	<target host="ster.nlnetlabs.nl" />
+	<target host="unbound.nlnetlabs.nl" />
+	<target host="zaanbajes.nlnetlabs.nl" />
+
+	<rule from="^http:" to="https:" />
+</ruleset>
diff --git a/src/chrome/content/rules/OpenDNSSEC.org.xml b/src/chrome/content/rules/OpenDNSSEC.org.xml
new file mode 100644
index 000000000000..eb58c60d248a
--- /dev/null
+++ b/src/chrome/content/rules/OpenDNSSEC.org.xml
@@ -0,0 +1,26 @@
+<!--
+	For more NLnet Labs related ruleset, see NLnet_Labs.nl.xml
+
+	Non-functional hosts
+		Couldn't connect to server:
+			 - tools.opendnssec.org
+
+		SSL peer certificate was not OK:
+			 - bugs.opendnssec.org
+			 - ns.opendnssec.org
+-->
+<ruleset name="OpenDNSSEC.org (partial)">
+	<target host="www.opendnssec.org" />
+	<target host="crowd.opendnssec.org" />
+	<target host="dist.opendnssec.org" />
+	<target host="issues.opendnssec.org" />
+	<target host="jenkins.opendnssec.org" />
+	<target host="lists.opendnssec.org" />
+	<target host="svn.opendnssec.org" />
+	<target host="wiki.opendnssec.org" />
+
+	<securecookie host="^www\.opendnssec\.org$" name=".+" />
+	<securecookie host="^lists\.opendnssec\.org$" name=".+" />
+
+	<rule from="^http:" to="https:" />
+</ruleset>