diff --git a/index.html b/index.html
index 68e25e0..f62e473 100644
--- a/index.html
+++ b/index.html
@@ -161,6 +161,7 @@
 			<ul>
 				<li><ziba-link dir="person">Farzaneh Amini</ziba-link></li>
 				<li><ziba-link transform="lowercase">FediDB</ziba-link></li>
+				<li><ziba-link transform="lowercase">FediForum</ziba-link></li>
 				<li><ziba-link name="id">Fediverse ID</ziba-link>
 					<ul>
 						<li><ziba-link dir="id" name="syntax">Fediverse ID syntax</ziba-link></li>
@@ -197,6 +198,7 @@
 		<section>
 			<h2 id="J">J</h2>
 			<ul>
+				<li><ziba-link dir="person">Johannes Ernst</ziba-link></li>
 				<li><ziba-link>jrd</ziba-link></li>
 			</ul>
 		</section>
diff --git a/person/Johannes Ernst.html b/person/Johannes Ernst.html
new file mode 100644
index 0000000..7addf8d
--- /dev/null
+++ b/person/Johannes Ernst.html	
@@ -0,0 +1,26 @@
+<article>
+	<h1>Johannes Ernst (Fediverse)</h1>
+	<section>
+		<address class="h-card">
+			by
+			<a rel="author" class="u-url" href="http://changelog.ca/"><span class="p-given-name">Charles</span> <span class="p-additional-name">Iliya</span> <span class="p-family-name">Krempeaux</span></a>
+		</address>
+	</section>
+	<section>
+		<p>
+			<strong>Johannes Ernst</strong>, who goes by the nickname <strong>@j12t</strong>, is a notable person on the Fediverse because —
+		</p>
+		<ul>
+			<li><ziba-link dir=".." transform="lowercase">FediForum</ziba-link> — an unconference focused on the Fediverse</li>
+		</ul>
+	</section>
+	<section>
+		<h2>Fediverse IDs</h2>
+		<p>
+			<strong>Johannes Ernst</strong>'s <ziba-link dir=".." name="id">Fediverse ID</ziba-link>'s are:
+		</p>
+		<ul>
+			<li>@j12t@social.coop</li>
+		</ul>
+	</section>
+</article>
diff --git a/who is who.html b/who is who.html
index 3f311b7..57a4320 100644
--- a/who is who.html	
+++ b/who is who.html	
@@ -67,6 +67,9 @@
 		</section>
 		<section>
 			<h2 id="J">J</h2>
+			<ul>
+				<li><ziba-link dir="person">Johannes Ernst</ziba-link></li>
+			</ul>
 		</section>
 		<section>
 			<h2 id="K">K</h2>