diff --git a/lib/server.js b/lib/server.js
index e2ad4cb..19dca5b 100644
--- a/lib/server.js
+++ b/lib/server.js
@@ -256,10 +256,22 @@ export default async argv => {
 
   // use logger, at least in development, probably needs a param to configure (or turn off).
   // use stream to direct to somewhere other than stdout.
-  logger.token('vhost', (req, res) => {
-    return colorString(wikiName)
-  })
-  app.use(logger(':vhost :method :url :status :res[content-length] - :response-time ms'))
+  const vhost = colorString(wikiName)
+  app.use(
+    logger((tokens, req, res) => {
+      return [
+        vhost,
+        tokens.method(req, res),
+        tokens.url(req, res),
+        tokens.status(req, res),
+        tokens.res(req, res, 'content-length'),
+        '-',
+        tokens['response-time'](req, res),
+        'ms',
+      ].join(' ')
+    }),
+  )
+
   app.use(cookieParser())
   app.use(bodyParser.json({ limit: argv.uploadLimit }))
   app.use(bodyParser.urlencoded({ extended: true, limit: argv.uploadLimit }))