diff --git a/tools/socks/Dockerfile b/tools/socks/Dockerfile
index ffafeb03b..867cd6bc5 100644
--- a/tools/socks/Dockerfile
+++ b/tools/socks/Dockerfile
@@ -1,5 +1,5 @@
 FROM gliderlabs/alpine
-LABEL maintainer="Weaveworks Inc <help@weave.works>"
+MAINTAINER Weaveworks Inc <help@weave.works>
 WORKDIR /
 COPY proxy /
 EXPOSE 8000
diff --git a/tools/socks/main.go b/tools/socks/main.go
index c29a48349..7cd8c7086 100644
--- a/tools/socks/main.go
+++ b/tools/socks/main.go
@@ -8,10 +8,10 @@ import (
 	"strings"
 	"text/template"
 
-	"context"
 	socks5 "github.com/armon/go-socks5"
 	"github.com/weaveworks/common/mflag"
 	"github.com/weaveworks/common/mflagext"
+	"golang.org/x/net/context"
 )
 
 type pacFileParameters struct {