diff --git a/Dockerfile b/Dockerfile
index 8ab4e7f8..25f31529 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,10 @@
 FROM golang
 
-COPY . /go/src/github.com/docker/docker-registry
+COPY . /go/src/github.com/docker/distribution
 
 # Fetch any dependencies to run the registry
-RUN go get github.com/docker/docker-registry/...
-RUN go install github.com/docker/docker-registry/cmd/registry
+RUN go get github.com/docker/distribution/...
+RUN go install github.com/docker/distribution/cmd/registry
 
 ENV CONFIG_PATH /etc/docker/registry/config.yml
 COPY ./cmd/registry/config.yml $CONFIG_PATH
diff --git a/api/v2/descriptors.go b/api/v2/descriptors.go
index b7057520..dfbbc6f9 100644
--- a/api/v2/descriptors.go
+++ b/api/v2/descriptors.go
@@ -4,8 +4,8 @@ import (
 	"net/http"
 	"regexp"
 
-	"github.com/docker/docker-registry/common"
-	"github.com/docker/docker-registry/digest"
+	"github.com/docker/distribution/common"
+	"github.com/docker/distribution/digest"
 )
 
 var (
diff --git a/api/v2/errors_test.go b/api/v2/errors_test.go
index 70f3c2a9..9cc831c4 100644
--- a/api/v2/errors_test.go
+++ b/api/v2/errors_test.go
@@ -5,7 +5,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/docker/docker-registry/digest"
+	"github.com/docker/distribution/digest"
 )
 
 // TestErrorCodes ensures that error code format, mappings and
diff --git a/api/v2/urls.go b/api/v2/urls.go
index 72f44299..47c7beab 100644
--- a/api/v2/urls.go
+++ b/api/v2/urls.go
@@ -4,7 +4,7 @@ import (
 	"net/http"
 	"net/url"
 
-	"github.com/docker/docker-registry/digest"
+	"github.com/docker/distribution/digest"
 	"github.com/gorilla/mux"
 )
 
diff --git a/api_test.go b/api_test.go
index 6cf56344..76c3b348 100644
--- a/api_test.go
+++ b/api_test.go
@@ -13,12 +13,12 @@ import (
 	"os"
 	"testing"
 
-	"github.com/docker/docker-registry/api/v2"
-	"github.com/docker/docker-registry/common/testutil"
-	"github.com/docker/docker-registry/configuration"
-	"github.com/docker/docker-registry/digest"
-	"github.com/docker/docker-registry/storage"
-	_ "github.com/docker/docker-registry/storagedriver/inmemory"
+	"github.com/docker/distribution/api/v2"
+	"github.com/docker/distribution/common/testutil"
+	"github.com/docker/distribution/configuration"
+	"github.com/docker/distribution/digest"
+	"github.com/docker/distribution/storage"
+	_ "github.com/docker/distribution/storagedriver/inmemory"
 	"github.com/docker/libtrust"
 	"github.com/gorilla/handlers"
 )
diff --git a/app.go b/app.go
index 5f1fe52d..d8276cec 100644
--- a/app.go
+++ b/app.go
@@ -4,12 +4,12 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/docker/docker-registry/api/v2"
-	"github.com/docker/docker-registry/auth"
-	"github.com/docker/docker-registry/configuration"
-	"github.com/docker/docker-registry/storage"
-	"github.com/docker/docker-registry/storagedriver"
-	"github.com/docker/docker-registry/storagedriver/factory"
+	"github.com/docker/distribution/api/v2"
+	"github.com/docker/distribution/auth"
+	"github.com/docker/distribution/configuration"
+	"github.com/docker/distribution/storage"
+	"github.com/docker/distribution/storagedriver"
+	"github.com/docker/distribution/storagedriver/factory"
 
 	log "github.com/Sirupsen/logrus"
 	"github.com/gorilla/mux"
