diff --git a/controllers/nginx/Changelog.md b/controllers/nginx/Changelog.md
index ef6b543e6..3ff03be21 100644
--- a/controllers/nginx/Changelog.md
+++ b/controllers/nginx/Changelog.md
@@ -1,5 +1,8 @@
 Changelog
 
+### 0.8.1
+- [X] [#1317](https://github.com/kubernetes/contrib/pull/1317) Fix duplicated real_ip_header
+- [X] [#1315](https://github.com/kubernetes/contrib/pull/1315) Addresses #1314
 
 ### 0.8
 
diff --git a/controllers/nginx/Makefile b/controllers/nginx/Makefile
index ec707803d..c92724b17 100644
--- a/controllers/nginx/Makefile
+++ b/controllers/nginx/Makefile
@@ -1,11 +1,10 @@
 all: push
 
 # 0.0 shouldn't clobber any release builds
-TAG = 0.8
+TAG = 0.8.1
 PREFIX = gcr.io/google_containers/nginx-ingress-controller
 
 REPO_INFO=$(shell git config --get remote.origin.url)
-UPX:=$(shell command -v upx 2> /dev/null)
 
 ifndef VERSION
   VERSION := git-$(shell git rev-parse --short HEAD)
@@ -15,10 +14,6 @@ controller: controller.go clean
 	CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -ldflags \
 		"-s -w -X main.version=${VERSION} -X main.gitRepo=${REPO_INFO}" \
 		-o nginx-ingress-controller
-ifdef UPX
-	# compressing the binary reduces the size at leat a 75%
-	upx nginx-ingress-controller
-endif
 
 container: controller
 	docker build -t $(PREFIX):$(TAG) .
diff --git a/controllers/nginx/examples/custom-configuration/rc-custom-configuration.yaml b/controllers/nginx/examples/custom-configuration/rc-custom-configuration.yaml
index 77884ab2f..fc90b0ea4 100644
--- a/controllers/nginx/examples/custom-configuration/rc-custom-configuration.yaml
+++ b/controllers/nginx/examples/custom-configuration/rc-custom-configuration.yaml
@@ -16,7 +16,7 @@ spec:
     spec:
       terminationGracePeriodSeconds: 60      
       containers:
-      - image: gcr.io/google_containers/nginx-ingress-controller:0.8
+      - image: gcr.io/google_containers/nginx-ingress-controller:0.8.1
         name: nginx-ingress-lb
         imagePullPolicy: Always
         livenessProbe:
diff --git a/controllers/nginx/examples/custom-errors/rc-custom-errors.yaml b/controllers/nginx/examples/custom-errors/rc-custom-errors.yaml
index d72fe3f17..aa60bc613 100644
--- a/controllers/nginx/examples/custom-errors/rc-custom-errors.yaml
+++ b/controllers/nginx/examples/custom-errors/rc-custom-errors.yaml
@@ -16,7 +16,7 @@ spec:
     spec:
       terminationGracePeriodSeconds: 60      
       containers:
-      - image: gcr.io/google_containers/nginx-ingress-controller:0.8
+      - image: gcr.io/google_containers/nginx-ingress-controller:0.8.1
         name: nginx-ingress-lb
         imagePullPolicy: Always
         livenessProbe:
diff --git a/controllers/nginx/examples/custom-template/custom-template.yaml b/controllers/nginx/examples/custom-template/custom-template.yaml
index 306a7976d..ef2850fe4 100644
--- a/controllers/nginx/examples/custom-template/custom-template.yaml
+++ b/controllers/nginx/examples/custom-template/custom-template.yaml
@@ -16,7 +16,7 @@ spec:
     spec:
       terminationGracePeriodSeconds: 60      
       containers:
-      - image: gcr.io/google_containers/nginx-ingress-controller:0.8
+      - image: gcr.io/google_containers/nginx-ingress-controller:0.8.1
         name: nginx-ingress-lb
         imagePullPolicy: Always
         livenessProbe:
diff --git a/controllers/nginx/examples/daemonset/as-daemonset.yaml b/controllers/nginx/examples/daemonset/as-daemonset.yaml
index 53d4b7b4c..6f5a8e9aa 100644
--- a/controllers/nginx/examples/daemonset/as-daemonset.yaml
+++ b/controllers/nginx/examples/daemonset/as-daemonset.yaml
@@ -10,7 +10,7 @@ spec:
     spec:
       terminationGracePeriodSeconds: 60      
       containers:
-      - image: gcr.io/google_containers/nginx-ingress-controller:0.8
+      - image: gcr.io/google_containers/nginx-ingress-controller:0.8.1
         name: nginx-ingress-lb
         imagePullPolicy: Always
         livenessProbe:
diff --git a/controllers/nginx/examples/default/rc-default.yaml b/controllers/nginx/examples/default/rc-default.yaml
index c52071da7..fbbb0db63 100644
--- a/controllers/nginx/examples/default/rc-default.yaml
+++ b/controllers/nginx/examples/default/rc-default.yaml
@@ -16,7 +16,7 @@ spec:
     spec:
       terminationGracePeriodSeconds: 60      
       containers:
-      - image: gcr.io/google_containers/nginx-ingress-controller:0.8
+      - image: gcr.io/google_containers/nginx-ingress-controller:0.8.1
         name: nginx-ingress-lb
         imagePullPolicy: Always
         livenessProbe:
diff --git a/controllers/nginx/examples/full/rc-full.yaml b/controllers/nginx/examples/full/rc-full.yaml
index ef23850b7..130b62475 100644
--- a/controllers/nginx/examples/full/rc-full.yaml
+++ b/controllers/nginx/examples/full/rc-full.yaml
@@ -21,7 +21,7 @@ spec:
         secret:
           secretName: dhparam-example
       containers:
-      - image: gcr.io/google_containers/nginx-ingress-controller:0.8
+      - image: gcr.io/google_containers/nginx-ingress-controller:0.8.1
         name: nginx-ingress-lb
         imagePullPolicy: Always
         livenessProbe:
diff --git a/controllers/nginx/examples/proxy-protocol/nginx-rc.yaml b/controllers/nginx/examples/proxy-protocol/nginx-rc.yaml
index 3c9bd91df..b379fd70f 100644
--- a/controllers/nginx/examples/proxy-protocol/nginx-rc.yaml
+++ b/controllers/nginx/examples/proxy-protocol/nginx-rc.yaml
@@ -16,7 +16,7 @@ spec:
     spec:
       terminationGracePeriodSeconds: 60
       containers:
-      - image: gcr.io/google_containers/nginx-ingress-controller:0.8
+      - image: gcr.io/google_containers/nginx-ingress-controller:0.8.1
         name: nginx-ingress-lb
         imagePullPolicy: Always
         livenessProbe:
diff --git a/controllers/nginx/examples/tcp/rc-tcp.yaml b/controllers/nginx/examples/tcp/rc-tcp.yaml
index 1f9ed1be9..9aa12a201 100644
--- a/controllers/nginx/examples/tcp/rc-tcp.yaml
+++ b/controllers/nginx/examples/tcp/rc-tcp.yaml
@@ -16,7 +16,7 @@ spec:
     spec:
       terminationGracePeriodSeconds: 60      
       containers:
-      - image: gcr.io/google_containers/nginx-ingress-controller:0.8
+      - image: gcr.io/google_containers/nginx-ingress-controller:0.8.1
         name: nginx-ingress-lb
         imagePullPolicy: Always
         livenessProbe:
diff --git a/controllers/nginx/examples/tls/rc-ssl.yaml b/controllers/nginx/examples/tls/rc-ssl.yaml
index c52071da7..fbbb0db63 100644
--- a/controllers/nginx/examples/tls/rc-ssl.yaml
+++ b/controllers/nginx/examples/tls/rc-ssl.yaml
@@ -16,7 +16,7 @@ spec:
     spec:
       terminationGracePeriodSeconds: 60      
       containers:
-      - image: gcr.io/google_containers/nginx-ingress-controller:0.8
+      - image: gcr.io/google_containers/nginx-ingress-controller:0.8.1
         name: nginx-ingress-lb
         imagePullPolicy: Always
         livenessProbe:
diff --git a/controllers/nginx/examples/udp/rc-udp.yaml b/controllers/nginx/examples/udp/rc-udp.yaml
index 7e68825d8..5ddf60ed9 100644
--- a/controllers/nginx/examples/udp/rc-udp.yaml
+++ b/controllers/nginx/examples/udp/rc-udp.yaml
@@ -16,7 +16,7 @@ spec:
     spec:
       terminationGracePeriodSeconds: 60      
       containers:
-      - image: gcr.io/google_containers/nginx-ingress-controller:0.8
+      - image: gcr.io/google_containers/nginx-ingress-controller:0.8.1
         name: nginx-ingress-lb
         imagePullPolicy: Always
         livenessProbe:
diff --git a/controllers/nginx/rc.yaml b/controllers/nginx/rc.yaml
index 88d56e78b..b20b528f0 100644
--- a/controllers/nginx/rc.yaml
+++ b/controllers/nginx/rc.yaml
@@ -68,7 +68,7 @@ spec:
     spec:
       terminationGracePeriodSeconds: 60
       containers:
-      - image: gcr.io/google_containers/nginx-ingress-controller:0.8
+      - image: gcr.io/google_containers/nginx-ingress-controller:0.8.1
         name: nginx-ingress-lb
         imagePullPolicy: Always
         livenessProbe: