From c8dfb1588343818ad4ef92aafd87fe39ae0f809c Mon Sep 17 00:00:00 2001
From: tobp <tobias.burnus@pdf.com>
Date: Thu, 10 Sep 2015 17:20:31 +0200
Subject: [PATCH 1/3] Update Freie-Universitat-Berlin.xml

Add rules for userpage.physik.fu-berlin.de
---
 src/chrome/content/rules/Freie-Universitat-Berlin.xml | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

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>

From 71223e6a02ab70e7ec1856fef043b658342a8a3f Mon Sep 17 00:00:00 2001
From: tobp <tobias.burnus@pdf.com>
Date: Thu, 10 Sep 2015 17:22:57 +0200
Subject: [PATCH 2/3] Create Kreuzerabteilung.xml

Add rules for kreuzer-abteilung.org
---
 src/chrome/content/rules/Kreuzerabteilung.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 src/chrome/content/rules/Kreuzerabteilung.xml

diff --git a/src/chrome/content/rules/Kreuzerabteilung.xml b/src/chrome/content/rules/Kreuzerabteilung.xml
new file mode 100644
index 000000000000..f0a910ca491b
--- /dev/null
+++ b/src/chrome/content/rules/Kreuzerabteilung.xml
@@ -0,0 +1,10 @@
+<ruleset name="Kreuzer Abteilung">
+        <!-- ssl. and (www.) have the same content and https but only ssl's
+             certifcate if for that host. Note additional that the (www.) page
+             offers IPv4 and IPv6 while the IPv4 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>

From da52b33aad4db7f2a55ff4e104df3c42d8464569 Mon Sep 17 00:00:00 2001
From: tobp <tobias.burnus@pdf.com>
Date: Thu, 10 Sep 2015 17:27:14 +0200
Subject: [PATCH 3/3] Improve comments in Kreuzerabteilung.xml

---
 src/chrome/content/rules/Kreuzerabteilung.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/chrome/content/rules/Kreuzerabteilung.xml b/src/chrome/content/rules/Kreuzerabteilung.xml
index f0a910ca491b..ffb1e1ed380a 100644
--- a/src/chrome/content/rules/Kreuzerabteilung.xml
+++ b/src/chrome/content/rules/Kreuzerabteilung.xml
@@ -1,7 +1,8 @@
 <ruleset name="Kreuzer Abteilung">
-        <!-- ssl. and (www.) have the same content and https but only ssl's
-             certifcate if for that host. Note additional that the (www.) page
-             offers IPv4 and IPv6 while the IPv4 only has IPv4 -->
+        <!-- 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" />