diff --git a/config b/config
index 9fa2f1e..fc37502 100644
--- a/config
+++ b/config
@@ -27,10 +27,10 @@
 #max_connections = 20
 
 # Max size of request body (bytes)
-#max_content_length = 10000000
+#max_content_length = 100000000
 
 # Socket timeout (seconds)
-#timeout = 10
+#timeout = 30
 
 # SSL flag, enable HTTPS protocol
 #ssl = False
diff --git a/radicale/config.py b/radicale/config.py
index eb3a38e..7f94d5a 100644
--- a/radicale/config.py
+++ b/radicale/config.py
@@ -73,11 +73,11 @@ INITIAL_CONFIG = OrderedDict([
             "help": "maximum number of parallel connections",
             "type": positive_int}),
         ("max_content_length", {
-            "value": "10000000",
+            "value": "100000000",
             "help": "maximum size of request body in bytes",
             "type": positive_int}),
         ("timeout", {
-            "value": "10",
+            "value": "30",
             "help": "socket timeout",
             "type": positive_int}),
         ("ssl", {