diff --git a/production.ini b/production.ini
--- a/production.ini
+++ b/production.ini
@@ -29,6 +29,7 @@ pdebug = false
 #smtp_auth = 
 
 [server:main]
+## PASTE
 ##nr of threads to spawn
 #threadpool_workers = 5
 
@@ -39,7 +40,11 @@ pdebug = false
 #use_threadpool = true
 
 #use = egg:Paste#http
+
+#WAITRESS
+threads = 5
 use = egg:waitress#main
+
 host = 127.0.0.1
 port = 8001
 
@@ -54,16 +59,26 @@ use = egg:rhodecode
 full_stack = true
 static_files = true
 # Optional Languages
-# en, fr, ja, pt_BR, zh_CN, zh_TW
+# en, fr, ja, pt_BR, zh_CN, zh_TW, pl
 lang = en
 cache_dir = %(here)s/data
 index_dir = %(here)s/data/index
 app_instance_uuid = rc-production
 cut_off_limit = 256000
+vcs_full_cache = True
 force_https = false
 commit_parse_limit = 50
+# number of items displayed in lightweight dashboard before paginating
+dashboard_items = 100
 use_gravatar = true
 
+## RSS feed options
+
+rss_cut_off_limit = 256000
+rss_items_per_page = 10
+rss_include_diff = false
+
+
 ## alternative_gravatar_url allows you to use your own avatar server application
 ## the following parts of the URL will be replaced
 ## {email}        user email
@@ -76,6 +91,8 @@ use_gravatar = true
 
 container_auth_enabled = false
 proxypass_auth_enabled = false
+## default encoding used to convert from and to unicode
+## can be also a comma seperated list of encoding in case of mixed encodings
 default_encoding = utf8
 
 ## overwrite schema of clone url
@@ -227,6 +244,87 @@ beaker.session.auto = False
 #beaker.session.cookie_expires = 3600
 
 
+############################
+## ERROR HANDLING SYSTEMS ##
+############################
+
+####################
+### [errormator] ###
+####################
+
+# Errormator is tailored to work with RhodeCode, see 
+# http://errormator.com for details how to obtain an account
+# you must install python package `errormator_client` to make it work
+
+# errormator enabled
+errormator = true
+
+errormator.server_url = https://api.errormator.com
+errormator.api_key = YOUR_API_KEY
+
+# TWEAK AMOUNT OF INFO SENT HERE
+
+# enables 404 error logging (default False)
+errormator.report_404 = false
+
+# time in seconds after request is considered being slow (default 1)
+errormator.slow_request_time = 1
+
+# record slow requests in application
+# (needs to be enabled for slow datastore recording and time tracking)
+errormator.slow_requests = true
+
+# enable hooking to application loggers
+# errormator.logging = true
+
+# minimum log level for log capture
+# errormator.logging.level = WARNING
+
+# send logs only from erroneous/slow requests
+# (saves API quota for intensive logging)
+errormator.logging_on_error = false
+
+# list of additonal keywords that should be grabbed from environ object 
+# can be string with comma separated list of words in lowercase
+# (by default client will always send following info:
+# 'REMOTE_USER', 'REMOTE_ADDR', 'SERVER_NAME', 'CONTENT_TYPE' + all keys that 
+# start with HTTP* this list be extended with additional keywords here
+errormator.environ_keys_whitelist = 
+
+
+# list of keywords that should be blanked from request object 
+# can be string with comma separated list of words in lowercase
+# (by default client will always blank keys that contain following words 
+# 'password', 'passwd', 'pwd', 'auth_tkt', 'secret', 'csrf'
+# this list be extended with additional keywords set here
+errormator.request_keys_blacklist =
+
+
+# list of namespaces that should be ignores when gathering log entries
+# can be string with comma separated list of namespaces
+# (by default the client ignores own entries: errormator_client.client)
+errormator.log_namespace_blacklist =  
+
+
+################
+### [sentry] ###
+################
+
+# sentry is a alternative open source error aggregator
+# you must install python packages `sentry` and `raven` to enable 
+
+sentry.dsn = YOUR_DNS
+sentry.servers =
+sentry.name =
+sentry.key =
+sentry.public_key =
+sentry.secret_key =
+sentry.project =
+sentry.site =
+sentry.include_paths =
+sentry.exclude_paths =
+
+
 ################################################################################
 ## WARNING: *THE LINE BELOW MUST BE UNCOMMENTED ON A PRODUCTION ENVIRONMENT*  ##
 ## Debug mode will enable the interactive debugging tool, allowing ANYONE to  ##