diff --git a/src/chrome/content/rules/FAU.org.xml b/src/chrome/content/rules/FAU.org.xml
index 09ca9812a053..bd13e2726166 100644
--- a/src/chrome/content/rules/FAU.org.xml
+++ b/src/chrome/content/rules/FAU.org.xml
@@ -1,6 +1,63 @@
-<ruleset name="Freie Arbeiterinnen- und Arbeiter-Union (FAU) (CAcert)" platform="cacert mixedcontent">
-  <target host="www.fau.org" />
-  <target host="fau.org" />
+<!--
+	No working URL known:
+		admin.fau.org
+		bonn2.fau.org
+		www.bonn2.fau.org
+		forum.fau.org
+		wordpress.fau.org
+
+	Invalid certificate:
+		admin1.fau.org
+		analytics1.fau.org
+		bielefeld.fau.org
+		extranet1.fau.org
+		plone.fau.org
+
+	Different content http/https:
+		www.berlin.fau.org
+
+	Mixed content:
+		duesseldorf.fau.org
+		www.duesseldorf.fau.org
+
+-->
+<ruleset name="Freie Arbeiterinnen- und Arbeiter-Union (FAU)">
+
+	<target host="fau.org" />
+	<target host="www.fau.org" />
+	<target host="berlin.fau.org" />
+	<target host="bremen.fau.org" />
+	<target host="bremen2.fau.org" />
+	<target host="www.bremen2.fau.org" />
+	<target host="deliverunion.fau.org" />
+	<target host="www.deliverunion.fau.org" />
+	<target host="dresden.fau.org" />
+	<target host="duisburg.fau.org" />
+	<target host="www.duisburg.fau.org" />
+	<target host="extranet.fau.org" />
+	<target host="freiburg.fau.org" />
+	<target host="www.freiburg.fau.org" />
+	<target host="halle.fau.org" />
+	<target host="www.halle.fau.org" />
+	<target host="hamburg.fau.org" />
+	<target host="www.hamburg.fau.org" />
+	<target host="hannover.fau.org" />
+	<target host="www.hannover.fau.org" />
+	<target host="as.hannover.fau.org" />
+	<target host="www.as.hannover.fau.org" />
+	<target host="ggb.hannover.fau.org" />
+	<target host="www.ggb.hannover.fau.org" />
+	<target host="kiel.fau.org" />
+	<target host="www.kiel.fau.org" />
+	<target host="list.fau.org" />
+	<target host="muenster.fau.org" />
+	<target host="www.muenster.fau.org" />
+	<target host="piwik.fau.org" />
+	<target host="polls.fau.org" />
+	<target host="stuttgart.fau.org" />
+	<target host="www.stuttgart.fau.org" />
+	<target host="webmail.fau.org" />
+
+	<rule from="^http:" to="https:"/>
 
-  <rule from="^http://(?:www\.)?fau\.org/" to="https://www.fau.org/"/>
 </ruleset>