diff --git a/src/main/resources/default-config.xml b/src/main/resources/default-config.xml
index 4f021f9..a4a30d9 100644
--- a/src/main/resources/default-config.xml
+++ b/src/main/resources/default-config.xml
@@ -195,6 +195,8 @@
 	<!-- Rewrite -->
 	<bean id="foundryRewrite"
 		class="de.ids_mannheim.korap.rewrite.FoundryRewrite" />
+	<bean id="timeoutRewrite"
+		class="de.ids_mannheim.korap.rewrite.TimeoutRewrite" />
 	<bean id="availabilityRewrite"
 		class="de.ids_mannheim.korap.rewrite.AvailabilityRewrite" />
 	<bean id="virtualCorpusRewrite"
@@ -205,6 +207,7 @@
 	<util:list id="rewriteTasks"
 		value-type="de.ids_mannheim.korap.rewrite.RewriteTask">
 		<ref bean="foundryRewrite" />
+		<ref bean="timeoutRewrite" />
 		<ref bean="availabilityRewrite" />
 		<ref bean="virtualCorpusRewrite" />
 		<ref bean="queryReferenceRewrite" />
diff --git a/src/main/resources/default-lite-config.xml b/src/main/resources/default-lite-config.xml
index 56f1201..d7b08e8 100644
--- a/src/main/resources/default-lite-config.xml
+++ b/src/main/resources/default-lite-config.xml
@@ -191,10 +191,13 @@
 		class="de.ids_mannheim.korap.rewrite.LayerMapper" />
 	<bean id="foundryInject"
 		class="de.ids_mannheim.korap.rewrite.FoundryInject" />
+	<bean id="timeoutRewrite"
+	class="de.ids_mannheim.korap.rewrite.TimeoutRewrite" />	
 
 	<util:list id="rewriteTasks"
 		value-type="de.ids_mannheim.korap.rewrite.RewriteTask">
 		<ref bean="foundryInject" />
+		<ref bean="timeoutRewrite" />
 	</util:list>
 
 	<bean id="rewriteHandler"
diff --git a/src/main/resources/kustvakt.conf b/src/main/resources/kustvakt.conf
index a0acde9..e45ea32 100644
--- a/src/main/resources/kustvakt.conf
+++ b/src/main/resources/kustvakt.conf
@@ -21,6 +21,10 @@
 server.port=8089
 server.host=localhost
 
+# Timeout
+# timeout.guest = 10000 (default)
+# timeout.login = 90000 (default)
+
 # Pipe (optional) 
 # pipe.host=https://korap.ids-mannheim.de