diff --git a/conf/nginx.conf b/conf/nginx.conf
index 8ae2f3e..297f00d 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -1,26 +1,30 @@
 #sub_path_only rewrite ^__PATH__$ __PATH__/ permanent;
 location __PATH__/ {
+        rewrite         __PATH__/(.*) /$1 break;
+        rewrite         ^__PATH__$ __PATH__/ permanent;
+        proxy_redirect  / __PATH__/;
 
-    proxy_pass         http://127.0.0.1:__PORT__/;
-    proxy_set_header   Host $host;
-    proxy_pass_header  Server;
+        proxy_pass         http://127.0.0.1:__PORT__;
+        proxy_buffering    off; # be careful, this line doesn't override any proxy_buffering on set in a conf.d/file.conf
+        proxy_set_header   Host $host;
+        proxy_pass_header  Server;
+    }
 
-    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;
+location __PATH__/socket.io {
+        rewrite         __PATH__/socket.io/(.*) /socket.io/$1 break;
+        proxy_redirect  / __PATH__/;
 
-    # Include SSOWAT user panel.
-    include conf.d/yunohost_panel.conf.inc;
-}
+        proxy_pass         http://127.0.0.1:__PORT__;
+        proxy_buffering    off; # be careful, this line doesn't override any proxy_buffering on set in a conf.d/file.conf
+        proxy_set_header   Host $host;
+        proxy_pass_header  Server;
+    }
 
-location ~* __PATH__/p/[^/]*(_|%|\*)[^/]*/export/etherpad {
-    return 404;
-}
+    location __PATH__/static {
+        rewrite  __PATH__/static/(.*) /static/$1 break;
+
+        proxy_pass         http://127.0.0.1:__PORT__;
+        proxy_buffering    off; # be careful, this line doesn't override any proxy_buffering on set in a conf.d/file.conf
+        proxy_set_header   Host $host;
+        proxy_pass_header  Server;
+    }