diff --git a/base/ircd.yaml b/base/ircd.yaml
index fedd11c..b8bbc9e 100644
--- a/base/ircd.yaml
+++ b/base/ircd.yaml
@@ -341,7 +341,7 @@ accounts:
 
     # bouncer controls whether oragono can act as a bouncer, i.e., allowing
     # multiple connections to attach to the same client/nickname identity
-    bouncer:
+    multiclient:
         # when disabled, each connection must use a separate nickname (as is the
         # typical behavior of IRC servers). when enabled, a new connection that
         # has authenticated with SASL can associate itself with an existing
@@ -352,6 +352,11 @@ accounts:
         # via nickserv. if this is enabled, then they have to opt out instead
         allowed-by-default: true
 
+        # whether to allow clients that remain on the server even
+        # when they have no active connections. The possible values are:
+        # "disabled", "opt-in", "opt-out", or "mandatory".
+        always-on: "opt-in"
+
     # vhosts controls the assignment of vhosts (strings displayed in place of the user's
     # hostname/IP) by the HostServ service
     vhosts:
@@ -642,10 +647,10 @@ history:
     enabled: true
 
     # how many channel-specific events (messages, joins, parts) should be tracked per channel?
-    channel-length: 1024
+    channel-length: 4096
 
     # how many direct messages and notices should be tracked per user?
-    client-length: 256
+    client-length: 512
 
     # how long should we try to preserve messages?
     # if `autoresize-window` is 0, the in-memory message buffers are preallocated to
@@ -661,3 +666,41 @@ history:
     # maximum number of CHATHISTORY messages that can be
     # requested at once (0 disables support for CHATHISTORY)
     chathistory-maxmessages: 100
+
+    # maximum number of messages that can be replayed at once during znc emulation
+    # (znc.in/playback, or automatic replay on initial reattach to a persistent client):
+    znc-maxmessages: 2048
+
+    # options to delete old messages, or prevent them from being retrieved
+    restrictions:
+        # if this is set, messages older than this cannot be retrieved by anyone
+        # (and will eventually be deleted from persistent storage, if that's enabled)
+        expire-time: 2w
+
+        # if this is set, logged-in users cannot retrieve messages older than their
+        # account registration date, and logged-out users cannot retrieve messages
+        # older than their sign-on time (modulo grace-period, see below):
+        enforce-registration-date: true
+
+        # but if this is set, you can retrieve messages that are up to `grace-period`
+        # older than the above cutoff time. this is recommended to allow logged-out
+        # users to do session resumption / query history after disconnections.
+        grace-period: 1h
+
+    # options to store history messages in a persistent database (currently only MySQL):
+    persistent:
+        enabled: false
+
+        # store unregistered channel messages in the persistent database?
+        unregistered-channels: false
+
+        # for a registered channel, the channel owner can potentially customize
+        # the history storage setting. as the server operator, your options are
+        # 'disabled' (no persistent storage, regardless of per-channel setting),
+        # 'opt-in', 'opt-out', and 'mandatory' (force persistent storage, ignoring
+        # per-channel setting):
+        registered-channels: "opt-out"
+
+        # direct messages are only stored in the database for persistent clients;
+        # you can control how they are stored here (same options as above)
+        direct-messages: "opt-out"