diff --git a/content/_index.md b/content/_index.md
index dfb4765..2fb63f3 100644
--- a/content/_index.md
+++ b/content/_index.md
@@ -13,7 +13,7 @@ sitemap:
 Seirdy’s Home
 =============
 
-I'm <a itemprop="url" href="https://seirdy.one" rel="author me home canonical" class="u-url u-uid url"> {{% indieweb-icon %}} <span itemprop="name" class="p-name fn n"> <span itemprop="givenName" class="p-given-name given-name">Rohan</span> <span itemprop="familyName" class="p-family-name family-name">Kumar</span></span></a>, a.k.a. <span itemprop="alternateName" class="p-nickname nickname">Seirdy</span> (online handle).
+I'm <a itemprop="url" href="https://seirdy.one" rel="author me home canonical" class="u-url u-uid url"> {{% indieweb-icon %}} <span itemprop="name" class="p-name fn n"> <span itemprop="givenName" class="p-given-name given-name">Rohan</span>&#160;<span itemprop="familyName" class="p-family-name family-name">Kumar</span></span></a>, a.k.a. <span itemprop="alternateName" class="p-nickname nickname">Seirdy</span> (online handle).
 
 Other versions of this website
 ------------------------------
diff --git a/layouts/shortcodes/indieweb-author.html b/layouts/shortcodes/indieweb-author.html
index 00283c3..44770ef 100644
--- a/layouts/shortcodes/indieweb-author.html
+++ b/layouts/shortcodes/indieweb-author.html
@@ -24,6 +24,5 @@
 	<a itemprop="url" href="https://seirdy.one/" rel="author me home cc:attributionURL" class="u-url u-uid url" property="cc:attributionName">
 		{{ partial "indieweb-icon.html" -}}
 		<span itemprop="name" class="p-name fn n">
-			<span itemprop="givenName" class="p-given-name given-name">Rohan</span>
-			<span itemprop="familyName" class="p-family-name family-name">Kumar</span></span></a>
+			<span itemprop="givenName" class="p-given-name given-name">Rohan</span>&#160;<span itemprop="familyName" class="p-family-name family-name">Kumar</span></span></a>
 </span>
diff --git a/scripts/xhtmlize-single-file.sh b/scripts/xhtmlize-single-file.sh
index f324d44..ef12556 100644
--- a/scripts/xhtmlize-single-file.sh
+++ b/scripts/xhtmlize-single-file.sh
@@ -30,7 +30,8 @@ sed 7d "$html_file" | xmllint --format --encode UTF-8 --noent - -o "$tmp_file"
 	cat tmp.css
 	tail -n +8 "$tmp_file" \
 		| sd '<pre(?: tabindex="0")?>\n\t*<code ' '<pre tabindex="0"><code ' \
-		| sd '(?:\n)?</code>\n(?:[\t\s]*)?</pre>' '</code></pre>'
+		| sd '(?:\n)?</code>\n(?:[\t\s]*)?</pre>' '</code></pre>' \
+		| sd '</span>.span itemprop="familyName"' '</span> <span itemprop="familyName"'
 } >>"$xhtml_file"
 
  # replace the html file with the formatted xhtml5 file, excluding the xml declaration