diff --git a/app_test.go b/app_test.go
index b8edbd64..d3d6d979 100644
--- a/app_test.go
+++ b/app_test.go
@@ -7,9 +7,9 @@ import (
 	"net/url"
 	"testing"
 
-	"github.com/docker/docker-registry/api/v2"
-	_ "github.com/docker/docker-registry/auth/silly"
-	"github.com/docker/docker-registry/configuration"
+	"github.com/docker/distribution/api/v2"
+	_ "github.com/docker/distribution/auth/silly"
+	"github.com/docker/distribution/configuration"
 )
 
 // TestAppDispatcher builds an application with a test dispatcher and ensures
diff --git a/auth/silly/access.go b/auth/silly/access.go
index 4995d0dc..f65231ba 100644
--- a/auth/silly/access.go
+++ b/auth/silly/access.go
@@ -12,7 +12,7 @@ import (
 	"net/http"
 	"strings"
 
-	"github.com/docker/docker-registry/auth"
+	"github.com/docker/distribution/auth"
 )
 
 // accessController provides a simple implementation of auth.AccessController
diff --git a/auth/silly/access_test.go b/auth/silly/access_test.go
index a412c101..2469aa99 100644
--- a/auth/silly/access_test.go
+++ b/auth/silly/access_test.go
@@ -5,7 +5,7 @@ import (
 	"net/http/httptest"
 	"testing"
 
-	"github.com/docker/docker-registry/auth"
+	"github.com/docker/distribution/auth"
 )
 
 func TestSillyAccessController(t *testing.T) {
diff --git a/auth/token/accesscontroller.go b/auth/token/accesscontroller.go
index b9ee5771..ca92861e 100644
--- a/auth/token/accesscontroller.go
+++ b/auth/token/accesscontroller.go
@@ -13,8 +13,8 @@ import (
 
 	"github.com/docker/libtrust"
 
-	"github.com/docker/docker-registry/auth"
-	"github.com/docker/docker-registry/common"
+	"github.com/docker/distribution/auth"
+	"github.com/docker/distribution/common"
 )
 
 // accessSet maps a typed, named resource to
diff --git a/auth/token/token.go b/auth/token/token.go
index 8752afae..cdbf7107 100644
--- a/auth/token/token.go
+++ b/auth/token/token.go
@@ -13,8 +13,8 @@ import (
 	log "github.com/Sirupsen/logrus"
 	"github.com/docker/libtrust"
 
-	"github.com/docker/docker-registry/auth"
-	"github.com/docker/docker-registry/common"
+	"github.com/docker/distribution/auth"
+	"github.com/docker/distribution/common"
 )
 
 const (
diff --git a/auth/token/token_test.go b/auth/token/token_test.go
index 13d7cede..9c8ab6cb 100644
--- a/auth/token/token_test.go
+++ b/auth/token/token_test.go
@@ -17,8 +17,8 @@ import (
 
 	"github.com/docker/libtrust"
 
-	"github.com/docker/docker-registry/auth"
-	"github.com/docker/docker-registry/common"
+	"github.com/docker/distribution/auth"
+	"github.com/docker/distribution/common"
 )
 
 func makeRootKeys(numKeys int) ([]libtrust.PrivateKey, error) {
diff --git a/auth/token/util.go b/auth/token/util.go
index 7ec52cef..8aa46bac 100644
--- a/auth/token/util.go
+++ b/auth/token/util.go
@@ -5,7 +5,7 @@ import (
 	"errors"
 	"strings"
 
-	"github.com/docker/docker-registry/common"
+	"github.com/docker/distribution/common"
 )
 
 // joseBase64UrlEncode encodes the given data using the standard base64 url
diff --git a/client/client.go b/client/client.go
index 6616e54d..d13d6f21 100644
--- a/client/client.go
+++ b/client/client.go
@@ -10,9 +10,9 @@ import (
 	"regexp"
 	"strconv"
 
-	"github.com/docker/docker-registry/api/v2"
-	"github.com/docker/docker-registry/digest"
-	"github.com/docker/docker-registry/storage"
+	"github.com/docker/distribution/api/v2"
+	"github.com/docker/distribution/digest"
+	"github.com/docker/distribution/storage"
 )
 
 // Client implements the client interface to the registry http api
diff --git a/client/client_test.go b/client/client_test.go
index 0b4d023b..bc881831 100644
--- a/client/client_test.go
+++ b/client/client_test.go
@@ -9,9 +9,9 @@ import (
 	"sync"
 	"testing"
 
-	"github.com/docker/docker-registry/common/testutil"
-	"github.com/docker/docker-registry/digest"
-	"github.com/docker/docker-registry/storage"
+	"github.com/docker/distribution/common/testutil"
+	"github.com/docker/distribution/digest"
+	"github.com/docker/distribution/storage"
 )
 
 type testBlob struct {
diff --git a/client/errors.go b/client/errors.go
index 9bb2e40f..3e89e674 100644
--- a/client/errors.go
+++ b/client/errors.go
@@ -3,7 +3,7 @@ package client
 import (
 	"fmt"
 
-	"github.com/docker/docker-registry/digest"
+	"github.com/docker/distribution/digest"
 )
 
 // RepositoryNotFoundError is returned when making an operation against a
diff --git a/client/objectstore.go b/client/objectstore.go
index 55ab20a5..5df7f699 100644
--- a/client/objectstore.go
+++ b/client/objectstore.go
@@ -6,8 +6,8 @@ import (
 	"io"
 	"sync"
 
-	"github.com/docker/docker-registry/digest"
-	"github.com/docker/docker-registry/storage"
+	"github.com/docker/distribution/digest"
+	"github.com/docker/distribution/storage"
 )
 
 var (
diff --git a/client/pull.go b/client/pull.go
index 192a84bc..c7f3c25c 100644
--- a/client/pull.go
+++ b/client/pull.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/docker/docker-registry/storage"
+	"github.com/docker/distribution/storage"
 
 	log "github.com/Sirupsen/logrus"
 )
diff --git a/client/push.go b/client/push.go
index aac3fc40..7626cd16 100644
--- a/client/push.go
+++ b/client/push.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 
 	log "github.com/Sirupsen/logrus"
-	"github.com/docker/docker-registry/storage"
+	"github.com/docker/distribution/storage"
 )
 
 // simultaneousLayerPushWindow is the size of the parallel layer push window.
diff --git a/cmd/registry-api-descriptor-template/main.go b/cmd/registry-api-descriptor-template/main.go
index 07b955a2..5e2e71d7 100644
--- a/cmd/registry-api-descriptor-template/main.go
+++ b/cmd/registry-api-descriptor-template/main.go
@@ -20,7 +20,7 @@ import (
 	"regexp"
 	"text/template"
 
-	"github.com/docker/docker-registry/api/v2"
+	"github.com/docker/distribution/api/v2"
 )
 
 var spaceRegex = regexp.MustCompile(`\n\s*`)
diff --git a/cmd/registry-storagedriver-azure/main.go b/cmd/registry-storagedriver-azure/main.go
index 584699bf..17881b50 100644
--- a/cmd/registry-storagedriver-azure/main.go
+++ b/cmd/registry-storagedriver-azure/main.go
@@ -7,8 +7,8 @@ import (
 	"os"
 
 	log "github.com/Sirupsen/logrus"
-	"github.com/docker/docker-registry/storagedriver/azure"
-	"github.com/docker/docker-registry/storagedriver/ipc"
+	"github.com/docker/distribution/storagedriver/azure"
+	"github.com/docker/distribution/storagedriver/ipc"
 )
 
 // An out-of-process Azure Storage driver, intended to be run by ipc.NewDriverClient
diff --git a/cmd/registry-storagedriver-filesystem/main.go b/cmd/registry-storagedriver-filesystem/main.go
index 0e555b61..2ad6d82e 100644
--- a/cmd/registry-storagedriver-filesystem/main.go
+++ b/cmd/registry-storagedriver-filesystem/main.go
@@ -8,8 +8,8 @@ import (
 
 	"github.com/Sirupsen/logrus"
 
-	"github.com/docker/docker-registry/storagedriver/filesystem"
-	"github.com/docker/docker-registry/storagedriver/ipc"
+	"github.com/docker/distribution/storagedriver/filesystem"
+	"github.com/docker/distribution/storagedriver/ipc"
 )
 
 // An out-of-process filesystem driver, intended to be run by ipc.NewDriverClient
diff --git a/cmd/registry-storagedriver-inmemory/main.go b/cmd/registry-storagedriver-inmemory/main.go
index b75d3694..ef6fabe4 100644
--- a/cmd/registry-storagedriver-inmemory/main.go
+++ b/cmd/registry-storagedriver-inmemory/main.go
@@ -4,8 +4,8 @@ package main
 
 import (
 	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker-registry/storagedriver/inmemory"
-	"github.com/docker/docker-registry/storagedriver/ipc"
+	"github.com/docker/distribution/storagedriver/inmemory"
+	"github.com/docker/distribution/storagedriver/ipc"
 )
 
 // An out-of-process inmemory driver, intended to be run by ipc.NewDriverClient
diff --git a/cmd/registry-storagedriver-s3/main.go b/cmd/registry-storagedriver-s3/main.go
index e2234b7b..be49f157 100644
--- a/cmd/registry-storagedriver-s3/main.go
+++ b/cmd/registry-storagedriver-s3/main.go
@@ -8,8 +8,8 @@ import (
 
 	"github.com/Sirupsen/logrus"
 
-	"github.com/docker/docker-registry/storagedriver/ipc"
-	"github.com/docker/docker-registry/storagedriver/s3"
+	"github.com/docker/distribution/storagedriver/ipc"
+	"github.com/docker/distribution/storagedriver/s3"
 )
 
 // An out-of-process S3 driver, intended to be run by ipc.NewDriverClient
diff --git a/cmd/registry/main.go b/cmd/registry/main.go
index ea20a916..1bf635cc 100644
--- a/cmd/registry/main.go
+++ b/cmd/registry/main.go
@@ -12,12 +12,12 @@ import (
 	"github.com/gorilla/handlers"
 	"github.com/yvasiyarov/gorelic"
 
-	"github.com/docker/docker-registry"
-	_ "github.com/docker/docker-registry/auth/silly"
-	_ "github.com/docker/docker-registry/auth/token"
-	"github.com/docker/docker-registry/configuration"
-	_ "github.com/docker/docker-registry/storagedriver/filesystem"
-	_ "github.com/docker/docker-registry/storagedriver/inmemory"
+	"github.com/docker/distribution"
+	_ "github.com/docker/distribution/auth/silly"
+	_ "github.com/docker/distribution/auth/token"
+	"github.com/docker/distribution/configuration"
+	_ "github.com/docker/distribution/storagedriver/filesystem"
+	_ "github.com/docker/distribution/storagedriver/inmemory"
 )
 
 func main() {
diff --git a/context.go b/context.go
index 0c5ba587..88193cda 100644
--- a/context.go
+++ b/context.go
@@ -2,7 +2,7 @@ package registry
 
 import (
 	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker-registry/api/v2"
+	"github.com/docker/distribution/api/v2"
 )
 
 // Context should contain the request specific context for use in across
diff --git a/digest/digest.go b/digest/digest.go
index 08abba5c..dcf6bc91 100644
--- a/digest/digest.go
+++ b/digest/digest.go
@@ -10,7 +10,7 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/docker/docker-registry/common"
+	"github.com/docker/distribution/common"
 	"github.com/docker/docker/pkg/tarsum"
 )
 
diff --git a/digest/verifiers_test.go b/digest/verifiers_test.go
index fb176cc1..5d595ec1 100644
--- a/digest/verifiers_test.go
+++ b/digest/verifiers_test.go
@@ -7,7 +7,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/docker/docker-registry/common/testutil"
+	"github.com/docker/distribution/common/testutil"
 )
 
 func TestDigestVerifier(t *testing.T) {
diff --git a/images.go b/images.go
index 5a373f1f..6a972109 100644
--- a/images.go
+++ b/images.go
@@ -5,9 +5,9 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/docker/docker-registry/api/v2"
-	"github.com/docker/docker-registry/digest"
-	"github.com/docker/docker-registry/storage"
+	"github.com/docker/distribution/api/v2"
+	"github.com/docker/distribution/digest"
+	"github.com/docker/distribution/storage"
 	"github.com/gorilla/handlers"
 )
 
diff --git a/layer.go b/layer.go
index 094a54cf..a7c46c31 100644
--- a/layer.go
+++ b/layer.go
@@ -3,9 +3,9 @@ package registry
 import (
 	"net/http"
 
-	"github.com/docker/docker-registry/api/v2"
-	"github.com/docker/docker-registry/digest"
-	"github.com/docker/docker-registry/storage"
+	"github.com/docker/distribution/api/v2"
+	"github.com/docker/distribution/digest"
+	"github.com/docker/distribution/storage"
 	"github.com/gorilla/handlers"
 )
 
diff --git a/layerupload.go b/layerupload.go
index 91c3b5cc..49b10789 100644
--- a/layerupload.go
+++ b/layerupload.go
@@ -7,9 +7,9 @@ import (
 	"strconv"
 
 	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker-registry/api/v2"
-	"github.com/docker/docker-registry/digest"
-	"github.com/docker/docker-registry/storage"
+	"github.com/docker/distribution/api/v2"
+	"github.com/docker/distribution/digest"
+	"github.com/docker/distribution/storage"
 	"github.com/gorilla/handlers"
 )
 
diff --git a/storage/filereader.go b/storage/filereader.go
index bcc2614e..9a6eb2b3 100644
--- a/storage/filereader.go
+++ b/storage/filereader.go
@@ -7,7 +7,7 @@ import (
 	"os"
 	"time"
 
-	"github.com/docker/docker-registry/storagedriver"
+	"github.com/docker/distribution/storagedriver"
 )
 
 // remoteFileReader provides a read seeker interface to files stored in
diff --git a/storage/filereader_test.go b/storage/filereader_test.go
index cfc9d215..7cf5633d 100644
--- a/storage/filereader_test.go
+++ b/storage/filereader_test.go
@@ -8,9 +8,9 @@ import (
 	"os"
 	"testing"
 
-	"github.com/docker/docker-registry/digest"
+	"github.com/docker/distribution/digest"
 
-	"github.com/docker/docker-registry/storagedriver/inmemory"
+	"github.com/docker/distribution/storagedriver/inmemory"
 )
 
 func TestSimpleRead(t *testing.T) {
diff --git a/storage/layer.go b/storage/layer.go
index 84f83d2d..4bb6699c 100644
--- a/storage/layer.go
+++ b/storage/layer.go
@@ -5,7 +5,7 @@ import (
 	"io"
 	"time"
 
-	"github.com/docker/docker-registry/digest"
+	"github.com/docker/distribution/digest"
 )
 
 // Layer provides a readable and seekable layer object. Typically,
diff --git a/storage/layer_test.go b/storage/layer_test.go
index ba92d2de..166d803a 100644
--- a/storage/layer_test.go
+++ b/storage/layer_test.go
@@ -9,10 +9,10 @@ import (
 	"os"
 	"testing"
 
-	"github.com/docker/docker-registry/common/testutil"
-	"github.com/docker/docker-registry/digest"
-	"github.com/docker/docker-registry/storagedriver"
-	"github.com/docker/docker-registry/storagedriver/inmemory"
+	"github.com/docker/distribution/common/testutil"
+	"github.com/docker/distribution/digest"
+	"github.com/docker/distribution/storagedriver"
+	"github.com/docker/distribution/storagedriver/inmemory"
 )
 
 // TestSimpleLayerUpload covers the layer upload process, exercising common
diff --git a/storage/layerreader.go b/storage/layerreader.go
index fa2275d9..4510dd7d 100644
--- a/storage/layerreader.go
+++ b/storage/layerreader.go
@@ -3,7 +3,7 @@ package storage
 import (
 	"time"
 
-	"github.com/docker/docker-registry/digest"
+	"github.com/docker/distribution/digest"
 )
 
 // layerReadSeeker implements Layer and provides facilities for reading and
diff --git a/storage/layerstore.go b/storage/layerstore.go
index ddebdbcc..7b5e05f7 100644
--- a/storage/layerstore.go
+++ b/storage/layerstore.go
@@ -1,8 +1,8 @@
 package storage
 
 import (
-	"github.com/docker/docker-registry/digest"
-	"github.com/docker/docker-registry/storagedriver"
+	"github.com/docker/distribution/digest"
+	"github.com/docker/distribution/storagedriver"
 )
 
 type layerStore struct {
diff --git a/storage/layerupload.go b/storage/layerupload.go
index 63ae5d6f..0754a7e2 100644
--- a/storage/layerupload.go
+++ b/storage/layerupload.go
@@ -9,8 +9,8 @@ import (
 
 	"code.google.com/p/go-uuid/uuid"
 
-	"github.com/docker/docker-registry/digest"
-	"github.com/docker/docker-registry/storagedriver"
+	"github.com/docker/distribution/digest"
+	"github.com/docker/distribution/storagedriver"
 	"github.com/docker/docker/pkg/tarsum"
 
 	"io"
diff --git a/storage/manifest.go b/storage/manifest.go
index 88782c53..be70a868 100644
--- a/storage/manifest.go
+++ b/storage/manifest.go
@@ -5,7 +5,7 @@ import (
 	"encoding/json"
 
 	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker-registry/digest"
+	"github.com/docker/distribution/digest"
 	"github.com/docker/libtrust"
 )
 
diff --git a/storage/manifest_test.go b/storage/manifest_test.go
index ea634df8..3bfee2dd 100644
--- a/storage/manifest_test.go
+++ b/storage/manifest_test.go
@@ -6,8 +6,8 @@ import (
 
 	"github.com/docker/libtrust"
 
-	"github.com/docker/docker-registry/digest"
-	"github.com/docker/docker-registry/storagedriver/inmemory"
+	"github.com/docker/distribution/digest"
+	"github.com/docker/distribution/storagedriver/inmemory"
 )
 
 func TestManifestStorage(t *testing.T) {
diff --git a/storage/manifeststore.go b/storage/manifeststore.go
index 69a48d5f..25e55107 100644
--- a/storage/manifeststore.go
+++ b/storage/manifeststore.go
@@ -6,7 +6,7 @@ import (
 	"path"
 	"strings"
 
-	"github.com/docker/docker-registry/storagedriver"
+	"github.com/docker/distribution/storagedriver"
 	"github.com/docker/libtrust"
 )
 
diff --git a/storage/paths.go b/storage/paths.go
index a3538b85..9a61e081 100644
--- a/storage/paths.go
+++ b/storage/paths.go
@@ -5,8 +5,8 @@ import (
 	"path"
 	"strings"
 
-	"github.com/docker/docker-registry/common"
-	"github.com/docker/docker-registry/digest"
+	"github.com/docker/distribution/common"
+	"github.com/docker/distribution/digest"
 )
 
 const storagePathVersion = "v2"
diff --git a/storage/paths_test.go b/storage/paths_test.go
index 33681f39..7b91865f 100644
--- a/storage/paths_test.go
+++ b/storage/paths_test.go
@@ -3,7 +3,7 @@ package storage
 import (
 	"testing"
 
-	"github.com/docker/docker-registry/digest"
+	"github.com/docker/distribution/digest"
 )
 
 func TestPathMapper(t *testing.T) {
diff --git a/storage/services.go b/storage/services.go
index da6d88c5..ed33f936 100644
--- a/storage/services.go
+++ b/storage/services.go
@@ -1,8 +1,8 @@
 package storage
 
 import (
-	"github.com/docker/docker-registry/digest"
-	"github.com/docker/docker-registry/storagedriver"
+	"github.com/docker/distribution/digest"
+	"github.com/docker/distribution/storagedriver"
 )
 
 // Services provides various services with application-level operations for
diff --git a/storagedriver/azure/azure.go b/storagedriver/azure/azure.go
index 64402f3b..ee3230ff 100644
--- a/storagedriver/azure/azure.go
+++ b/storagedriver/azure/azure.go
@@ -13,8 +13,8 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/docker/docker-registry/storagedriver"
-	"github.com/docker/docker-registry/storagedriver/factory"
+	"github.com/docker/distribution/storagedriver"
+	"github.com/docker/distribution/storagedriver/factory"
 
 	azure "github.com/MSOpenTech/azure-sdk-for-go/clients/storage"
 )
diff --git a/storagedriver/azure/azure_test.go b/storagedriver/azure/azure_test.go
index 1edcc1ea..4e8ac59d 100644
--- a/storagedriver/azure/azure_test.go
+++ b/storagedriver/azure/azure_test.go
@@ -8,8 +8,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/docker/docker-registry/storagedriver"
-	"github.com/docker/docker-registry/storagedriver/testsuites"
+	"github.com/docker/distribution/storagedriver"
+	"github.com/docker/distribution/storagedriver/testsuites"
 	. "gopkg.in/check.v1"
 )
 
diff --git a/storagedriver/factory/factory.go b/storagedriver/factory/factory.go
index 254cd9bb..ba3b7dfa 100644
--- a/storagedriver/factory/factory.go
+++ b/storagedriver/factory/factory.go
@@ -3,7 +3,7 @@ package factory
 import (
 	"fmt"
 
-	"github.com/docker/docker-registry/storagedriver"
+	"github.com/docker/distribution/storagedriver"
 )
 
 // driverFactories stores an internal mapping between storage driver names and their respective
diff --git a/storagedriver/filesystem/driver.go b/storagedriver/filesystem/driver.go
index edc94d39..7307eae7 100644
--- a/storagedriver/filesystem/driver.go
+++ b/storagedriver/filesystem/driver.go
@@ -9,8 +9,8 @@ import (
 	"path"
 	"time"
 
-	"github.com/docker/docker-registry/storagedriver"
-	"github.com/docker/docker-registry/storagedriver/factory"
+	"github.com/docker/distribution/storagedriver"
+	"github.com/docker/distribution/storagedriver/factory"
 )
 
 const driverName = "filesystem"
diff --git a/storagedriver/filesystem/driver_test.go b/storagedriver/filesystem/driver_test.go
index 0965daa4..08b203bd 100644
--- a/storagedriver/filesystem/driver_test.go
+++ b/storagedriver/filesystem/driver_test.go
@@ -5,8 +5,8 @@ import (
 	"os"
 	"testing"
 
-	"github.com/docker/docker-registry/storagedriver"
-	"github.com/docker/docker-registry/storagedriver/testsuites"
+	"github.com/docker/distribution/storagedriver"
+	"github.com/docker/distribution/storagedriver/testsuites"
 	. "gopkg.in/check.v1"
 )
 
diff --git a/storagedriver/inmemory/driver.go b/storagedriver/inmemory/driver.go
index 2e23c758..d56ea3a4 100644
--- a/storagedriver/inmemory/driver.go
+++ b/storagedriver/inmemory/driver.go
@@ -8,8 +8,8 @@ import (
 	"sync"
 	"time"
 
-	"github.com/docker/docker-registry/storagedriver"
-	"github.com/docker/docker-registry/storagedriver/factory"
+	"github.com/docker/distribution/storagedriver"
+	"github.com/docker/distribution/storagedriver/factory"
 )
 
 const driverName = "inmemory"
diff --git a/storagedriver/inmemory/driver_test.go b/storagedriver/inmemory/driver_test.go
index 6a4b3697..1034422e 100644
--- a/storagedriver/inmemory/driver_test.go
+++ b/storagedriver/inmemory/driver_test.go
@@ -3,8 +3,8 @@ package inmemory
 import (
 	"testing"
 
-	"github.com/docker/docker-registry/storagedriver"
-	"github.com/docker/docker-registry/storagedriver/testsuites"
+	"github.com/docker/distribution/storagedriver"
+	"github.com/docker/distribution/storagedriver/testsuites"
 
 	"gopkg.in/check.v1"
 )
diff --git a/storagedriver/ipc/client.go b/storagedriver/ipc/client.go
index 2dc5c44e..fcb5c462 100644
--- a/storagedriver/ipc/client.go
+++ b/storagedriver/ipc/client.go
@@ -13,7 +13,7 @@ import (
 	"os/exec"
 	"syscall"
 
-	"github.com/docker/docker-registry/storagedriver"
+	"github.com/docker/distribution/storagedriver"
 	"github.com/docker/libchan"
 	"github.com/docker/libchan/spdy"
 )
diff --git a/storagedriver/ipc/ipc.go b/storagedriver/ipc/ipc.go
index 45c54659..e7ddd69e 100644
--- a/storagedriver/ipc/ipc.go
+++ b/storagedriver/ipc/ipc.go
@@ -7,7 +7,7 @@ import (
 	"io"
 	"reflect"
 
-	"github.com/docker/docker-registry/storagedriver"
+	"github.com/docker/distribution/storagedriver"
 	"github.com/docker/libchan"
 )
 
diff --git a/storagedriver/ipc/server.go b/storagedriver/ipc/server.go
index fa0077a8..6d7df2eb 100644
--- a/storagedriver/ipc/server.go
+++ b/storagedriver/ipc/server.go
@@ -10,7 +10,7 @@ import (
 	"os"
 	"reflect"
 
-	"github.com/docker/docker-registry/storagedriver"
+	"github.com/docker/distribution/storagedriver"
 	"github.com/docker/libchan"
 	"github.com/docker/libchan/spdy"
 )
diff --git a/storagedriver/s3/s3.go b/storagedriver/s3/s3.go
index b8a905c3..9e03b9e7 100644
--- a/storagedriver/s3/s3.go
+++ b/storagedriver/s3/s3.go
@@ -26,8 +26,8 @@ import (
 
 	"github.com/crowdmob/goamz/aws"
 	"github.com/crowdmob/goamz/s3"
-	"github.com/docker/docker-registry/storagedriver"
-	"github.com/docker/docker-registry/storagedriver/factory"
+	"github.com/docker/distribution/storagedriver"
+	"github.com/docker/distribution/storagedriver/factory"
 )
 
 const driverName = "s3"
diff --git a/storagedriver/s3/s3_test.go b/storagedriver/s3/s3_test.go
index 32af24ab..aaf7e5bd 100644
--- a/storagedriver/s3/s3_test.go
+++ b/storagedriver/s3/s3_test.go
@@ -7,8 +7,8 @@ import (
 	"testing"
 
 	"github.com/crowdmob/goamz/aws"
-	"github.com/docker/docker-registry/storagedriver"
-	"github.com/docker/docker-registry/storagedriver/testsuites"
+	"github.com/docker/distribution/storagedriver"
+	"github.com/docker/distribution/storagedriver/testsuites"
 
 	"gopkg.in/check.v1"
 )
diff --git a/storagedriver/testsuites/testsuites.go b/storagedriver/testsuites/testsuites.go
index 25a066f3..24fd582c 100644
--- a/storagedriver/testsuites/testsuites.go
+++ b/storagedriver/testsuites/testsuites.go
@@ -13,7 +13,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/docker/docker-registry/storagedriver"
+	"github.com/docker/distribution/storagedriver"
 
 	"gopkg.in/check.v1"
 )
diff --git a/tags.go b/tags.go
index 04d994b9..458e6d1a 100644
--- a/tags.go
+++ b/tags.go
@@ -4,8 +4,8 @@ import (
 	"encoding/json"
 	"net/http"
 
-	"github.com/docker/docker-registry/api/v2"
-	"github.com/docker/docker-registry/storage"
+	"github.com/docker/distribution/api/v2"
+	"github.com/docker/distribution/storage"
 	"github.com/gorilla/handlers"
 )