diff --git a/src/chrome/content/rules/Hackerspaces.org.xml b/src/chrome/content/rules/Hackerspaces.org.xml
new file mode 100644
index 000000000000..62af5e5f9817
--- /dev/null
+++ b/src/chrome/content/rules/Hackerspaces.org.xml
@@ -0,0 +1,82 @@
+<!--
+	Non-functional hosts
+		SSL peer certificate was not OK:
+			 - nike.hackerspaces.org
+
+		Incomplete certificate chain error:
+			 - soup.hackerspaces.org
+
+		Different content:
+			 - hackerspaces.org
+			 - www.hackerspaces.org
+			 - across.hackerspaces.org
+			 - api.hackerspaces.org
+			 - base.hackerspaces.org
+			 - between.hackerspaces.org
+			 - beyond.hackerspaces.org
+			 - bio.hackerspaces.org
+			 - call-in.hackerspaces.org
+			 - challenge.hackerspaces.org
+			 - cheatsheet.hackerspaces.org
+			 - commons.hackerspaces.org
+			 - coop.hackerspaces.org
+			 - diy.hackerspaces.org
+			 - done.hackerspaces.org
+			 - dtl.hackerspaces.org
+			 - events.hackerspaces.org
+			 - ftw.hackerspaces.org
+			 - grants.hackerspaces.org
+			 - hardware.hackerspaces.org
+			 - hw.hackerspaces.org
+			 - jabber.hackerspaces.org
+			 - conference.jabber.hackerspaces.org
+			 - jobs.hackerspaces.org
+			 - leaks.hackerspaces.org
+			 - lib.hackerspaces.org
+			 - library.hackerspaces.org
+			 - listen.hackerspaces.org
+			 - logos.hackerspaces.org
+			 - media.hackerspaces.org
+			 - ocean.hackerspaces.org
+			 - onion.hackerspaces.org
+			 - orbital.hackerspaces.org
+			 - patterns.hackerspaces.org
+			 - people.hackerspaces.org
+			 - picks.hackerspaces.org
+			 - poetry.hackerspaces.org
+			 - praxis.hackerspaces.org
+			 - radio.hackerspaces.org
+			 - software.hackerspaces.org
+			 - space-api.hackerspaces.org
+			 - status.hackerspaces.org
+			 - stfu.hackerspaces.org
+			 - sw.hackerspaces.org
+			 - sync.hackerspaces.org
+			 - theory.hackerspaces.org
+			 - things.hackerspaces.org
+			 - todo.hackerspaces.org
+			 - toolbox.hackerspaces.org
+			 - tools.hackerspaces.org
+			 - tor.hackerspaces.org
+			 - wanted.hackerspaces.org
+			 - watch.hackerspaces.org
+			 - wetware.hackerspaces.org
+			 - wip.hackerspaces.org
+			 - wtf.hackerspaces.org
+			 - ww.hackerspaces.org
+			 - xmpp.hackerspaces.org
+
+		Mixed content blocking (MCB) tiggered:
+			 - blog.hackerspaces.org
+			 - flux.hackerspaces.org
+-->
+<ruleset name="Hackerspaces.org">
+	<target host="earth.hackerspaces.org" />
+	<target host="lists.hackerspaces.org" />
+	<target host="planet.hackerspaces.org" />
+	<target host="radar.hackerspaces.org" />
+	<target host="signal.hackerspaces.org" />
+	<target host="wiki.hackerspaces.org" />
+
+	<rule from="^http:" to="https:" />
+</ruleset>
diff --git a/src/chrome/content/rules/Hackerspaces.xml b/src/chrome/content/rules/Hackerspaces.xml
deleted file mode 100644
index 55f51ccd764a..000000000000
--- a/src/chrome/content/rules/Hackerspaces.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
-	Nonfunctional subdomains:
-
-		- blog	(cert: hackerspaces.org; 301s there)
-		- earth	(ditto)
-
--->
-<ruleset name="Hackerspaces" default_off="self-signed">
-
-	<target host="hackerspaces.org" />
-	<target host="www.hackerspaces.org" />
-
-
-	<securecookie host="^hackerspaces\.org$" name=".*" />
-
-
-	<!--	Cert only matches ^hackerspaces.org.
-							-->
-	<rule from="^http://(?:www\.)?hackerspaces\.org/"
-		to="https://hackerspaces.org/" />
-
-</ruleset>