diff --git a/packer/rpc/client.go b/packer/rpc/client.go
index 2f682f47a..85d1ff550 100644
--- a/packer/rpc/client.go
+++ b/packer/rpc/client.go
@@ -1,11 +1,12 @@
 package rpc
 
 import (
-	"github.com/hashicorp/go-msgpack/codec"
-	"github.com/mitchellh/packer/packer"
 	"io"
 	"log"
 	"net/rpc"
+
+	"github.com/mitchellh/packer/packer"
+	"github.com/ugorji/go/codec"
 )
 
 // Client is the client end that communicates with a Packer RPC server.
diff --git a/packer/rpc/server.go b/packer/rpc/server.go
index ceb77a8d3..c82772049 100644
--- a/packer/rpc/server.go
+++ b/packer/rpc/server.go
@@ -6,8 +6,8 @@ import (
 	"net/rpc"
 	"sync/atomic"
 
-	"github.com/hashicorp/go-msgpack/codec"
 	"github.com/mitchellh/packer/packer"
+	"github.com/ugorji/go/codec"
 )
 
 var endpointId uint64