diff --git a/controllers/nginx/Changelog.md b/controllers/nginx/Changelog.md
index 57971a17b8..c7e681494a 100644
--- a/controllers/nginx/Changelog.md
+++ b/controllers/nginx/Changelog.md
@@ -1,5 +1,18 @@
 Changelog
 
+### 0.9-beta.5
+
+**Image:**  `gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.5`
+
+*Changes:*
+
+- [X] [#663](https://github.com/kubernetes/ingress/pull/663) Remove helper required in go < 1.8
+- [X] [#662](https://github.com/kubernetes/ingress/pull/662) Add debug information about ingress class
+- [X] [#661](https://github.com/kubernetes/ingress/pull/661) Avoid running nginx if the configuration file is empty  
+- [X] [#660](https://github.com/kubernetes/ingress/pull/660) Rollback queue refactoring  
+- [X] [#654](https://github.com/kubernetes/ingress/pull/654) Update go version to 1.8
+
+
 ### 0.9-beta.4
 
 **Image:**  `gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.4`
diff --git a/controllers/nginx/Makefile b/controllers/nginx/Makefile
index 367e478638..eb88171b17 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.4
+RELEASE?=0.9.0-beta.5
 PREFIX?=gcr.io/google_containers/nginx-ingress-controller
 GOOS?=linux
 DOCKER?=gcloud docker --
diff --git a/docs/troubleshooting.md b/docs/troubleshooting.md
index 2926c4d8f2..f92a5d2037 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.4
+      - image: gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.5
         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 55d020eeb2..95c9128955 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.4
+      - image: gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.5
         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 a794ab3c60..3e196fab46 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.4
+      - image: gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.5
         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 ad61652352..4f84d091f1 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.4
+      - image: gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.5
         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 8b6fb0bf50..794ebf391f 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.4
+      - image: gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.5
         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 a794ab3c60..3e196fab46 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.4
+      - image: gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.5
         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 a95172285a..a1a55a2107 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.4
+      - image: gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.5
         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 8132b3bb87..6daa26819b 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.4
+      - image: gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.5
         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 a794ab3c60..3e196fab46 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.4
+      - image: gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.5
         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 c0f67a4254..322ae3e1f5 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.4
+      - image: gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.5
         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 6369b95c7d..299d39b372 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.4
+      - image: gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.5
         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 294f9afd87..9c158efab6 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.4
+      - image: gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.5
         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 7f7f16f46f..eb38b36b3f 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.4
+      - image: gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.5
         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 ecbd06bd23..6641415d33 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.4
+      - image: gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.5
         name: nginx-ingress-controller
         readinessProbe:
           httpGet:
diff --git a/examples/tcp/nginx/README.md b/examples/tcp/nginx/README.md
index 1751f82d05..974b268b08 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.4
+Image(s):       gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.5
 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 97e39ad71e..71e1e8a932 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.4
+      - image: gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.5
         name: nginx-tcp-ingress-lb
         readinessProbe:
           httpGet: