diff --git a/src/chrome/content/rules/Zugaina.org-problematic.xml b/src/chrome/content/rules/Zugaina.org-problematic.xml
deleted file mode 100644
index ae88adf6a4e6..000000000000
--- a/src/chrome/content/rules/Zugaina.org-problematic.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<!--
-	For rules that are on by default, see Zugaina.xml.
-
-
-	^zugaina.org: Mismatched
-
--->
-<ruleset name="Zugaina.org (expired)" platform="cacert" default_off="expired">
-
-	<!--	Direct rewrites:
-				-->
-	<target host="blog.zugaina.org" />
-	<target host="gentoo-overlays.zugaina.org" />
-	<target host="www.zugaina.org" />
-
-	<!--	Complications:
-				-->
-	<target host="zugaina.org" />
-
-
-	<rule from="^http://zugaina\.org/"
-		to="https://www.zugaina.org/" />
-
-	<rule from="^http:"
-		to="https:" />
-
-</ruleset>
diff --git a/src/chrome/content/rules/Zugaina.org.xml b/src/chrome/content/rules/Zugaina.org.xml
new file mode 100644
index 000000000000..b7408d19823f
--- /dev/null
+++ b/src/chrome/content/rules/Zugaina.org.xml
@@ -0,0 +1,23 @@
+<!--
+	Invalid certificate:
+		zugaina.org
+		www.zugaina.org
+		blog.zugaina.org
+		distfiles.zugaina.org
+		linux.zugaina.org
+		roundcube.zugaina.org
+		xmpp.zugaina.org
+
+-->
+<ruleset name="Zugaina (partial)">
+
+	<target host="bgo.zugaina.org" />
+	<target host="gentoo.zugaina.org" />
+	<target host="gentoo-overlays.zugaina.org" />
+	<target host="gpo.zugaina.org" />
+	<target host="data.gpo.zugaina.org" />
+
+	<rule from="^http:"
+		to="https:" />
+
+</ruleset>
diff --git a/src/chrome/content/rules/Zugaina.xml b/src/chrome/content/rules/Zugaina.xml
deleted file mode 100644
index 4b36cf2fd002..000000000000
--- a/src/chrome/content/rules/Zugaina.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<!--
-	For problematic rules, see Zugaina-mismatches.xml and Zugaina.org-problematic.xml.
-
-
-	Nonfunctional domains:
-
-		- commerce.zugaina.com	(shows www.zugaina.org; mismatched, CN: *.zugaina.org)
-
-		- linux.zugaina.org *
-
-	* Shows www
-
-
-	Problematic domains:
-
-		- zugaina.org ⁴		(cert only matches *.zugaina.org)
-		- blog.zugaina.org ⁴
-		- www.zugaina.org ⁴
-
-	⁴ CAcert
-
-
-	yews.zugaina.org times out over http => status unknown.
-
--->
-<ruleset name="Zugaina (partial)">
-
-	<target host="bgo.zugaina.org" />
-	<target host="gentoo.zugaina.org" />
-	<target host="gentoo-overlays.zugaina.org" />
-	<target host="gpo.zugaina.org" />
-	<target host="data.gpo.zugaina.org" />
-
-
-	<rule from="^http:"
-		to="https:" />
-
-</ruleset>