diff --git a/app.coffee b/app.coffee
index fcf67c3..9bcdfeb 100644
--- a/app.coffee
+++ b/app.coffee
@@ -34,7 +34,7 @@ app.use Metrics.http.monitor(logger)
 # Compile requests can take longer than the default two
 # minutes (including file download time), so bump up the 
 # timeout a bit.
-TIMEOUT = 6 * 60 * 1000
+TIMEOUT = 10 * 60 * 1000
 app.use (req, res, next) ->
 	req.setTimeout TIMEOUT
 	res.setTimeout TIMEOUT
diff --git a/app/coffee/RequestParser.coffee b/app/coffee/RequestParser.coffee
index c1912f6..9b94712 100644
--- a/app/coffee/RequestParser.coffee
+++ b/app/coffee/RequestParser.coffee
@@ -2,7 +2,7 @@ settings = require("settings-sharelatex")
 
 module.exports = RequestParser =
 	VALID_COMPILERS: ["pdflatex", "latex", "xelatex", "lualatex"]
-	MAX_TIMEOUT: 300
+	MAX_TIMEOUT: 600
 
 	parse: (body, callback = (error, data) ->) ->
 		response = {}