diff --git a/nginx/defaults/main.yml b/nginx/defaults/main.yml
index f2d6be75..4a89cd6b 100644
--- a/nginx/defaults/main.yml
+++ b/nginx/defaults/main.yml
@@ -35,6 +35,7 @@ nginx_ldap_base_dn: "dc=example,dc=org"
 # nginx_ldap_login_attribute: uid
 # nginx_ldap_pam_groupdn:
 nginx_letsencrypt_managed: True
+nginx_websockets_support: False
 
 # Virtualhost example
 # nginx_virthosts:
diff --git a/nginx/tasks/nginx.yml b/nginx/tasks/nginx.yml
index acabcfdb..ffb30e14 100644
--- a/nginx/tasks/nginx.yml
+++ b/nginx/tasks/nginx.yml
@@ -31,3 +31,9 @@
   notify: Reload nginx
   tags: [ 'nginx', 'nginx_conf' ]
 
+- name: Install websockets configuration if enabled
+  template: src=nginx-websockets.conf.j2 dest=/etc/nginx/conf.d/websockets.conf owner=root group=root mode=0444
+  when: nginx_websockets_support
+  notify: Reload nginx
+  tags: [ 'nginx', 'nginx_conf' ]
+
diff --git a/nginx/templates/nginx-websockets.conf.j2 b/nginx/templates/nginx-websockets.conf.j2
new file mode 100644
index 00000000..32af4c3c
--- /dev/null
+++ b/nginx/templates/nginx-websockets.conf.j2
@@ -0,0 +1,4 @@
+map $http_upgrade $connection_upgrade {
+    default upgrade;
+    ''      close;
+}