diff --git a/registry/auth.go b/registry/auth.go
index 906a37dde7..7c0709a47d 100644
--- a/registry/auth.go
+++ b/registry/auth.go
@@ -14,13 +14,16 @@ import (
 	"github.com/docker/docker/utils"
 )
 
-// Where we store the config file
-const CONFIGFILE = ".dockercfg"
+const (
+	// Where we store the config file
+	CONFIGFILE = ".dockercfg"
 
-// Only used for user auth + account creation
-const INDEXSERVER = "https://index.docker.io/v1/"
+	// Only used for user auth + account creation
+	INDEXSERVER    = "https://index.docker.io/v1/"
+	REGISTRYSERVER = "https://registry-1.docker.io/v1/"
 
-//const INDEXSERVER = "https://registry-stage.hub.docker.com/v1/"
+	// INDEXSERVER = "https://registry-stage.hub.docker.com/v1/"
+)
 
 var (
 	ErrConfigFileMissing = errors.New("The Auth config file is missing")
diff --git a/registry/session_v2.go b/registry/session_v2.go
index 2e0de49bc2..c63cf7100a 100644
--- a/registry/session_v2.go
+++ b/registry/session_v2.go
@@ -57,10 +57,14 @@ func getV2URL(e *Endpoint, routeName string, vars map[string]string) (*url.URL,
 	if err != nil {
 		return nil, fmt.Errorf("unable to make registry route %q with vars %v: %s", routeName, vars, err)
 	}
+	u, err := url.Parse(REGISTRYSERVER)
+	if err != nil {
+		return nil, fmt.Errorf("invalid registry url: %s", err)
+	}
 
 	return &url.URL{
-		Scheme: e.URL.Scheme,
-		Host:   e.URL.Host,
+		Scheme: u.Scheme,
+		Host:   u.Host,
 		Path:   routePath.Path,
 	}, nil
 }