diff --git a/INSTALL.md b/INSTALL.md
index 54addd285..f2345bc8f 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -64,7 +64,7 @@ Dendrite requires a postgres database engine, version 9.5 or later.
   ```
 * Create databases:
   ```bash
-  for i in account device mediaapi syncapi roomserver serverkey federationsender publicroomsapi; do
+  for i in account device mediaapi syncapi roomserver serverkey federationsender publicroomsapi naffka; do
       sudo -u postgres createdb -O dendrite dendrite_$i
   done
   ```
diff --git a/dendrite-config.yaml b/dendrite-config.yaml
index 9baba8f94..6e2326595 100644
--- a/dendrite-config.yaml
+++ b/dendrite-config.yaml
@@ -80,6 +80,7 @@ kafka:
     # Naffka can only be used when running dendrite as a single monolithic server.
     # Kafka can be used both with a monolithic server and when running the
     # components as separate servers.
+    # If enabled database.naffka must also be specified.
     use_naffka: false
     # The names of the kafka topics to use.
     topics:
@@ -97,6 +98,8 @@ database:
     server_key: "postgres://dendrite:itsasecret@localhost/dendrite_serverkey?sslmode=disable"
     federation_sender: "postgres://dendrite:itsasecret@localhost/dendrite_federationsender?sslmode=disable"
     public_rooms_api: "postgres://dendrite:itsasecret@localhost/dendrite_publicroomsapi?sslmode=disable"
+    # If using naffka you need to specify a naffka database
+    # naffka: "postgres://dendrite:itsasecret@localhost/dendrite_naffka?sslmode=disable"
 
 # The TCP host:port pairs to bind the internal HTTP APIs to.
 # These shouldn't be exposed to the public internet.