diff --git a/src/chrome/content/rules/GnuPG.org.xml b/src/chrome/content/rules/GnuPG.org.xml
index 3c25479c127d..ab3ec24ef473 100644
--- a/src/chrome/content/rules/GnuPG.org.xml
+++ b/src/chrome/content/rules/GnuPG.org.xml
@@ -1,29 +1,46 @@
 <!--
-	No working URL known:
-		versions.gnupg.org (403)
-		wkd.gnupg.org (403)
-
 	Bad certificate:
+		al-kindi.gnupg.org
 		alberti.gnupg.org
+		blog.gnupg.org
+		cvs.gnupg.org
+		jenkins.gnupg.org
 		logo-contest.gnupg.org
 		www.tla-friendly.gnupg.org
 		www-old.gnupg.org
 
+	Non-2xx HTTP code:
+		media.gnupg.org
+
+	Refused:
+		ftp.gnupg.org
+
+	SSL: no alternative certificate subject name matches target host name:
+		www.wiki.gnupg.org
+
+	Timeout:
+		pt.gnupg.org
+		trithemius.gnupg.org
 -->
 <ruleset name="GnuPG.org">
 
 	<target host="gnupg.org" />
 	<target host="www.gnupg.org" />
 	<target host="bugs.gnupg.org" />
+	<target host="chat.gnupg.org" />
+	<target host="dev.gnupg.org" />
 	<target host="git.gnupg.org" />
 	<target host="gitstats.gnupg.org" />
-	<target host="jenkins.gnupg.org" />
+	<target host="jabber.gnupg.org" />
 	<target host="lists.gnupg.org" />
+	<target host="openpgpkey.gnupg.org" />
+	<target host="preview.gnupg.org" />
 	<target host="test.gnupg.org" />
+	<target host="versions.gnupg.org" />
+		<test url="http://versions.gnupg.org/swdb.lst" />
 	<target host="wiki.gnupg.org" />
-	<target host="www.wiki.gnupg.org" />
+	<target host="xmpp.gnupg.org" />
 
-	<rule from="^http:"
-		to="https:" />
+	<rule from="^http:"	to="https:" />
 
 </ruleset>