diff --git a/lib/diaspora_federation/web_finger/h_card.rb b/lib/diaspora_federation/web_finger/h_card.rb
index a0e1f4d..ecc37a0 100644
--- a/lib/diaspora_federation/web_finger/h_card.rb
+++ b/lib/diaspora_federation/web_finger/h_card.rb
@@ -126,7 +126,10 @@ module DiasporaFederation
         add_simple_property(content, :nickname, "nickname", @nickname)
         add_simple_property(content, :full_name, "fn", @full_name)
         add_simple_property(content, :searchable, "searchable", @searchable)
-        add_simple_property(content, :key, "key", @pubkey)
+
+        add_property(content, :key) do |html|
+          html.pre(@pubkey.to_s, class: "key")
+        end
 
         # TODO: remove me!  ###################
         add_simple_property(content, :first_name, "given_name", @first_name)
diff --git a/spec/lib/diaspora_federation/web_finger/h_card_spec.rb b/spec/lib/diaspora_federation/web_finger/h_card_spec.rb
index d23da90..4727cd3 100644
--- a/spec/lib/diaspora_federation/web_finger/h_card_spec.rb
+++ b/spec/lib/diaspora_federation/web_finger/h_card_spec.rb
@@ -53,7 +53,7 @@ module DiasporaFederation
         <dl class="entity_key">
           <dt>Key</dt>
           <dd>
-            <span class="key">#{key}</span>
+            <pre class="key">#{key}</pre>
           </dd>
         </dl>
         <dl class="entity_first_name">