diff --git a/issues/tools/make_issue.sh b/issues/tools/make_issue.sh
index fbee01f..d981789 100755
--- a/issues/tools/make_issue.sh
+++ b/issues/tools/make_issue.sh
@@ -43,25 +43,26 @@ cat _common/header $DIR/*html _common/footer > $DESTFILENAME
 
 if ! [ "$DIR" = "_index" ]
 then
+    set -e
     # 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
     # replace date
-    DATETIME="$(date -j -f "%Y-%m-%dT%H:%M:%SZ" "${PUBLISHED_DATE}" +"%xT%XZ")" 2>/dev/null
+    DATETIME="$(date -j -f "%Y-%m-%dT%H:%M:%SZ" "${PUBLISHED_DATE}" +"%Y-%m-%d %H:%M")" 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
+    if [ $? -ne 0 ];
+    then
         echo "err: Please fill ${DIR}/metadata.sh with ISO-8601 valid date"
         exit 1
-    else
-		sed -i "s/__DATETIME__/${DATETIME}/" $DESTFILENAME
-        sed -i "s/__HUMAN_DATE__/${HUMAN_DATE}/" $DESTFILENAME
     fi
+    sed -i "s,__DATETIME__,${DATETIME}," $DESTFILENAME
+    sed -i "s/__HUMAN_DATE__/${HUMAN_DATE}/" $DESTFILENAME
 else
     # index.html changes
-    sed -i "s/OpenBSD_WEBZINE_ISSUE #__ISSUE__/The OpenBSD Webzine/g" $DESTFILENAME
+    sed -i "s/ #__ISSUE__//g" $DESTFILENAME
     sed -i "s/__TITLE__/homepage/g" $DESTFILENAME
     sed -i "s/__FILENAME__/index.html/" $DESTFILENAME
 fi