diff --git a/development.ini b/development.ini
--- a/development.ini
+++ b/development.ini
@@ -59,7 +59,7 @@ max_request_body_size = 107374182400
 ## recommended for bigger setup is using of of other than sync one
 #worker_class = sync
 #max_requests = 5
-## ammount of time a worker can handle request before it get's killed and
+## ammount of time a worker can handle request before it gets killed and
 ## restarted
 #timeout = 3600
 
@@ -94,6 +94,10 @@ max_request_body_size = 107374182400
 ## enable large buffers
 #buffer-size=65535
 
+## socket and http timeouts ##
+#http-timeout=3600
+#socket-timeout=3600
+
 ## Log requests slower than the specified number of milliseconds.
 #log-slow = 10
 
diff --git a/production.ini b/production.ini
--- a/production.ini
+++ b/production.ini
@@ -59,7 +59,7 @@ max_request_body_size = 107374182400
 ## recommended for bigger setup is using of of other than sync one
 #worker_class = sync
 #max_requests = 5
-## ammount of time a worker can handle request before it get's killed and
+## ammount of time a worker can handle request before it gets killed and
 ## restarted
 #timeout = 3600
 
@@ -94,6 +94,10 @@ max_request_body_size = 107374182400
 ## enable large buffers
 #buffer-size=65535
 
+## socket and http timeouts ##
+#http-timeout=3600
+#socket-timeout=3600
+
 ## Log requests slower than the specified number of milliseconds.
 #log-slow = 10
 
diff --git a/rhodecode/bin/template.ini.mako b/rhodecode/bin/template.ini.mako
--- a/rhodecode/bin/template.ini.mako
+++ b/rhodecode/bin/template.ini.mako
@@ -103,6 +103,10 @@ max-requests = 1000
 <%text>## enable large buffers</%text>
 buffer-size=65535
 
+<%text>## socket and http timeouts ##</%text>
+http-timeout=3600
+socket-timeout=3600
+
 <%text>## Log requests slower than the specified number of milliseconds.</%text>
 log-slow = 10
 
diff --git a/rhodecode/config/deployment.ini_tmpl b/rhodecode/config/deployment.ini_tmpl
--- a/rhodecode/config/deployment.ini_tmpl
+++ b/rhodecode/config/deployment.ini_tmpl
@@ -94,6 +94,10 @@ max_request_body_size = 107374182400
 ## enable large buffers
 #buffer-size=65535
 
+## socket and http timeouts ##
+#http-timeout=3600
+#socket-timeout=3600
+
 ## Log requests slower than the specified number of milliseconds.
 #log-slow = 10