diff --git a/Dockerfile b/Dockerfile
index 65091792..95e28144 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -42,7 +42,7 @@ RUN set -x \
 
 ENV GOPATH /usr/share/gocode:/go
 ENV PATH $GOPATH/bin:/usr/share/gocode/bin:$PATH
-RUN go get github.com/golang/lint/golint
+RUN go get golang.org/x/lint/golint
 WORKDIR /go/src/github.com/containers/skopeo
 COPY . /go/src/github.com/containers/skopeo
 
diff --git a/hack/travis_osx.sh b/hack/travis_osx.sh
index b3bb6596..2c28e47f 100755
--- a/hack/travis_osx.sh
+++ b/hack/travis_osx.sh
@@ -8,7 +8,7 @@ _containers="${GOPATH}/src/github.com/containers"
 mkdir -vp ${_containers}
 ln -vsf $(pwd) ${_containers}/skopeo
 
-go get -u github.com/cpuguy83/go-md2man github.com/golang/lint/golint
+go get -u github.com/cpuguy83/go-md2man golang.org/x/lint/golint
 
 cd ${_containers}/skopeo
 make validate-local test-unit-local binary-local