diff --git a/issues/_template/00_METADATA.html b/issues/_template/00_METADATA.html
index af8610e..b779c08 100644
--- a/issues/_template/00_METADATA.html
+++ b/issues/_template/00_METADATA.html
@@ -2,8 +2,8 @@
 <h1 id="title"><a href="https://webzine.puffy.cafe">OpenBSD Webzine</a></h1>
 <div id="banner">
     <p>ISSUE #__ISSUE__</p>
-    <p><time datetime="__DATE__">__DATE__</time></p>
+    <p><time datetime="__DATETIME__">__HUMAN_DATE__</time></p>
 </div>
 </header>
 <main>
-<section>
\ No newline at end of file
+<section>
diff --git a/issues/tools/make_issue.sh b/issues/tools/make_issue.sh
index 9b04310..fbee01f 100755
--- a/issues/tools/make_issue.sh
+++ b/issues/tools/make_issue.sh
@@ -49,13 +49,15 @@ then
     sed -i "s/__TITLE__/issue #${issue}/g" $DESTFILENAME
     sed -i "s/__FILENAME__/issue-${issue}.html/" $DESTFILENAME
     # replace date
+    DATETIME="$(date -j -f "%Y-%m-%dT%H:%M:%SZ" "${PUBLISHED_DATE}" +"%xT%XZ")" 2>/dev/null
     HUMAN_DATE="$(date -j -f "%Y-%m-%dT%H:%M:%SZ" "${PUBLISHED_DATE}" +"%B %e, %Y")" 2>/dev/null
 
     if [ $? -ne 0 ]; then
         echo "err: Please fill ${DIR}/metadata.sh with ISO-8601 valid date"
         exit 1
     else
-        sed -i "s/__DATE__/${HUMAN_DATE}/" $DESTFILENAME
+		sed -i "s/__DATETIME__/${DATETIME}/" $DESTFILENAME
+        sed -i "s/__HUMAN_DATE__/${HUMAN_DATE}/" $DESTFILENAME
     fi
 else
     # index.html changes