diff --git a/src/chrome/content/rules/PortForward.com.xml b/src/chrome/content/rules/PortForward.com.xml
index 30c3bded738d..d2e5ce38cdb6 100644
--- a/src/chrome/content/rules/PortForward.com.xml
+++ b/src/chrome/content/rules/PortForward.com.xml
@@ -1,23 +1,26 @@
 <!--
-	Nonfunctional subdomains:
+	HTTP != HTTPS:
+		- admin
 
-		- boards	(cert: www.jasonbauer.net; shows that domain's data)
+	Mismatched:
+		- auth
+		- images
+		- img
+		- new
+		- search
 
--->
-<ruleset name="PortForward.com (partial)">
+	Timeout:
+		- forum
+		- mail
 
+	Expired:
+		- screenshots
+-->
+<ruleset name="PortForward.com">
 	<target host="portforward.com" />
 	<target host="www.portforward.com" />
+	<target host="portchecker.portforward.com" />
 	<target host="secure.portforward.com" />
 
-
-	<!--	- At least some pages present a link back to http
-		- https://(www.) redirects back to http
-					-->
-	<rule from="^http://(?:www\.)?portforward\.com/build/"
-		to="https://secure.portforward.com/build/" />
-
-	<rule from="^http://secure\.portforward\.com/"
-		to="https://secure.portforward.com/" />
-
+	<rule from="^http:" to="https:" />
 </ruleset>