diff --git a/etc/tor/torrc-client b/etc/tor/torrc-client
index f2f19c72..24f36db0 100644
--- a/etc/tor/torrc-client
+++ b/etc/tor/torrc-client
@@ -33,6 +33,15 @@ ClientUseIPv6 1
 # in a DS network preventing Tor over IPv4.
 #ClientPreferIPv6ORPort 1
 
+## Mapping clearnet domains to onions for certificate validation if
+## accessed through Tor
+# Other valid domains (that I am unlikely to use) in normal IRC:
+# fi.pirateirc.net (I use it in Biboumi though) / irc.piraattipuolue.fi
+MapAddress roubaix-fr.pirateirc.net tll4bxf546kzf6iv4n2m4pbbjnifrfewe3kcritva2tuuuiowygx2cqd.onion
+# Freenode has a lot of valid names, but zettel is the name of their Tor
+# server
+MapAddress zettel.freenode.net ajnvpgl6prmkb7yktvue6im5wiedlz2w32uhcwaamdiecdrfpwwgnlqd.onion
+
 # Disable control access
 #ControlPort 0
 #ControlSocket 0