diff --git a/make-pages/SinglePage.hs b/make-pages/SinglePage.hs
index 00d84b7..3c450b2 100644
--- a/make-pages/SinglePage.hs
+++ b/make-pages/SinglePage.hs
@@ -28,7 +28,7 @@ make :: Bool -> Info -> Lazy.Text
 make nsfw = toLazyText . make' nsfw
 
 make' :: Bool -> Info -> Builder
-make' nsfw (Info {date, title, tags, nsfwTags,
+make' nsfw (Info {date, title, artist, tags, nsfwTags,
                   description, images, links}) = [b|@0
     <!DOCTYPE html>
     <html lang=en>
@@ -37,6 +37,7 @@ make' nsfw (Info {date, title, tags, nsfwTags,
 
     <header>
       $titleHeader
+      $artistTag
       <h2 class=date>$formattedDate</date>
       $buttonBar
     </header>
@@ -61,6 +62,8 @@ make' nsfw (Info {date, title, tags, nsfwTags,
     titleTag    = ifJust title \t -> [b|<title>$*t</title>|]
     titleHeader = ifJust title \t -> [b|<h1>$*t</h1>|]
 
+    artistTag = ifJust artist makeArtist
+
     formattedDate = formatDate date
 
     buttonBar = makeButtonBar (fromMaybe path0 title) nsfw images
@@ -70,6 +73,14 @@ make' nsfw (Info {date, title, tags, nsfwTags,
     tagsList    = makeTags nsfw tags nsfwTags
     linksList   = extLinks nsfw links
 
+makeArtist :: Artist -> Builder
+makeArtist (Artist {name, url}) =
+  [b|<h2 class=artist>by $artistLink</h2>|]
+ where
+   artistLink = case url of
+    Just u  -> [b|<a href="$*u">$*name</a>|]
+    Nothing -> [b|$*name|]
+
 makeDesc :: Strict.Text -> Builder
 makeDesc desc = [b|@2
   <div class=desc>
