diff --git a/Gomfile b/Gomfile
index 90c9d985..b58c230a 100644
--- a/Gomfile
+++ b/Gomfile
@@ -1,4 +1,3 @@
-gom 'code.google.com/p/go-uuid/uuid', :commit => '5fac954758f5'
 gom 'github.com/AlekSi/pointer', :commit => '5f6d527dae3d678b46fbb20331ddf44e2b841943'
 gom 'github.com/awalterschulze/gographviz', :commit => '20d1f693416d9be045340150094aa42035a41c9e'
 gom 'github.com/cheggaaa/pb', :commit => '2c1b74620cc58a81ac152ee2d322e28c806d81ed'
@@ -13,6 +12,7 @@ gom 'github.com/ncw/swift', :commit => '384ef27c70645e285f8bb9d02276bf654d06027e
 gom 'github.com/smira/commander', :commit => 'f408b00e68d5d6e21b9f18bd310978dafc604e47'
 gom 'github.com/smira/flag', :commit => '357ed3e599ffcbd4aeaa828e1d10da2df3ea5107'
 gom 'github.com/smira/go-ftp-protocol/protocol', :commit => '066b75c2b70dca7ae10b1b88b47534a3c31ccfaa'
+gom 'github.com/smira/go-uuid', :commit => 'ed3ca8a15a931b141440a7e98e4f716eec255f7d'
 gom 'github.com/syndtr/gosnappy/snappy', :commit => 'ce8acff4829e0c2458a67ead32390ac0a381c862'
 gom 'github.com/syndtr/goleveldb/leveldb', :commit => '97e257099d2ab9578151ba85e2641e2cd14d3ca8'
 gom 'github.com/ugorji/go/codec', :commit => '71c2886f5a673a35f909803f38ece5810165097b'
diff --git a/deb/local.go b/deb/local.go
index f57e4dde..0739b4c1 100644
--- a/deb/local.go
+++ b/deb/local.go
@@ -2,9 +2,9 @@ package deb
 
 import (
 	"bytes"
-	"code.google.com/p/go-uuid/uuid"
 	"fmt"
 	"github.com/smira/aptly/database"
+	"github.com/smira/go-uuid/uuid"
 	"github.com/ugorji/go/codec"
 	"log"
 	"sync"
diff --git a/deb/publish.go b/deb/publish.go
index 82ea06ab..e19778f1 100644
--- a/deb/publish.go
+++ b/deb/publish.go
@@ -3,12 +3,12 @@ package deb
 import (
 	"bufio"
 	"bytes"
-	"code.google.com/p/go-uuid/uuid"
 	"encoding/json"
 	"fmt"
 	"github.com/smira/aptly/aptly"
 	"github.com/smira/aptly/database"
 	"github.com/smira/aptly/utils"
+	"github.com/smira/go-uuid/uuid"
 	"github.com/ugorji/go/codec"
 	"io/ioutil"
 	"log"
diff --git a/deb/remote.go b/deb/remote.go
index 881fe292..0c6f3201 100644
--- a/deb/remote.go
+++ b/deb/remote.go
@@ -2,12 +2,12 @@ package deb
 
 import (
 	"bytes"
-	"code.google.com/p/go-uuid/uuid"
 	"fmt"
 	"github.com/smira/aptly/aptly"
 	"github.com/smira/aptly/database"
 	"github.com/smira/aptly/http"
 	"github.com/smira/aptly/utils"
+	"github.com/smira/go-uuid/uuid"
 	"github.com/ugorji/go/codec"
 	"log"
 	"net/url"
diff --git a/deb/snapshot.go b/deb/snapshot.go
index 3a7ff829..f366e00e 100644
--- a/deb/snapshot.go
+++ b/deb/snapshot.go
@@ -2,11 +2,11 @@ package deb
 
 import (
 	"bytes"
-	"code.google.com/p/go-uuid/uuid"
 	"errors"
 	"fmt"
 	"github.com/smira/aptly/database"
 	"github.com/smira/aptly/utils"
+	"github.com/smira/go-uuid/uuid"
 	"github.com/ugorji/go/codec"
 	"log"
 	"sort"