diff --git a/dockerfiles/Dockerfile.lint b/dockerfiles/Dockerfile.lint
index 71ea437914..240af474c5 100644
--- a/dockerfiles/Dockerfile.lint
+++ b/dockerfiles/Dockerfile.lint
@@ -2,7 +2,7 @@ FROM    golang:1.8.3-alpine
 
 RUN     apk add -U git
 
-RUN     go get -u gopkg.in/alecthomas/gometalinter.v1 && \
+RUN     go get -u gopkg.in/dnephin/gometalinter.v1 && \
         mv /go/bin/gometalinter.v1 /usr/local/bin/gometalinter && \
         gometalinter --install
 
diff --git a/gometalinter.json b/gometalinter.json
index 4791bb01fa..b5956dca60 100644
--- a/gometalinter.json
+++ b/gometalinter.json
@@ -1,6 +1,6 @@
 {
   "Vendor": true,
-  "Deadline": "8m",
+  "Deadline": "2m",
   "Sort": ["linter", "severity", "path"],
   "Exclude": ["cli/compose/schema/bindata.go"],