diff --git a/support/apache/peertube.conf b/support/apache/peertube.conf
index 0ccd86069..9265fbda6 100644
--- a/support/apache/peertube.conf
+++ b/support/apache/peertube.conf
@@ -1,13 +1,13 @@
  <VirtualHost *:80>
         ServerName peertube.example.org
 
-        CustomLog /var/log/apache2/peertube/diaspote-access.log combined
-        ErrorLog /var/log/apache2/peertube/diaspote-error.log
+        CustomLog /var/log/apache2/peertube/perrtube-access.log combined
+        ErrorLog /var/log/apache2/peertube/peertube-error.log
 
         ProxyRequests Off
         ProxyPreserveHost On
 
-        Timeout 300
+        Timeout 900
 
         Header set Access-Control-Allow-Origin "*"
         Header set Access-Control-Allow-Headers "x-requested-with, Content-Type, origin, authorization, accept, client-security-token, range"