diff --git a/addons/ingress-nginx/README.md b/addons/ingress-nginx/README.md
index 3b1f37a2f0..42816bcd0b 100644
--- a/addons/ingress-nginx/README.md
+++ b/addons/ingress-nginx/README.md
@@ -1,4 +1,14 @@
 
+## Deployment
+### AWS
+```
+kubectl apply -f https://raw.githubusercontent.com/kubernetes/kops/master/addons/ingress-nginx/v1.6.0.yaml
+```
+
+### GCE
+```
+kubectl apply -f https://raw.githubusercontent.com/kubernetes/kops/master/addons/ingress-nginx/v1.6.0-gce.yaml
+```
 
 ## Creating a simple ingress
 
diff --git a/addons/ingress-nginx/v1.6.0-gce.yaml b/addons/ingress-nginx/v1.6.0-gce.yaml
index 21dd39b4f6..5fc6de1b63 100644
--- a/addons/ingress-nginx/v1.6.0-gce.yaml
+++ b/addons/ingress-nginx/v1.6.0-gce.yaml
@@ -194,7 +194,7 @@ spec:
       terminationGracePeriodSeconds: 60
       containers:
       - name: default-http-backend
-        image: k8s.gcr.io/defaultbackend:1.3
+        image: k8s.gcr.io/defaultbackend:1.4
         livenessProbe:
           httpGet:
             path: /healthz
@@ -236,6 +236,8 @@ metadata:
   labels:
     k8s-addon: ingress-nginx.addons.k8s.io
 spec:
+  # Forces nodes without Service endpoints to remove themselves from the list of nodes eligible. See https://kubernetes.io/docs/tutorials/services/source-ip/#source-ip-for-services-with-type-loadbalancer
+  externalTrafficPolicy: Local
   type: LoadBalancer
   selector:
     app: ingress-nginx
@@ -272,7 +274,7 @@ spec:
       terminationGracePeriodSeconds: 60
       serviceAccountName: nginx-ingress-controller
       containers:
-      - image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.12.0
+      - image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.18.0
         name: nginx-ingress-controller
         imagePullPolicy: Always
         ports:
diff --git a/addons/ingress-nginx/v1.6.0.yaml b/addons/ingress-nginx/v1.6.0.yaml
index fa8d73f62a..47d7a0c403 100644
--- a/addons/ingress-nginx/v1.6.0.yaml
+++ b/addons/ingress-nginx/v1.6.0.yaml
@@ -194,7 +194,7 @@ spec:
       terminationGracePeriodSeconds: 60
       containers:
       - name: default-http-backend
-        image: k8s.gcr.io/defaultbackend:1.3
+        image: k8s.gcr.io/defaultbackend:1.4
         livenessProbe:
           httpGet:
             path: /healthz
@@ -236,7 +236,10 @@ metadata:
   labels:
     k8s-addon: ingress-nginx.addons.k8s.io
   annotations:
+    # Enable PROXY protocol
     service.beta.kubernetes.io/aws-load-balancer-proxy-protocol: '*'
+    # Increase the ELB idle timeout to avoid issues with WebSockets or Server-Sent Events.
+    service.beta.kubernetes.io/aws-load-balancer-connection-idle-timeout: '3600'
 spec:
   type: LoadBalancer
   selector:
@@ -274,7 +277,7 @@ spec:
       terminationGracePeriodSeconds: 60
       serviceAccountName: nginx-ingress-controller
       containers:
-      - image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.12.0
+      - image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.18.0
         name: nginx-ingress-controller
         imagePullPolicy: Always
         ports: