diff --git a/src/chrome/content/rules/Vinilox.eu.xml b/src/chrome/content/rules/Vinilox.eu.xml
index b049a2c1b4f9..f7ef494d7cf4 100644
--- a/src/chrome/content/rules/Vinilox.eu.xml
+++ b/src/chrome/content/rules/Vinilox.eu.xml
@@ -1,50 +1,39 @@
 <!--
-	Problematic hosts in *vinilox.eu:
-
-		- (www.)?
-		- git *
-		- micro *
-		- s *
-		- status *
-
-	* Server sends no certificate chain, see https://whatsmychaincert.com
-
-
-	Fully covered hosts in *vinilox.eu:
-
-		- (www.)?
-		- git
-		- micro
-		- s
-		- status
-
-
-	Insecure cookies are set for these hosts:
-
-		- vinilox.eu
-		- status.vinilox.eu
-
+	Non-functional hosts
+		Timeout was reached:
+			 - upload.vinilox.eu
+
+		SSL peer certificate was not OK:
+			 - anacreon.vinilox.eu
+			 - blog.vinilox.eu
+			 - demeter.vinilox.eu
+			 - galacticnova.vinilox.eu
+			 - irc.vinilox.eu
+			 - kitscolaire.vinilox.eu
+			 - micro.vinilox.eu
+			 - phpmyadmin.vinilox.eu
+			 - pubsub.vinilox.eu
+			 - s.vinilox.eu
+			 - stats.vinilox.eu
+			 - status.vinilox.eu
+			 - wallabag.vinilox.eu
+			 - webmail.vinilox.eu
+
+		Incomplete certificate chain error:
+			 - paste.vinilox.eu
+
+		4xx client error:
+			 - mail.vinilox.eu
 -->
-<ruleset name="Vinilox.eu" default_off="missing certificate chain" platform="cacert">
-
-	<!--	Direct rewrites:
-				-->
+<ruleset name="Vinilox.eu">
 	<target host="vinilox.eu" />
+	<target host="cloud.vinilox.eu" />
+	<target host="conference.vinilox.eu" />
 	<target host="git.vinilox.eu" />
-	<target host="micro.vinilox.eu" />
-	<target host="s.vinilox.eu" />
-	<target host="status.vinilox.eu" />
-	<target host="www.vinilox.eu" />
-
-
-	<!--	Not secured by server:
-					-->
-	<!--securecookie host="^status\.vinilox\.eu$" name="^PHPSESSID$" /-->
-
-	<securecookie host="^status\.vinilox\.eu$" name=".+" />
-
-
-	<rule from="^http:"
-		to="https:" />
+	<target host="home.vinilox.eu" />
+	<target host="jasonyx.vinilox.eu" />
+	<target host="munin.vinilox.eu" />
+	<target host="wiki.vinilox.eu" />
 
+	<rule from="^http:" to="https:" />
 </ruleset>