diff --git a/src/chrome/content/rules/Thalia_Holding.xml b/src/chrome/content/rules/Thalia_Holding.xml
new file mode 100644
index 000000000000..0727acbeac22
--- /dev/null
+++ b/src/chrome/content/rules/Thalia_Holding.xml
@@ -0,0 +1,81 @@
+<!--
+ 	Missmatch:
+		- images.bol.de *
+		- images.buch.de *
+		- images.thalia.de *
+		- media.buch.de *
+
+		* Rewrite to www.buch.de fails sometimes:
+
+	Refused:
+		- blog.buch.de
+		- unternehmen.thalia.de
+		- ^buch.de
+		
+
+	Wrong content:
+		- ^thalia.ch
+
+	Mixed content:
+		- various images served from images.*
+-->
+<ruleset name="Thalia Holding" platform="mixedcontent">
+	<target host="bol.de"/>
+	<target host="www.bol.de"/>
+	<target host="img.bol.de"/>
+	<target host="books.ch"/>
+	<target host="www.books.ch"/>
+	<target host="img.books.ch"/>
+	<target host="buch.ch"/>
+	<target host="www.buch.ch"/>
+	<target host="img.buch.ch"/>
+	<target host="buch.de"/>
+	<target host="www.buch.de"/>
+	<target host="img.buch.de"/>
+	<target host="leseprobe.buch.de"/>
+	<target host="ssl.buch.de"/>
+	<target host="thalia.at"/>
+	<target host="www.thalia.at"/>
+	<target host="img.thalia.at"/>
+	<target host="thalia.ch"/>
+	<target host="www.thalia.ch"/>
+	<target host="img.thalia.ch"/>
+	<target host="thalia.de"/>
+	<target host="www.thalia.de"/>
+	<target host="img.thalia.de"/>
+
+	<!--
+	Trying to rewrite mismatched domains to buch.de, but this
+	fails for some images. Commented out for future work.
+
+	<target host="images.bol.de"/>
+	<target host="images.buch.de"/>
+	<target host="images.thalia.de"/>
+	<target host="media.buch.de"/>
+	<exclusion pattern="^http://media\.buch\.de/alexandria/"/>
+	<exclusion pattern="^http://images\.buch\.de/leseproben/"/>
+	<exclusion pattern="^http://images\.buch\.de/md21/"/>
+	<exclusion pattern="^http://images\.thalia\.de/md37/"/>
+
+	<test url="http://media.buch.de/alexandria/thalia_test/000008951137-00-1.jpg"/>
+	<test url="http://images.buch.de/leseproben/874/541/12_9783442541874.pdf"/>
+	<test url="http://images.buch.de/md21/Pix2015/Portalseite/miles-and-more-logo-startseite.png"/>
+	<test url="http://images.thalia.de/md37/lp2015/Sommer/sommer_stempel_thalia_10.png"/>
+
+	<rule from="^http://images\.bol\.de/"
+		to="https://www.bol.de/"/>
+	<rule from="^http://images\.buch\.de/"
+		to="https://www.buch.de/"/>
+	<rule from="^http://media\.buch\.de/"
+		to="https://www.buch.de/"/>
+	<rule from="^http://images\.thalia\.de/"
+		to="https://www.buch.de/"/>
+	-->
+
+	<rule from="^http://buch\.de/"
+		to="https://www.buch.de/"/>
+	<rule from="^http://thalia\.ch/"
+		to="https://www.thalia.ch/"/>
+	<rule from="^http:"
+		to="https:"/>
+</ruleset>
diff --git a/src/chrome/content/rules/buch.ch.xml b/src/chrome/content/rules/buch.ch.xml
deleted file mode 100644
index 0a9beffa8dd7..000000000000
--- a/src/chrome/content/rules/buch.ch.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<ruleset name="buch.ch">
-	<target host="buch.ch"/>
-	<target host="www.buch.ch"/>
-
-	<rule from="^http://(?:www\.)?buch\.ch/"
-		to="https://www.buch.ch/"/>
-</ruleset>