diff --git a/src/chrome/content/rules/Sysmocom.de.xml b/src/chrome/content/rules/Sysmocom.de.xml
index 7d25357ad731..b6da264262f3 100644
--- a/src/chrome/content/rules/Sysmocom.de.xml
+++ b/src/chrome/content/rules/Sysmocom.de.xml
@@ -1,30 +1,24 @@
-<ruleset name="sysmocom.de (CAcert, partial)" platform="cacert">
-
-	<!--	Direct rewrites:
-				-->
-	<target host="piwik.sysmocom.de" />
-	<target host="shop.sysmocom.de" />
-	<target host="www.sysmocom.de" />
-
-	<!--	Complications:
-				-->
+<!--
+	Non-functional hosts
+		Incomplete certificate chain error:
+			 - dns.sysmocom.de
+			 - downloads.sysmocom.de
+			 - imap.sysmocom.de
+			 - mail.sysmocom.de
+			 - rt.sysmocom.de
+
+		5xx server error:
+			 - piwik.sysmocom.de
+
+		Secure connection redirects to plaintext:
+			 - shop.sysmocom.de
+-->
+<ruleset name="Sysmocom.de (partial)">
 	<target host="sysmocom.de" />
+	<target host="www.sysmocom.de" />
+	<target host="git.sysmocom.de" />
 
-		<exclusion pattern="^http://shop\.sysmocom\.de/(?!assets|checkout|images|login|stylesheets)" />
-
-			<!--	+ve:
-					-->
-			<test url="http://shop.sysmocom.de/products/cp2102-25" />
-			<test url="http://shop.sysmocom.de/products/osmocombb-filter-kit" />
-			<test url="http://shop.sysmocom.de/products/simtrace" />
-			<test url="http://shop.sysmocom.de/products/sysmousim-sjs1" />
-			<test url="http://shop.sysmocom.de/t/sim-card-related" />
-
-
-	<rule from="^http://sysmocom\.de/"
-		to="https://www.sysmocom.de/" />
-
-	<rule from="^http:"
-		to="https:" />
+	<securecookie host="^(www\.)?sysmocom\.de$" name=".+" />
 
+	<rule from="^http:" to="https:" />
 </ruleset>