diff --git a/bus/config-parser.c b/bus/config-parser.c
index cb388473..e9940ce6 100644
--- a/bus/config-parser.c
+++ b/bus/config-parser.c
@@ -518,14 +518,14 @@ bus_config_parser_new (const DBusString      *basedir,
       parser->limits.pending_fd_timeout = 150000; /* 2.5 minutes */
       
       parser->limits.max_incomplete_connections = 64;
-      parser->limits.max_connections_per_user = 256;
+      parser->limits.max_connections_per_user = 512;
       parser->limits.max_containers_per_user = 16;
       
       /* Note that max_completed_connections / max_connections_per_user
        * is the number of users that would have to work together to
        * DOS all the other users. The same applies to containers.
        */
-      parser->limits.max_completed_connections = 2048;
+      parser->limits.max_completed_connections = 4096;
       parser->limits.max_containers = 512;
       /* Similarly max_connections_per_user / max_connections_per_container
        * is the number of app-containers per user that would have to work
diff --git a/bus/system.conf.in b/bus/system.conf.in
index dea09bd5..51e60208 100644
--- a/bus/system.conf.in
+++ b/bus/system.conf.in
@@ -119,9 +119,9 @@
   <!-- <limit name="service_start_timeout">25000</limit> -->
   <!-- <limit name="auth_timeout">30000</limit> -->
   <!-- <limit name="pending_fd_timeout">150000</limit> -->
-  <!-- <limit name="max_completed_connections">2048</limit> -->
+  <!-- <limit name="max_completed_connections">4096</limit> -->
   <!-- <limit name="max_incomplete_connections">64</limit> -->
-  <!-- <limit name="max_connections_per_user">256</limit> -->
+  <!-- <limit name="max_connections_per_user">512</limit> -->
   <!-- <limit name="max_pending_service_starts">512</limit> -->
   <!-- <limit name="max_names_per_connection">512</limit> -->
   <!-- <limit name="max_match_rules_per_connection">512</limit> -->