diff --git a/src/chrome/content/rules/Beatport.com.xml b/src/chrome/content/rules/Beatport.com.xml
new file mode 100644
index 000000000000..261682620471
--- /dev/null
+++ b/src/chrome/content/rules/Beatport.com.xml
@@ -0,0 +1,25 @@
+<!--
+	Non-functional hosts:
+		Redirect to HTTP:
+		- classic.beatport.com
+		- sounds.beatport.com
+-->
+<ruleset name="Beatport.com">
+
+	<target host="beatport.com" />
+	<target host="www.beatport.com" />
+	<target host="accounts.beatport.com" />
+	<target host="baseware.beatport.com" />
+	<target host="dj.beatport.com" />
+	<target host="embed.beatport.com" />
+	<target host="geo-media.beatport.com" />
+	<test url="http://geo-media.beatport.com/image/2d4b4b06-d0a6-4d8d-b7d1-b68ed3bb6708.jpg" />
+	<target host="geo-pro.beatport.com" />
+	<test url="http://geo-pro.beatport.com/static/a48a3070545f4f6a5a266ab4624bdf348adc3401/images/apple-touch-icon-57x57.png" />
+	<target host="mixes.beatport.com" />
+	<target host="news.beatport.com" />
+	<target host="play.beatport.com" />
+
+	<rule from="^http:" to="https:" />
+
+</ruleset>
diff --git a/src/chrome/content/rules/Beatport.xml b/src/chrome/content/rules/Beatport.xml
deleted file mode 100644
index 24fd2e358ef8..000000000000
--- a/src/chrome/content/rules/Beatport.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<!--
-	Nonfunctional subdomains:
-
-		- dj	(redirects to http)
-
-
-	Problematic subdomains:
-
-		- embed		(redirects to http)
-
-
-	Partially covered subdomains:
-
-		- embed		(→ www)
-
-
-	Fully covered domains:
-
-		- beatport.com subdomains:
-
-			- (www.)
-			- accounts
-			- baseware
-			- geo-media
-			- mixes
-			- news
-			- play
-			- sounds
-
-		- static.bpddn.com
-
--->
-<ruleset name="Beatport (buggy)" default_off="JS redirection loop">
-
-	<target host="beatport.com" />
-	<target host="*.beatport.com" />
-	<target host="static.bpddn.com" />
-
-
-	<securecookie host="^(?:baseware)?\.beatport\.com$" name=".+" />
-
-
-	<rule from="^http://((?:accounts|baseware|geo-media|mixes|news|play|sounds|www)\.)?beatport\.com/"
-		to="https://$1beatport.com/" />
-
-	<rule from="^http://embed\.beatport\.com/(?:$|\?)"
-		to="https://www.beatport.com/" />
-
-	<rule from="^http://static\.bpddn\.com/"
-		to="https://static.bpddn.com/" />
-
-</ruleset>