-Jabber ID: <a class="url" href="xmpp:bernie@codewiz.org">bernie****@****codwiz.org</a>\\
-IRC Nick: <span class="irc">_bernie</span>\\
+**<span class="fn">Bernie Innocenti</span>** <<a class="email" href="mailto:bernie@codewiz.org">bernie****@****codewiz.org</a>> \\
+Senior Systems Administrator, <a class="url org" href="http://www.fsf.org/">Free Software Foundation</a> \\
+Infrastructure Team Coordinator, <a class="url org" href="http://sugarlabs.org/">Sugar Labs Foundation</a> \\
+
+Jabber ID: <a class="url" href="xmpp:bernie@codewiz.org">bernie****@****codewiz.org</a> \\
+IRC Nick: <span class="irc">bernie</span> on Freenode and OFTC \\