diff --git a/nginx/proxy_nossl.conf b/nginx/proxy_nossl.conf
index 1d2c019..c03f71d 100644
--- a/nginx/proxy_nossl.conf
+++ b/nginx/proxy_nossl.conf
@@ -15,5 +15,9 @@ server {
     proxy_read_timeout  90;
     #auth_basic              "Restricted";
     #auth_basic_user_file    /etc/secrets/htpasswd; 
+    # WebSocket support (nginx 1.4)
+    proxy_http_version 1.1;
+    proxy_set_header Upgrade $http_upgrade;
+    proxy_set_header Connection "upgrade";
   }
 }
diff --git a/nginx/proxy_ssl.conf b/nginx/proxy_ssl.conf
index 65c7c66..de29fa0 100644
--- a/nginx/proxy_ssl.conf
+++ b/nginx/proxy_ssl.conf
@@ -45,6 +45,10 @@ server {
       proxy_redirect          http:// https://;
       #auth_basic              "Restricted";
       #auth_basic_user_file    /etc/secrets/htpasswd; 
+      # WebSocket support (nginx 1.4)
+      proxy_http_version 1.1;
+      proxy_set_header Upgrade $http_upgrade;
+      proxy_set_header Connection "upgrade";
   }
 }