diff --git a/doc/src/sgml/config.sgml b/doc/src/sgml/config.sgml
index 3a8fc7d..db43caf 100644
*** a/doc/src/sgml/config.sgml
--- b/doc/src/sgml/config.sgml
*************** include_dir 'conf.d'
*** 2981,2987 ****
          Specifies the maximum number of concurrent connections from
          standby servers or streaming base backup clients (i.e., the
          maximum number of simultaneously running WAL sender
!         processes). The default is 10. The value 0 means replication is
          disabled. WAL sender processes count towards the total number
          of connections, so this parameter's value must be less than
          <xref linkend="guc-max-connections"/> minus
--- 2981,2987 ----
          Specifies the maximum number of concurrent connections from
          standby servers or streaming base backup clients (i.e., the
          maximum number of simultaneously running WAL sender
!         processes). The default is 3. The value 0 means replication is
          disabled. WAL sender processes count towards the total number
          of connections, so this parameter's value must be less than
          <xref linkend="guc-max-connections"/> minus
*************** include_dir 'conf.d'
*** 3009,3015 ****
          <para>
           Specifies the maximum number of replication slots
           (see <xref linkend="streaming-replication-slots"/>) that the server
!          can support. The default is 10.  This parameter can only be set at
           server start.
           Setting it to a lower value than the number of currently
           existing replication slots will prevent the server from starting.
--- 3009,3015 ----
          <para>
           Specifies the maximum number of replication slots
           (see <xref linkend="streaming-replication-slots"/>) that the server
!          can support. The default is 3.  This parameter can only be set at
           server start.
           Setting it to a lower value than the number of currently
           existing replication slots will prevent the server from starting.
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index d91ba05..85507d5 100644
*** a/src/backend/utils/misc/guc.c
--- b/src/backend/utils/misc/guc.c
*************** static struct config_int ConfigureNamesI
*** 2382,2388 ****
  			NULL
  		},
  		&max_wal_senders,
! 		10, 0, MAX_BACKENDS,
  		NULL, NULL, NULL
  	},
  
--- 2382,2388 ----
  			NULL
  		},
  		&max_wal_senders,
! 		3, 0, MAX_BACKENDS,
  		NULL, NULL, NULL
  	},
  
*************** static struct config_int ConfigureNamesI
*** 2393,2399 ****
  			NULL
  		},
  		&max_replication_slots,
! 		10, 0, MAX_BACKENDS /* XXX? */ ,
  		NULL, NULL, NULL
  	},
  
--- 2393,2399 ----
  			NULL
  		},
  		&max_replication_slots,
! 		3, 0, MAX_BACKENDS,
  		NULL, NULL, NULL
  	},
  
diff --git a/src/backend/utils/misc/postgresql.conf.sample b/src/backend/utils/misc/postgresql.conf.sample
index 3927292..15f257b 100644
*** a/src/backend/utils/misc/postgresql.conf.sample
--- b/src/backend/utils/misc/postgresql.conf.sample
***************
*** 234,245 ****
  
  # Set these on the master and on any standby that will send replication data.
  
! #max_wal_senders = 10		# max number of walsender processes
  				# (change requires restart)
  #wal_keep_segments = 0		# in logfile segments; 0 disables
  #wal_sender_timeout = 60s	# in milliseconds; 0 disables
  
! #max_replication_slots = 10	# max number of replication slots
  				# (change requires restart)
  #track_commit_timestamp = off	# collect timestamp of transaction commit
  				# (change requires restart)
--- 234,245 ----
  
  # Set these on the master and on any standby that will send replication data.
  
! #max_wal_senders = 3		# max number of walsender processes
  				# (change requires restart)
  #wal_keep_segments = 0		# in logfile segments; 0 disables
  #wal_sender_timeout = 60s	# in milliseconds; 0 disables
  
! #max_replication_slots = 3	# max number of replication slots
  				# (change requires restart)
  #track_commit_timestamp = off	# collect timestamp of transaction commit
  				# (change requires restart)
diff --git a/src/bin/pg_basebackup/t/010_pg_basebackup.pl b/src/bin/pg_basebackup/t/010_pg_basebackup.pl
index cdf4f5b..29cd928 100644
*** a/src/bin/pg_basebackup/t/010_pg_basebackup.pl
--- b/src/bin/pg_basebackup/t/010_pg_basebackup.pl
*************** $node->command_fails([ 'pg_basebackup', 
*** 45,52 ****
  ok(-d "$tempdir/backup", 'backup directory was created and left behind');
  
  open my $conf, '>>', "$pgdata/postgresql.conf";
! print $conf "max_replication_slots = 10\n";
! print $conf "max_wal_senders = 10\n";
  print $conf "wal_level = replica\n";
  close $conf;
  $node->restart;
--- 45,52 ----
  ok(-d "$tempdir/backup", 'backup directory was created and left behind');
  
  open my $conf, '>>', "$pgdata/postgresql.conf";
! print $conf "max_replication_slots = 5\n";
! print $conf "max_wal_senders = 5\n";
  print $conf "wal_level = replica\n";
  close $conf;
  $node->restart;