diff --git a/Dockerfile.dapper b/Dockerfile.dapper
index a0bb48c6..6ac3ca39 100644
--- a/Dockerfile.dapper
+++ b/Dockerfile.dapper
@@ -94,7 +94,7 @@ ENV BUILD_DOCKER_URL=BUILD_DOCKER_URL_${ARCH} \
     DOCKER_VERSION=${DOCKER_VERSION} \
     DOWNLOADS=/usr/src/downloads \
     GOPATH=/go \
-    GO_VERSION=1.6.2 \
+    GO_VERSION=1.7.1 \
     GOARCH=$ARCH \
     HOSTNAME_DEFAULT=${HOSTNAME_DEFAULT} \
     IMAGE_NAME=${IMAGE_NAME} \
diff --git a/assets/go-dnsclient.patch b/assets/go-dnsclient.patch
index 9df6543e..4c50706f 100644
--- a/assets/go-dnsclient.patch
+++ b/assets/go-dnsclient.patch
@@ -1,24 +1,18 @@
-265,270d264
-< 	// Ensure only one update at a time checks resolv.conf.
-< 	if !conf.tryAcquireSema() {
-< 		return
-< 	}
-< 	defer conf.releaseSema()
-< 
-276a271,280
+296a297,300
 > 	conf.update(name)
 > }
 > 
 > func (conf *resolverConfig) update(name string) {
-> 	// Ensure only one update at a time checks resolv.conf.
-> 	if !conf.tryAcquireSema() {
-> 		return
-> 	}
-> 	defer conf.releaseSema()
-> 
-293a298,302
+300a305,316
 > }
 > 
 > func UpdateDnsConf() {
 > 	resolvConf.initOnce.Do(resolvConf.init)
+> 
+> 	// Ensure only one update at a time checks resolv.conf.
+> 	if !resolvConf.tryAcquireSema() {
+> 		return
+> 	}
+> 	defer resolvConf.releaseSema()
+> 
 > 	resolvConf.update("/etc/resolv.conf")