diff --git a/development.ini b/development.ini
--- a/development.ini
+++ b/development.ini
@@ -29,24 +29,37 @@ pdebug = false
 #smtp_auth = 
 
 [server:main]
-## PASTE
-## nr of threads to spawn
+## PASTE ##
+#use = egg:Paste#http
+## nr of worker threads to spawn
 #threadpool_workers = 5
-
 ## max request before thread respawn
 #threadpool_max_requests = 10
-
 ## option to use threads of process
 #use_threadpool = true
 
-#use = egg:Paste#http
-
-## WAITRESS
+## WAITRESS ##
+use = egg:waitress#main
+## number of worker threads
 threads = 5
-## 100GB
+## MAX BODY SIZE 100GB
 max_request_body_size = 107374182400
-use = egg:waitress#main
+## use poll instead of select, fixes fd limits, may not work on old
+## windows systems.
+asyncore_use_poll = True
 
+## GUNICORN ##
+#use = egg:gunicorn#main
+## number of process workers. Don't change that to more than 1
+#workers = 1
+## process name
+#proc_name = rhodecode
+## type of worker class, one of sync, eventlet, gevent, tornado
+## recommended for bigger setup is using of of other than sync one
+#worker-class = sync
+#max-requests = 5
+
+## COMMON ##
 host = 0.0.0.0
 port = 5000
 
diff --git a/production.ini b/production.ini
--- a/production.ini
+++ b/production.ini
@@ -29,26 +29,39 @@ pdebug = false
 #smtp_auth = 
 
 [server:main]
-## PASTE
-## nr of threads to spawn
+## PASTE ##
+#use = egg:Paste#http
+## nr of worker threads to spawn
 #threadpool_workers = 5
-
 ## max request before thread respawn
 #threadpool_max_requests = 10
-
 ## option to use threads of process
 #use_threadpool = true
 
-#use = egg:Paste#http
-
-## WAITRESS
+## WAITRESS ##
+use = egg:waitress#main
+## number of worker threads
 threads = 5
-## 100GB
+## MAX BODY SIZE 100GB
 max_request_body_size = 107374182400
-use = egg:waitress#main
+## use poll instead of select, fixes fd limits, may not work on old
+## windows systems.
+asyncore_use_poll = True
 
+## GUNICORN ##
+#use = egg:gunicorn#main
+## number of process workers. Don't change that to more than 1
+#workers = 1
+## process name
+#proc_name = rhodecode
+## type of worker class, one of sync, eventlet, gevent, tornado
+## recommended for bigger setup is using of of other than sync one
+#worker-class = sync
+#max-requests = 5
+
+## COMMON ##
 host = 127.0.0.1
-port = 8001
+port = 5000
 
 ## prefix middleware for rc
 #[filter:proxy-prefix]
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
@@ -29,24 +29,37 @@ pdebug = false
 #smtp_auth = 
 
 [server:main]
-## PASTE
-## nr of threads to spawn
+## PASTE ##
+#use = egg:Paste#http
+## nr of worker threads to spawn
 #threadpool_workers = 5
-
 ## max request before thread respawn
 #threadpool_max_requests = 10
-
 ## option to use threads of process
 #use_threadpool = true
 
-#use = egg:Paste#http
-
-## WAITRESS
+## WAITRESS ##
+use = egg:waitress#main
+## number of worker threads
 threads = 5
-## 100GB
+## MAX BODY SIZE 100GB
 max_request_body_size = 107374182400
-use = egg:waitress#main
+## use poll instead of select, fixes fd limits, may not work on old
+## windows systems.
+asyncore_use_poll = True
 
+## GUNICORN ##
+#use = egg:gunicorn#main
+## number of process workers. Don't change that to more than 1
+#workers = 1
+## process name
+#proc_name = rhodecode
+## type of worker class, one of sync, eventlet, gevent, tornado
+## recommended for bigger setup is using of of other than sync one
+#worker-class = sync
+#max-requests = 5
+
+## COMMON ##
 host = 127.0.0.1
 port = 5000