diff --git a/issues/_common/header b/issues/_common/header
index 342ca6e..709bd6a 100644
--- a/issues/_common/header
+++ b/issues/_common/header
@@ -7,11 +7,11 @@
         <link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png">
         <link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png">
         <link rel="alternate" type="application/rss+xml" href="https://webzine.puffy.cafe/atom.xml">
-	<meta property="og:title" content="OpenBSD webzine issue #__ISSUE__" />
-	<meta property="og:description" content="Webzine created by volunteers who are passionate about the OpenBSD project development." />
-	<meta property="og:url" content="https://webzine.puffy.cafe/issue-__ISSUE__.html" />
-	<meta property="og:type" content="website" />
-	<meta property="og:locale" content="en_EN" />
+        <meta property="og:title" content="OpenBSD webzine __TITLE__" />
+        <meta property="og:description" content="Webzine created by volunteers who are passionate about the OpenBSD project development." />
+        <meta property="og:url" content="https://webzine.puffy.cafe/__FILENAME__" />
+        <meta property="og:type" content="website" />
+        <meta property="og:locale" content="en_EN" />
         <title>OpenBSD_WEBZINE_ISSUE #__ISSUE__</title>
         <style>
 
diff --git a/issues/tools/make_issue.sh b/issues/tools/make_issue.sh
index 2a08be8..e235ab8 100755
--- a/issues/tools/make_issue.sh
+++ b/issues/tools/make_issue.sh
@@ -46,8 +46,12 @@ then
     # replace with issue number
     issue="${1#issue-}"
     sed -i "s/__ISSUE__/${issue}/g" $DESTFILENAME
+    sed -i "s/__TITLE__/issue #${issue}/g" $DESTFILENAME
+    sed -i "s/__FILENAME__/issue-${issue}.html/" $DESTFILENAME
 else
     sed -i "s/OpenBSD_WEBZINE_ISSUE #__ISSUE__/The OpenBSD Webzine/g" $DESTFILENAME
+    sed -i "s/__TITLE__/homepage/g" $DESTFILENAME
+    sed -i "s/__FILENAME__/index.html/" $DESTFILENAME
 fi
 
 # replace date