diff --git a/src/chrome/content/rules/Mozilla.xml b/src/chrome/content/rules/Mozilla.xml
index f1e16d84a4..6db0d6500f 100644
--- a/src/chrome/content/rules/Mozilla.xml
+++ b/src/chrome/content/rules/Mozilla.xml
@@ -142,6 +142,7 @@
 			- foundationwiki
 			- ftp
 			- gameon
+            - gpg
 			- hacks
 			- hg
 			- inform
@@ -307,4 +308,7 @@
 
 	<rule from="^http://(planet|support)\.mozillamessaging\.com/"
 		to="https://$1.mozillamessaging.com/" />
+
+        <rule from="^https://(keys|keyserver|gpg)\.mozilla\.org/"
+                to="https://$1.mozilla.org/" />
 </ruleset>