diff --git a/controllers/nginx/Changelog.md b/controllers/nginx/Changelog.md
index c7e681494..f5f74157c 100644
--- a/controllers/nginx/Changelog.md
+++ b/controllers/nginx/Changelog.md
@@ -1,8 +1,55 @@
 Changelog
 
+### 0.9-beta.6
+
+**Image:**  `gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.6`
+
+*Changes:*
+
+- [X] [#647](https://github.com/kubernetes/ingress/pull/647) ingress.class enhancement for debugging.
+- [X] [#708](https://github.com/kubernetes/ingress/pull/708) ingress losing real source IP when tls enabled
+- [X] [#760](https://github.com/kubernetes/ingress/pull/760) Change recorder event scheme
+- [X] [#704](https://github.com/kubernetes/ingress/pull/704) fix nginx reload flags '-c'
+- [X] [#757](https://github.com/kubernetes/ingress/pull/757) Replace use of endpoints as locks with configmap
+- [X] [#752](https://github.com/kubernetes/ingress/pull/752) nginx ingress header config backwards
+- [X] [#756](https://github.com/kubernetes/ingress/pull/756) Fix bad variable assignment in template nginx
+- [X] [#729](https://github.com/kubernetes/ingress/pull/729) Release nginx-slim 0.17
+- [X] [#755](https://github.com/kubernetes/ingress/pull/755) Fix server name hash maxSize default value
+- [X] [#741](https://github.com/kubernetes/ingress/pull/741) Update golang dependencies
+- [X] [#749](https://github.com/kubernetes/ingress/pull/749) Remove service annotation for namedPorts
+- [X] [#740](https://github.com/kubernetes/ingress/pull/740) Refactoring whitelist source IP verification
+- [X] [#734](https://github.com/kubernetes/ingress/pull/734) Specify nginx image arch
+- [X] [#728](https://github.com/kubernetes/ingress/pull/728) Update nginx image
+- [X] [#723](https://github.com/kubernetes/ingress/pull/723) update readme about vts metrics
+- [X] [#726](https://github.com/kubernetes/ingress/pull/726) Release ubuntu-slim 0.10
+- [X] [#727](https://github.com/kubernetes/ingress/pull/727) [nginx] whitelist-source-range doesn’t work on ssl port
+- [X] [#709](https://github.com/kubernetes/ingress/pull/709) Add config for X-Forwarded-For trust
+- [X] [#679](https://github.com/kubernetes/ingress/pull/679) add getenv
+- [X] [#680](https://github.com/kubernetes/ingress/pull/680) nginx/pkg/config: delete unuseful variable
+- [X] [#716](https://github.com/kubernetes/ingress/pull/716) Add secure-verify-ca-secret annotation
+- [X] [#722](https://github.com/kubernetes/ingress/pull/722) Remove go-reap and use tini as process reaper
+- [X] [#725](https://github.com/kubernetes/ingress/pull/725) Add keepalive_requests and client_body_buffer_size options
+- [X] [#724](https://github.com/kubernetes/ingress/pull/724) change the directory of default-backend.yaml
+- [X] [#656](https://github.com/kubernetes/ingress/pull/656) Nginx Ingress Controller - Specify load balancing method
+- [X] [#717](https://github.com/kubernetes/ingress/pull/717) delete unuseful variable
+- [X] [#712](https://github.com/kubernetes/ingress/pull/712) Set $proxy_upstream_name before location directive
+- [X] [#715](https://github.com/kubernetes/ingress/pull/715) Corrected annotation ex `signin-url` to `auth-url`
+- [X] [#718](https://github.com/kubernetes/ingress/pull/718) nodeController sync
+- [X] [#694](https://github.com/kubernetes/ingress/pull/694) SSL-Passthrough broken in beta.5
+- [X] [#678](https://github.com/kubernetes/ingress/pull/678) Convert CN SSL Certificate to lowercase before comparison
+- [X] [#690](https://github.com/kubernetes/ingress/pull/690) Fix IP in logs for https traffic
+- [X] [#673](https://github.com/kubernetes/ingress/pull/673) Override load balancer alg view config map
+- [X] [#675](https://github.com/kubernetes/ingress/pull/675) Use proxy-protocol to pass through source IP to nginx
+- [X] [#707](https://github.com/kubernetes/ingress/pull/707) use nginx vts module version 0.1.14
+- [X] [#702](https://github.com/kubernetes/ingress/pull/702) Document passing of ssl_client_cert to backend
+- [X] [#688](https://github.com/kubernetes/ingress/pull/688) Add example of UDP loadbalancing
+- [X] [#696](https://github.com/kubernetes/ingress/pull/696) [nginx] pass non-SNI TLS hello to default backend, Fixes #693
+- [X] [#685](https://github.com/kubernetes/ingress/pull/685) Fix error in generated nginx.conf for optional hsts-preload
+
+
 ### 0.9-beta.5
 
-**Image:**  `gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.5`
+**Image:**  `gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.6`
 
 *Changes:*
 
diff --git a/controllers/nginx/Makefile b/controllers/nginx/Makefile
index eb88171b1..121eead49 100644
--- a/controllers/nginx/Makefile
+++ b/controllers/nginx/Makefile
@@ -3,7 +3,7 @@ all: push
 BUILDTAGS=
 
 # Use the 0.0 tag for testing, it shouldn't clobber any release builds
-RELEASE?=0.9.0-beta.5
+RELEASE?=0.9.0-beta.6
 PREFIX?=gcr.io/google_containers/nginx-ingress-controller
 GOOS?=linux
 DOCKER?=gcloud docker --
diff --git a/docs/troubleshooting.md b/docs/troubleshooting.md
index f92a5d203..ec13ac0a7 100644
--- a/docs/troubleshooting.md
+++ b/docs/troubleshooting.md
@@ -259,7 +259,7 @@ spec:
     spec:
       terminationGracePeriodSeconds: 60
       containers:
-      - image: gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.5
+      - image: gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.6
         name: ingress-nginx
         imagePullPolicy: Always
         ports:
diff --git a/examples/aws/nginx/nginx-ingress-controller.yaml b/examples/aws/nginx/nginx-ingress-controller.yaml
index 95c912895..b7c495368 100644
--- a/examples/aws/nginx/nginx-ingress-controller.yaml
+++ b/examples/aws/nginx/nginx-ingress-controller.yaml
@@ -101,7 +101,7 @@ spec:
     spec:
       terminationGracePeriodSeconds: 60
       containers:
-      - image: gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.5
+      - image: gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.6
         name: ingress-nginx
         imagePullPolicy: Always
         ports:
diff --git a/examples/customization/configuration-snippets/nginx/nginx-ingress-controller.yaml b/examples/customization/configuration-snippets/nginx/nginx-ingress-controller.yaml
index 3e196fab4..033f9c8cf 100644
--- a/examples/customization/configuration-snippets/nginx/nginx-ingress-controller.yaml
+++ b/examples/customization/configuration-snippets/nginx/nginx-ingress-controller.yaml
@@ -19,7 +19,7 @@ spec:
       # hostNetwork: true
       terminationGracePeriodSeconds: 60
       containers:
-      - image: gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.5
+      - image: gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.6
         name: nginx-ingress-controller
         readinessProbe:
           httpGet:
diff --git a/examples/customization/custom-configuration/nginx/nginx-custom-configuration.yaml b/examples/customization/custom-configuration/nginx/nginx-custom-configuration.yaml
index 4f84d091f..4c0b47770 100644
--- a/examples/customization/custom-configuration/nginx/nginx-custom-configuration.yaml
+++ b/examples/customization/custom-configuration/nginx/nginx-custom-configuration.yaml
@@ -22,7 +22,7 @@ spec:
       # hostNetwork: true
       terminationGracePeriodSeconds: 60
       containers:
-      - image: gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.5
+      - image: gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.6
         name: nginx-ingress-controller
         readinessProbe:
           httpGet:
diff --git a/examples/customization/custom-errors/nginx/rc-custom-errors.yaml b/examples/customization/custom-errors/nginx/rc-custom-errors.yaml
index 794ebf391..5878a79e9 100644
--- a/examples/customization/custom-errors/nginx/rc-custom-errors.yaml
+++ b/examples/customization/custom-errors/nginx/rc-custom-errors.yaml
@@ -16,7 +16,7 @@ spec:
     spec:
       terminationGracePeriodSeconds: 60
       containers:
-      - image: gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.5
+      - image: gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.6
         name: nginx-ingress-lb
         imagePullPolicy: Always
         readinessProbe:
diff --git a/examples/customization/custom-headers/nginx/nginx-ingress-controller.yaml b/examples/customization/custom-headers/nginx/nginx-ingress-controller.yaml
index 3e196fab4..033f9c8cf 100644
--- a/examples/customization/custom-headers/nginx/nginx-ingress-controller.yaml
+++ b/examples/customization/custom-headers/nginx/nginx-ingress-controller.yaml
@@ -19,7 +19,7 @@ spec:
       # hostNetwork: true
       terminationGracePeriodSeconds: 60
       containers:
-      - image: gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.5
+      - image: gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.6
         name: nginx-ingress-controller
         readinessProbe:
           httpGet:
diff --git a/examples/customization/custom-template/custom-template.yaml b/examples/customization/custom-template/custom-template.yaml
index a1a55a210..e6f319fce 100644
--- a/examples/customization/custom-template/custom-template.yaml
+++ b/examples/customization/custom-template/custom-template.yaml
@@ -16,7 +16,7 @@ spec:
     spec:
       terminationGracePeriodSeconds: 60
       containers:
-      - image: gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.5
+      - image: gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.6
         name: nginx-ingress-lb
         imagePullPolicy: Always
         readinessProbe:
diff --git a/examples/customization/custom-vts-metrics/nginx/nginx-ingress-controller.yaml b/examples/customization/custom-vts-metrics/nginx/nginx-ingress-controller.yaml
index 6daa26819..319a45d4d 100644
--- a/examples/customization/custom-vts-metrics/nginx/nginx-ingress-controller.yaml
+++ b/examples/customization/custom-vts-metrics/nginx/nginx-ingress-controller.yaml
@@ -22,7 +22,7 @@ spec:
       # hostNetwork: true
       terminationGracePeriodSeconds: 60
       containers:
-      - image: gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.5
+      - image: gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.6
         name: nginx-ingress-controller
         readinessProbe:
           httpGet:
diff --git a/examples/customization/ssl-dh-param/nginx/nginx-ingress-controller.yaml b/examples/customization/ssl-dh-param/nginx/nginx-ingress-controller.yaml
index 3e196fab4..033f9c8cf 100644
--- a/examples/customization/ssl-dh-param/nginx/nginx-ingress-controller.yaml
+++ b/examples/customization/ssl-dh-param/nginx/nginx-ingress-controller.yaml
@@ -19,7 +19,7 @@ spec:
       # hostNetwork: true
       terminationGracePeriodSeconds: 60
       containers:
-      - image: gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.5
+      - image: gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.6
         name: nginx-ingress-controller
         readinessProbe:
           httpGet:
diff --git a/examples/daemonset/nginx/nginx-ingress-daemonset.yaml b/examples/daemonset/nginx/nginx-ingress-daemonset.yaml
index 322ae3e1f..1854ca894 100644
--- a/examples/daemonset/nginx/nginx-ingress-daemonset.yaml
+++ b/examples/daemonset/nginx/nginx-ingress-daemonset.yaml
@@ -16,7 +16,7 @@ spec:
     spec:
       terminationGracePeriodSeconds: 60
       containers:
-      - image: gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.5
+      - image: gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.6
         name: nginx-ingress-lb
         readinessProbe:
           httpGet:
diff --git a/examples/deployment/nginx/kubeadm/nginx-ingress-controller.yaml b/examples/deployment/nginx/kubeadm/nginx-ingress-controller.yaml
index 299d39b37..17b1b257a 100644
--- a/examples/deployment/nginx/kubeadm/nginx-ingress-controller.yaml
+++ b/examples/deployment/nginx/kubeadm/nginx-ingress-controller.yaml
@@ -71,7 +71,7 @@ spec:
       hostNetwork: true
       terminationGracePeriodSeconds: 60
       containers:
-      - image: gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.5
+      - image: gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.6
         name: nginx-ingress-controller
         readinessProbe:
           httpGet:
diff --git a/examples/deployment/nginx/nginx-ingress-controller.yaml b/examples/deployment/nginx/nginx-ingress-controller.yaml
index 9c158efab..debdc3937 100644
--- a/examples/deployment/nginx/nginx-ingress-controller.yaml
+++ b/examples/deployment/nginx/nginx-ingress-controller.yaml
@@ -22,7 +22,7 @@ spec:
       # hostNetwork: true
       terminationGracePeriodSeconds: 60
       containers:
-      - image: gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.5
+      - image: gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.6
         name: nginx-ingress-controller
         readinessProbe:
           httpGet:
diff --git a/examples/scaling-deployment/nginx/nginx-ingress-deployment.yaml b/examples/scaling-deployment/nginx/nginx-ingress-deployment.yaml
index eb38b36b3..5c94a6974 100644
--- a/examples/scaling-deployment/nginx/nginx-ingress-deployment.yaml
+++ b/examples/scaling-deployment/nginx/nginx-ingress-deployment.yaml
@@ -14,7 +14,7 @@ spec:
     spec:
       terminationGracePeriodSeconds: 60
       containers:
-      - image: gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.5
+      - image: gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.6
         name: nginx-ingress-controller
         readinessProbe:
           httpGet:
diff --git a/examples/static-ip/nginx/nginx-ingress-controller.yaml b/examples/static-ip/nginx/nginx-ingress-controller.yaml
index 6641415d3..e96f98052 100644
--- a/examples/static-ip/nginx/nginx-ingress-controller.yaml
+++ b/examples/static-ip/nginx/nginx-ingress-controller.yaml
@@ -18,7 +18,7 @@ spec:
       # hostNetwork: true
       terminationGracePeriodSeconds: 60
       containers:
-      - image: gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.5
+      - image: gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.6
         name: nginx-ingress-controller
         readinessProbe:
           httpGet:
diff --git a/examples/tcp/nginx/README.md b/examples/tcp/nginx/README.md
index 974b268b0..0a7335b36 100644
--- a/examples/tcp/nginx/README.md
+++ b/examples/tcp/nginx/README.md
@@ -47,7 +47,7 @@ nginx-ingress-controller   1         1         1         3m
 $ kubectl -n kube-system describe rc nginx-ingress-controller
 Name:           nginx-ingress-controller
 Namespace:      kube-system
-Image(s):       gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.5
+Image(s):       gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.6
 Selector:       k8s-app=nginx-tcp-ingress-lb
 Labels:         k8s-app=nginx-ingress-lb
 Annotations:    <none>
diff --git a/examples/tcp/nginx/nginx-tcp-ingress-controller.yaml b/examples/tcp/nginx/nginx-tcp-ingress-controller.yaml
index 71e1e8a93..5394a3d86 100644
--- a/examples/tcp/nginx/nginx-tcp-ingress-controller.yaml
+++ b/examples/tcp/nginx/nginx-tcp-ingress-controller.yaml
@@ -17,7 +17,7 @@ spec:
     spec:
       terminationGracePeriodSeconds: 60
       containers:
-      - image: gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.5
+      - image: gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.6
         name: nginx-tcp-ingress-lb
         readinessProbe:
           httpGet:
diff --git a/examples/udp/nginx/README.md b/examples/udp/nginx/README.md
index bc14f72fe..79daeeb8f 100644
--- a/examples/udp/nginx/README.md
+++ b/examples/udp/nginx/README.md
@@ -53,7 +53,7 @@ nginx-udp-ingress-controller   1         1         1         13m
 $ kubectl -n kube-system describe rc nginx-udp-ingress-controller
 Name:           nginx-udp-ingress-controller
 Namespace:      kube-system
-Image(s):       gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.5
+Image(s):       gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.6
 Selector:       k8s-app=nginx-udp-ingress-lb
 Labels:         k8s-app=nginx-udp-ingress-lb
 Annotations:    <none>
diff --git a/examples/udp/nginx/nginx-udp-ingress-controller.yaml b/examples/udp/nginx/nginx-udp-ingress-controller.yaml
index 77d6f1eb2..cd9146562 100644
--- a/examples/udp/nginx/nginx-udp-ingress-controller.yaml
+++ b/examples/udp/nginx/nginx-udp-ingress-controller.yaml
@@ -17,7 +17,7 @@ spec:
     spec:
       terminationGracePeriodSeconds: 60
       containers:
-      - image: gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.5
+      - image: gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.6
         name: nginx-udp-ingress-lb
         readinessProbe:
           httpGet: