diff --git a/src/chrome/content/rules/Freie-Universitat-Berlin.xml b/src/chrome/content/rules/Freie-Universitat-Berlin.xml
index 47303ca09c7b..e56d5aa64508 100644
--- a/src/chrome/content/rules/Freie-Universitat-Berlin.xml
+++ b/src/chrome/content/rules/Freie-Universitat-Berlin.xml
@@ -5,11 +5,16 @@
 
 -->
 <ruleset name="Freie Universität Berlin (partial)">
-
+        <!-- COMPUTER SCIENCE DEPARTMENT -->
 	<target host="doku.spline.inf.fu-berlin.de" />
-
-
 	<rule from="^http://doku\.spline\.inf\.fu-berlin\.de/"
 		to="https://doku.spline.inf.fu-berlin.de/" />
 
+        <!-- PHYSICS DEPARTMENT -->
+        <!-- users and userpage are the same but the certifcate is only
+             issued for userpage -->
+	<target host="userpage.physik.fu-berlin.de" />
+	<target host="users.physik.fu-berlin.de" />
+	<rule from="^http://(userpage|users)\.physik\.fu-berlin\.de/"
+		to="https://userpage.physik.fu-berlin.de/" />
 </ruleset>
diff --git a/src/chrome/content/rules/Kreuzerabteilung.xml b/src/chrome/content/rules/Kreuzerabteilung.xml
new file mode 100644
index 000000000000..ffb1e1ed380a
--- /dev/null
+++ b/src/chrome/content/rules/Kreuzerabteilung.xml
@@ -0,0 +1,11 @@
+<ruleset name="Kreuzer Abteilung">
+        <!-- ssl. and (www.) have the same content and https but (www.)'s
+             certifcate is for a different host name. Note additional
+             that the (www.) site has IPv4 and IPv6 while the ssl
+             site only has IPv4 -->
+        <target host="kreuzer-abteilung.org" />
+        <target host="www.kreuzer-abteilung.org" />
+        <target host="ssl.kreuzer-abteilung.org" />
+        <rule from="^http://((www|ssl)\.)?kreuzer-abteilung\.org/"
+                to="https://ssl.kreuzer-abteilung.org/" />
+</ruleset>