diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 037f441e..e95196b5 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -82,8 +82,8 @@
 			"ImportPath": "github.com/stevvooe/resumable",
 			"Rev": "51ad44105773cafcbe91927f70ac68e1bf78f8b4"
                 },
-			"ImportPath": "github.com/lebauce/swift",
-			"Rev": "677cb70f5d40fa1a81ddb32f872615a57bb42381"
+			"ImportPath": "github.com/ncw/swift",
+			"Rev": "021f1ecdb0940ce5c64ce0e27928d9680f85f291"
 		},
 		{
 			"ImportPath": "github.com/yvasiyarov/go-metrics",
diff --git a/Godeps/_workspace/src/github.com/lebauce/swift/.gitignore b/Godeps/_workspace/src/github.com/ncw/swift/.gitignore
similarity index 100%
rename from Godeps/_workspace/src/github.com/lebauce/swift/.gitignore
rename to Godeps/_workspace/src/github.com/ncw/swift/.gitignore
diff --git a/Godeps/_workspace/src/github.com/lebauce/swift/.travis.yml b/Godeps/_workspace/src/github.com/ncw/swift/.travis.yml
similarity index 100%
rename from Godeps/_workspace/src/github.com/lebauce/swift/.travis.yml
rename to Godeps/_workspace/src/github.com/ncw/swift/.travis.yml
diff --git a/Godeps/_workspace/src/github.com/lebauce/swift/COPYING b/Godeps/_workspace/src/github.com/ncw/swift/COPYING
similarity index 100%
rename from Godeps/_workspace/src/github.com/lebauce/swift/COPYING
rename to Godeps/_workspace/src/github.com/ncw/swift/COPYING
diff --git a/Godeps/_workspace/src/github.com/lebauce/swift/README.md b/Godeps/_workspace/src/github.com/ncw/swift/README.md
similarity index 97%
rename from Godeps/_workspace/src/github.com/lebauce/swift/README.md
rename to Godeps/_workspace/src/github.com/ncw/swift/README.md
index 3643c8b5..379457a4 100644
--- a/Godeps/_workspace/src/github.com/lebauce/swift/README.md
+++ b/Godeps/_workspace/src/github.com/ncw/swift/README.md
@@ -34,6 +34,7 @@ Here is a short example from the docs
         UserName: "user",
         ApiKey:   "key",
         AuthUrl:  "auth_url",
+        Tenant:   "tenant",  // Name of the tenant (v2 auth only)
     }
     // Authenticate
     err := c.Authenticate()
