diff --git a/development.ini b/development.ini
--- a/development.ini
+++ b/development.ini
@@ -30,15 +30,16 @@ pdebug = false
 
 [server:main]
 ##nr of threads to spawn
-threadpool_workers = 5
+#threadpool_workers = 5
 
 ##max request before thread respawn
-threadpool_max_requests = 10
+#threadpool_max_requests = 10
 
 ##option to use threads of process
-use_threadpool = true
+#use_threadpool = true
 
-use = egg:Paste#http
+#use = egg:Paste#http
+use = egg:waitress#main
 host = 0.0.0.0
 port = 5000
 
@@ -47,7 +48,7 @@ use = egg:rhodecode
 full_stack = true
 static_files = true
 # Optional Languages
-# en, fr, pt_BR, zh_CN, zh_TW
+# en, fr, ja, pt_BR, zh_CN, zh_TW
 lang = en
 cache_dir = %(here)s/data
 index_dir = %(here)s/data/index