diff --git a/NEWS b/NEWS
index 9a0ecc0c5..1ad372958 100644
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,7 @@ ver 0.21.21 (not yet released)
   - gme: ignore empty tags
 * output
   - solaris: port to NetBSD
+* raise default "max_connections" value to 100
 
 ver 0.21.20 (2020/02/16)
 * decoder
diff --git a/doc/user.rst b/doc/user.rst
index 3ddb35610..f2ea36697 100644
--- a/doc/user.rst
+++ b/doc/user.rst
@@ -695,7 +695,7 @@ These settings are various limitations to prevent :program:`MPD` from using too
    * - **connection_timeout SECONDS**
      - If a client does not send any new data in this time period, the connection is closed. Clients waiting in "idle" mode are excluded from this. Default is 60.
    * - **max_connections NUMBER**
-     - This specifies the maximum number of clients that can be connected to :program:`MPD` at the same time. Default is 5.
+     - This specifies the maximum number of clients that can be connected to :program:`MPD` at the same time. Default is 100.
    * - **max_playlist_length NUMBER**
      - The maximum number of songs that can be in the playlist. Default is 16384.
    * - **max_command_list_size KBYTES**
diff --git a/src/Main.cxx b/src/Main.cxx
index 686813c1c..7ca83c111 100644
--- a/src/Main.cxx
+++ b/src/Main.cxx
@@ -460,7 +460,7 @@ MainOrThrow(int argc, char *argv[])
 #endif
 
 	const unsigned max_clients =
-		raw_config.GetPositive(ConfigOption::MAX_CONN, 10);
+		raw_config.GetPositive(ConfigOption::MAX_CONN, 100);
 	instance->client_list = new ClientList(max_clients);
 
 	initialize_decoder_and_player(raw_config, config.replay_gain);