diff --git a/make-pages/Info.hs b/make-pages/Info.hs
index a719889..025c236 100644
--- a/make-pages/Info.hs
+++ b/make-pages/Info.hs
@@ -20,6 +20,7 @@ data Info =
     date        :: !Day,
     title       :: !(Maybe Text),
     tags        :: ![Text],
+    nsfwTags    :: ![Text],
     description :: !(Maybe Text),
     images      :: ![Image],
     thumb       :: !Text,
@@ -49,6 +50,7 @@ instance FromYAML Info where
     Info <$> m .:  "date"
          <*> m .:? "title"
          <*> m .:? "tags" .!= []
+         <*> m .:? "nsfwTags" .!= []
          <*> m .:? "description"
          <*> m .:  "images"
          <*> m .:  "thumb"
diff --git a/make-pages/SinglePage.hs b/make-pages/SinglePage.hs
index 1ba8b82..a6f5895 100644
--- a/make-pages/SinglePage.hs
+++ b/make-pages/SinglePage.hs
@@ -25,7 +25,8 @@ make :: Bool -> Info -> Lazy.Text
 make includeNsfw = toLazyText . make' includeNsfw
 
 make' :: Bool -> Info -> Builder
-make' includeNsfw (Info {date, title, tags, description, images, links}) =
+make' includeNsfw (Info {date, title, tags, nsfwTags,
+                         description, images, links}) =
  "<!DOCTYPE html>\n" <>
  "<html lang=en>\n" <>
  "<meta charset=utf-8>\n" <>
@@ -43,6 +44,7 @@ make' includeNsfw (Info {date, title, tags, description, images, links}) =
  "    <h2>description</h2>\n" <>
       indent 4 d <>
  "  </div>\n") <>
+    makeTags includeNsfw tags nsfwTags <>
     extLinks includeNsfw links <>
  "</main>\n\n" <>
  "<nav class=back>\n" <>
@@ -113,6 +115,17 @@ indent n txt = spaces <> go (Strict.unpack txt) where
   go (c:cs)    = singleton c <> go cs
   spaces = fromString $ replicate n ' '
 
+makeTags :: Bool -> [Strict.Text] -> [Strict.Text] -> Builder
+makeTags includeNsfw sfwTags nsfwTags =
+  if null tags then mempty else
+ "  <div class=tags>\n" <>
+ "    <h2>tags</h2>\n" <>
+ "    <ul>\n" <> foldMap makeTag tags <> "    </ul>\n" <>
+ "  </div>\n\n"
+ where
+  tags = List.nub $ if includeNsfw then sfwTags else sfwTags <> nsfwTags
+  makeTag t = "      <li>" <> fromText t <> "\n"
+
 extLinks :: Bool -> [Link] -> Builder
 extLinks includeNsfw links =
   let links' =
