diff --git a/tools/fix-h1s.sh b/tools/fix-h1s.sh
new file mode 100755
index 0000000000..10d2e61220
--- /dev/null
+++ b/tools/fix-h1s.sh
@@ -0,0 +1,24 @@
+#!/bin/bash -ex
+
+usage() {
+cat <<EOF
+Usage: $0 <javadoc-root-dir>
+EOF
+}
+
+if [ "$#" -ne 1 ] ; then
+  usage
+  exit 1
+fi
+
+# Assume Dokka has been run
+pushd $1
+
+find . -name "*.html" | while read ln
+do
+  # Make the output SEO friendly by converting the "h2" title to the proper "h1"
+  sed -i -e 's|<h2\(.* class="title".*\)</h2>|<h1\1</h1>|' "$ln"
+done
+find . -iname "*.html-e" | xargs rm
+
+popd
diff --git a/tools/publish_release.sh b/tools/publish_release.sh
index 9818b61f66..29cec6294e 100644
--- a/tools/publish_release.sh
+++ b/tools/publish_release.sh
@@ -106,6 +106,7 @@ create_javadoc() {
   echo "Creating JavaDoc..."
   cd $REALM_JAVA_PATH
   eval "./gradlew javadoc $GRADLE_BUILD_PARAMS --stacktrace" 
+  eval "./tools/fix-h1s.sh realm/realm-library/build/docs/javadoc/"
   cd $HERE
 }