diff --git a/client_connect.go b/client_connect.go
index fc61137..dddec0c 100644
--- a/client_connect.go
+++ b/client_connect.go
@@ -2,8 +2,9 @@ package rtmp
 
 import (
 	"bytes"
-	"code.google.com/p/go-uuid/uuid"
+
 	"github.com/elobuff/goamf"
+	"github.com/pborman/uuid"
 )
 
 func (c *Client) connect() (id string, err error) {
diff --git a/client_invoke.go b/client_invoke.go
index 2fb8882..e9e9349 100644
--- a/client_invoke.go
+++ b/client_invoke.go
@@ -2,8 +2,9 @@ package rtmp
 
 import (
 	"bytes"
-	"code.google.com/p/go-uuid/uuid"
+
 	"github.com/elobuff/goamf"
+	"github.com/pborman/uuid"
 )
 
 func (c *Client) EncodeInvokeCommand(destination interface{}, operation interface{}, body interface{}) (msg *Message, err error) {