diff --git a/conf/nginx.conf b/conf/nginx.conf
index 4fa0600..ecb5289 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -1,19 +1,25 @@
+#sub_path_only rewrite ^__PATH__$ __PATH__/ permanent;
 location __PATH__/ {
 
-	#sub_path_only	rewrite                ^__PATH__$ __PATH__/ permanent;
-	#sub_path_only	rewrite                ^__PATH__/admin$ __PATH__/admin/ permanent;
-	proxy_pass             http://127.0.0.1:__PORT__/;
-	proxy_set_header       Host $host;
-	proxy_buffering off;
-	more_set_headers "X-Frame-Options : ALLOWALL";
+  proxy_pass         http://127.0.0.1:__PORT__/;
+  proxy_set_header   Host $host;
+  proxy_pass_header  Server;
 
-        # Recommended proxy_http version for keepalive connections
-        # https://github.com/ether/etherpad-lite/wiki/How-to-put-Etherpad-Lite-behind-a-reverse-Proxy#nginx
-        proxy_http_version 1.1;
+  # be careful, this line doesn't override any proxy_buffering on set in a conf.d/file.conf
+  proxy_buffering off;
+  more_set_headers "X-Frame-Options : ALLOWALL";
+  proxy_set_header X-Real-IP $remote_addr;       # http://wiki.nginx.org/HttpProxyModule
+  proxy_set_header X-Forwarded-For $remote_addr; # EP logs to show the actual remote IP
+  proxy_set_header X-Forwarded-Proto $scheme;    # for EP to set secure cookie flag when https is used
+  proxy_set_header Host $host;                   # pass the host header
+  proxy_http_version 1.1;                        # recommended with keepalive connections
+  
+  # WebSocket proxying - from http://nginx.org/en/docs/http/websocket.html
+  proxy_set_header Upgrade $http_upgrade;
+  proxy_set_header Connection $connection_upgrade;
 
-
-	# Include SSOWAT user panel.
-	include conf.d/yunohost_panel.conf.inc;
+  # Include SSOWAT user panel.
+  include conf.d/yunohost_panel.conf.inc;
 }
 
 location ~* __PATH__/p/[^/]*(_|%|\*)[^/]*/export/etherpad {