diff --git a/Godeps/_workspace/src/github.com/lebauce/swift/auth.go b/Godeps/_workspace/src/github.com/ncw/swift/auth.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/lebauce/swift/auth.go
rename to Godeps/_workspace/src/github.com/ncw/swift/auth.go
diff --git a/Godeps/_workspace/src/github.com/lebauce/swift/compatibility_1_0.go b/Godeps/_workspace/src/github.com/ncw/swift/compatibility_1_0.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/lebauce/swift/compatibility_1_0.go
rename to Godeps/_workspace/src/github.com/ncw/swift/compatibility_1_0.go
diff --git a/Godeps/_workspace/src/github.com/lebauce/swift/compatibility_1_1.go b/Godeps/_workspace/src/github.com/ncw/swift/compatibility_1_1.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/lebauce/swift/compatibility_1_1.go
rename to Godeps/_workspace/src/github.com/ncw/swift/compatibility_1_1.go
diff --git a/Godeps/_workspace/src/github.com/lebauce/swift/doc.go b/Godeps/_workspace/src/github.com/ncw/swift/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/lebauce/swift/doc.go
rename to Godeps/_workspace/src/github.com/ncw/swift/doc.go
diff --git a/Godeps/_workspace/src/github.com/lebauce/swift/example_test.go b/Godeps/_workspace/src/github.com/ncw/swift/example_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/lebauce/swift/example_test.go
rename to Godeps/_workspace/src/github.com/ncw/swift/example_test.go
diff --git a/Godeps/_workspace/src/github.com/lebauce/swift/meta.go b/Godeps/_workspace/src/github.com/ncw/swift/meta.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/lebauce/swift/meta.go
rename to Godeps/_workspace/src/github.com/ncw/swift/meta.go
diff --git a/Godeps/_workspace/src/github.com/lebauce/swift/meta_test.go b/Godeps/_workspace/src/github.com/ncw/swift/meta_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/lebauce/swift/meta_test.go
rename to Godeps/_workspace/src/github.com/ncw/swift/meta_test.go
diff --git a/Godeps/_workspace/src/github.com/lebauce/swift/notes.txt b/Godeps/_workspace/src/github.com/ncw/swift/notes.txt
similarity index 100%
rename from Godeps/_workspace/src/github.com/lebauce/swift/notes.txt
rename to Godeps/_workspace/src/github.com/ncw/swift/notes.txt
diff --git a/Godeps/_workspace/src/github.com/lebauce/swift/rs/rs.go b/Godeps/_workspace/src/github.com/ncw/swift/rs/rs.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/lebauce/swift/rs/rs.go
rename to Godeps/_workspace/src/github.com/ncw/swift/rs/rs.go
diff --git a/Godeps/_workspace/src/github.com/lebauce/swift/rs/rs_test.go b/Godeps/_workspace/src/github.com/ncw/swift/rs/rs_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/lebauce/swift/rs/rs_test.go
rename to Godeps/_workspace/src/github.com/ncw/swift/rs/rs_test.go
diff --git a/Godeps/_workspace/src/github.com/lebauce/swift/swift.go b/Godeps/_workspace/src/github.com/ncw/swift/swift.go
similarity index 99%
rename from Godeps/_workspace/src/github.com/lebauce/swift/swift.go
rename to Godeps/_workspace/src/github.com/ncw/swift/swift.go
index e019b05e..5def1d67 100644
--- a/Godeps/_workspace/src/github.com/lebauce/swift/swift.go
+++ b/Godeps/_workspace/src/github.com/ncw/swift/swift.go
@@ -8,7 +8,6 @@ import (
 	"fmt"
 	"hash"
 	"io"
-	"log"
 	"mime"
 	"net/http"
 	"net/url"
@@ -192,15 +191,12 @@ func (c *Connection) parseHeaders(resp *http.Response, errorMap errorMap) error
 
 // readHeaders returns a Headers object from the http.Response.
 //
-// Logs a warning if receives multiple values for a key (which
-// should never happen)
+// If it receives multiple values for a key (which should never
+// happen) it will use the first one
 func readHeaders(resp *http.Response) Headers {
 	headers := Headers{}
 	for key, values := range resp.Header {
 		headers[key] = values[0]
-		if len(values) > 1 {
-			log.Printf("swift: received multiple values for header %q", key)
-		}
 	}
 	return headers
 }
@@ -465,14 +461,9 @@ func (c *Connection) Call(targetUrl string, p RequestOpts) (resp *http.Response,
 		req.Header.Add("X-Auth-Token", authToken)
 		resp, err = c.doTimeoutRequest(timer, req)
 		if err != nil {
-			// Because of https://github.com/golang/go/issues/4677,
-			// we sometimes get an url.Error error embedding an io.EOF error.
-			// In that case, we simply retry to send the request
-			if urlError, ok := err.(*url.Error); ok {
-				if urlError.Err == io.EOF && (p.Operation == "HEAD" || p.Operation == "GET") {
-					retries--;
-					continue
-				}
+			if p.Operation == "HEAD" || p.Operation == "GET" {
+				retries--
+				continue
 			}
 			return
 		}
diff --git a/Godeps/_workspace/src/github.com/lebauce/swift/swift_internal_test.go b/Godeps/_workspace/src/github.com/ncw/swift/swift_internal_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/lebauce/swift/swift_internal_test.go
rename to Godeps/_workspace/src/github.com/ncw/swift/swift_internal_test.go
diff --git a/Godeps/_workspace/src/github.com/lebauce/swift/swift_test.go b/Godeps/_workspace/src/github.com/ncw/swift/swift_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/lebauce/swift/swift_test.go
rename to Godeps/_workspace/src/github.com/ncw/swift/swift_test.go
diff --git a/Godeps/_workspace/src/github.com/lebauce/swift/swifttest/server.go b/Godeps/_workspace/src/github.com/ncw/swift/swifttest/server.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/lebauce/swift/swifttest/server.go
rename to Godeps/_workspace/src/github.com/ncw/swift/swifttest/server.go
diff --git a/Godeps/_workspace/src/github.com/lebauce/swift/timeout_reader.go b/Godeps/_workspace/src/github.com/ncw/swift/timeout_reader.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/lebauce/swift/timeout_reader.go
rename to Godeps/_workspace/src/github.com/ncw/swift/timeout_reader.go
diff --git a/Godeps/_workspace/src/github.com/lebauce/swift/timeout_reader_test.go b/Godeps/_workspace/src/github.com/ncw/swift/timeout_reader_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/lebauce/swift/timeout_reader_test.go
rename to Godeps/_workspace/src/github.com/ncw/swift/timeout_reader_test.go
diff --git a/Godeps/_workspace/src/github.com/lebauce/swift/watchdog_reader.go b/Godeps/_workspace/src/github.com/ncw/swift/watchdog_reader.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/lebauce/swift/watchdog_reader.go
rename to Godeps/_workspace/src/github.com/ncw/swift/watchdog_reader.go
diff --git a/Godeps/_workspace/src/github.com/lebauce/swift/watchdog_reader_test.go b/Godeps/_workspace/src/github.com/ncw/swift/watchdog_reader_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/lebauce/swift/watchdog_reader_test.go
rename to Godeps/_workspace/src/github.com/ncw/swift/watchdog_reader_test.go
diff --git a/registry/storage/driver/swift/swift.go b/registry/storage/driver/swift/swift.go
index b4aaacf6..9287be41 100644
--- a/registry/storage/driver/swift/swift.go
+++ b/registry/storage/driver/swift/swift.go
@@ -21,7 +21,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/lebauce/swift"
+	"github.com/ncw/swift"
 
 	"github.com/docker/distribution/context"
 	storagedriver "github.com/docker/distribution/registry/storage/driver"
diff --git a/registry/storage/driver/swift/swift_test.go b/registry/storage/driver/swift/swift_test.go
index 03515bb2..5ead8d15 100644
--- a/registry/storage/driver/swift/swift_test.go
+++ b/registry/storage/driver/swift/swift_test.go
@@ -5,7 +5,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/lebauce/swift/swifttest"
+	"github.com/ncw/swift/swifttest"
 
 	"github.com/docker/distribution/context"
 	storagedriver "github.com/docker/distribution/registry/storage/driver"