diff --git a/VERSION b/VERSION
index 30291cb..1454f6e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.10.0
+4.0.1
diff --git a/conf/nginx.conf-nosub b/conf/nginx.conf-nosub
index 53a4b74..1474b75 100644
--- a/conf/nginx.conf-nosub
+++ b/conf/nginx.conf-nosub
@@ -1,16 +1,37 @@
-location / {
-       client_max_body_size 50M;
+# Directives from the Mattermost installation guide
 
-       proxy_pass             http://localhost:8065/;
-       proxy_set_header       Host $http_host;
-       proxy_buffering off;
-
-       proxy_set_header X-Forwarded-Proto $scheme;
-       proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-       proxy_set_header X-Real-IP $remote_addr;
-
-       # Web-socket headers
-       proxy_http_version 1.1;
-       proxy_set_header Upgrade $http_upgrade;
-       proxy_set_header Connection "upgrade";
+location ~ /api/v[0-9]+/(users/)?websocket$ {
+    proxy_set_header Upgrade $http_upgrade;
+    proxy_set_header Connection "upgrade";
+    client_max_body_size 50M;
+    proxy_set_header Host $http_host;
+    proxy_set_header X-Real-IP $remote_addr;
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_set_header X-Forwarded-Proto $scheme;
+    proxy_set_header X-Frame-Options SAMEORIGIN;
+    proxy_buffers 256 16k;
+    proxy_buffer_size 16k;
+    proxy_read_timeout 600s;
+    proxy_pass http://127.0.0.1:8065;
+}
+
+location / {
+    client_max_body_size 50M;
+    proxy_set_header Connection "";
+    proxy_set_header Host $http_host;
+    proxy_set_header X-Real-IP $remote_addr;
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_set_header X-Forwarded-Proto $scheme;
+    proxy_set_header X-Frame-Options SAMEORIGIN;
+    proxy_buffers 256 16k;
+    proxy_buffer_size 16k;
+    proxy_read_timeout 600s;
+    # Disable the proxy cache, because the proxy_cache_path directive
+    # cannot be embeded in a `server` block.
+    #proxy_cache mattermost_cache;
+    #proxy_cache_revalidate on;
+    #proxy_cache_min_uses 2;
+    #proxy_cache_use_stale timeout;
+    #proxy_cache_lock on;
+    proxy_pass http://127.0.0.1:8065;
 }