diff --git a/Gomfile b/Gomfile
index 1f6c47d0..6757f35a 100644
--- a/Gomfile
+++ b/Gomfile
@@ -11,7 +11,7 @@ gom 'github.com/julienschmidt/httprouter', :commit => '46807412fe50aaceb73bb5706
 gom 'github.com/mattn/go-shellwords', :commit => 'c7ca6f94add751566a61cf2199e1de78d4c3eee4'
 gom 'github.com/mitchellh/goamz/s3', :commit => 'e7664b32019f31fd1bdf33f9e85f28722f700405'
 gom 'github.com/mkrautz/goar', :commit => '36eb5f3452b1283a211fa35bc00c646fd0db5c4b'
-gom 'github.com/lebauce/swift', :commit => '075195d7dd6167c2d4eeb1bd04daef806bdbbc81'
+gom 'github.com/ncw/swift', :commit => '1ba06e828dbd125ece563f8ed0aaa5c6037b28e2'
 gom 'github.com/smira/commander', :commit => 'f408b00e68d5d6e21b9f18bd310978dafc604e47'
 gom 'github.com/smira/flag', :commit => '357ed3e599ffcbd4aeaa828e1d10da2df3ea5107'
 gom 'github.com/smira/go-ftp-protocol/protocol', :commit => '066b75c2b70dca7ae10b1b88b47534a3c31ccfaa'
diff --git a/swift/public.go b/swift/public.go
index 1ccd540f..6861ad35 100644
--- a/swift/public.go
+++ b/swift/public.go
@@ -2,7 +2,7 @@ package swift
 
 import (
 	"fmt"
-	"github.com/lebauce/swift"
+	"github.com/ncw/swift"
 	"github.com/smira/aptly/aptly"
 	"github.com/smira/aptly/files"
 	"time"
diff --git a/swift/public_test.go b/swift/public_test.go
index f455d310..c38e546f 100644
--- a/swift/public_test.go
+++ b/swift/public_test.go
@@ -2,7 +2,7 @@ package swift
 
 import (
 	"github.com/smira/aptly/files"
-	"github.com/lebauce/swift"
+	"github.com/ncw/swift/swifttest"
 
 	"io/ioutil"
 	"os"
@@ -20,7 +20,7 @@ const (
 )
 
 type PublishedStorageSuite struct {
-	srv                      *swift.SwiftServer
+	srv                      *swifttest.SwiftServer
 	storage, prefixedStorage *PublishedStorage
 }
 
@@ -28,7 +28,7 @@ var _ = Suite(&PublishedStorageSuite{})
 
 func (s *PublishedStorageSuite) SetUpTest(c *C) {
 	var err error
-	s.srv, err = swift.NewSwiftServer(TEST_ADDRESS)
+	s.srv, err = swifttest.NewSwiftServer(TEST_ADDRESS)
 	c.Assert(err, IsNil)
 	c.Assert(s.srv, NotNil)