diff --git a/issues/_puffy.cafe/00_METADATA.html b/issues/_puffy.cafe/00_METADATA.html
new file mode 100644
index 0000000..1d466eb
--- /dev/null
+++ b/issues/_puffy.cafe/00_METADATA.html
@@ -0,0 +1,5 @@
+<header>
+<h2 id="title">Puffy.cafe</h2>
+<p id="banner"><span aria-hidden="true">☕</span><em>Your tasty dose of OpenBSD news</em><span aria-hidden="true">☕</span></p>
+</header>
+<main>
diff --git a/issues/_puffy.cafe/20_ISSUES.html b/issues/_puffy.cafe/20_ISSUES.html
new file mode 100644
index 0000000..6432f32
--- /dev/null
+++ b/issues/_puffy.cafe/20_ISSUES.html
@@ -0,0 +1,6 @@
+<article id="content">
+<h2>Related work</h2>
+<ul>
+    <li><a class="permalink" href="https://webzine.puffy.cafe/">The OpenBSD Webzine</a></li>
+</ul>
+</article>
diff --git a/issues/_puffy.cafe/30_INFOS.html b/issues/_puffy.cafe/30_INFOS.html
new file mode 100644
index 0000000..204c25c
--- /dev/null
+++ b/issues/_puffy.cafe/30_INFOS.html
@@ -0,0 +1,6 @@
+<article id="infos">
+<h2>Infos</h2>
+<div>
+    <p>Puffy.cafe may become in the future a place for many OpenBSD related content creator (artwork, stories, news). If you want to publish something under a domain name ending with .puffy.cafe please contact us.</p>
+</div>
+</article>
diff --git a/issues/_puffy.cafe/metadata.sh b/issues/_puffy.cafe/metadata.sh
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/issues/_puffy.cafe/metadata.sh
@@ -0,0 +1 @@
+
diff --git a/issues/tools/make_issue.sh b/issues/tools/make_issue.sh
index d981789..e9425f1 100755
--- a/issues/tools/make_issue.sh
+++ b/issues/tools/make_issue.sh
@@ -41,7 +41,7 @@ fi
 
 cat _common/header $DIR/*html _common/footer > $DESTFILENAME
 
-if ! [ "$DIR" = "_index" ]
+if echo $DIR | grep issue
 then
     set -e
     # replace with issue number