diff --git a/issues/_template/00_METADATA.html b/issues/_template/00_METADATA.html
index b76e1e9..a50f6d4 100644
--- a/issues/_template/00_METADATA.html
+++ b/issues/_template/00_METADATA.html
@@ -1,6 +1,6 @@
 <div id="title">OpenBSD Webzine</div>
 <div id="banner">
-	<span>ISSUE #1</span>
-	<span class="right">Sat Sep 25 12:06:17 UTC 2021</span>
+	<div>ISSUE #__ISSUE__</div>
+	<div>__DATE__</div>
 </div>
 <main>
diff --git a/issues/issue-0001/00_METADATA.html b/issues/issue-0001/00_METADATA.html
index b76e1e9..a50f6d4 100644
--- a/issues/issue-0001/00_METADATA.html
+++ b/issues/issue-0001/00_METADATA.html
@@ -1,6 +1,6 @@
 <div id="title">OpenBSD Webzine</div>
 <div id="banner">
-	<span>ISSUE #1</span>
-	<span class="right">Sat Sep 25 12:06:17 UTC 2021</span>
+	<div>ISSUE #__ISSUE__</div>
+	<div>__DATE__</div>
 </div>
 <main>
diff --git a/issues/make_issue.sh b/issues/make_issue.sh
index 94a7f82..c3f04c7 100755
--- a/issues/make_issue.sh
+++ b/issues/make_issue.sh
@@ -25,3 +25,10 @@ else
 fi
 
 cat _common/header $DIR/*html _common/footer > ../${DEST}/${DIR}.html
+
+# replace with issue number
+issue=$(echo -n "$1" | egrep -o "[0-9]+")
+sed -i "s/__ISSUE__/${issue}/g" ../${DEST}/${DIR}.html
+
+# replace date
+sed -i "s/__DATE__/$(date -u)/" ../${DEST}/${DIR}.html