diff --git a/src/chrome/content/rules/Movim.eu.xml b/src/chrome/content/rules/Movim.eu.xml
new file mode 100644
index 000000000000..f3a2108bffd3
--- /dev/null
+++ b/src/chrome/content/rules/Movim.eu.xml
@@ -0,0 +1,33 @@
+<!--
+	Invalid certificate:
+		www.movim.eu
+		edhelas.movim.eu (broken chain)
+		img.movim.eu
+		pubsub.movim.eu
+		wiki.movim.eu
+
+	Different content http/https:
+		stats.movim.eu
+		upload.movim.eu
+
+-->
+<ruleset name="Movim">
+
+	<target host="movim.eu" />
+	<target host="www.movim.eu" />
+	<target host="api.movim.eu" />
+	<target host="apt.movim.eu" />
+	<target host="fr.movim.eu" />
+	<target host="it.movim.eu" />
+	<target host="nl.movim.eu" />
+	<target host="pod.movim.eu" />
+
+	<securecookie host=".+" name=".+" />
+
+	<rule from="^http://www\.movim\.eu/"
+		to="https://movim.eu/" />
+
+	<rule from="^http:"
+		to="https:" />
+
+</ruleset>
diff --git a/src/chrome/content/rules/Movim.xml b/src/chrome/content/rules/Movim.xml
deleted file mode 100644
index e6137cde48d8..000000000000
--- a/src/chrome/content/rules/Movim.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<!--
-	CN: web.tuxfamily.net
-
-
-	Fully covered subdomains:
-
-		- (www.)	(www → ^)
-		- blog
-		- planet
-		- pod
-		- wiki
-
-
-	Mixed images on blog & planet from various domains
-
--->
-<ruleset name="Movim" default_off="mismatched, self-signed">
-
-	<target host="movim.eu" />
-	<target host="*.movim.eu" />
-
-
-	<securecookie host="^wiki\.movim\.eu$" name=".+" />
-
-
-	<rule from="^http://(?:((?:blog|planet|pod|wiki)\.)|www\.)?movim\.eu/"
-		to="https://$1movim.eu/" />
-
-</ruleset>
\ No newline at end of file