diff --git a/command/agent/rpc.go b/command/agent/rpc.go
index 2a6960d1a..784c6c46f 100644
--- a/command/agent/rpc.go
+++ b/command/agent/rpc.go
@@ -26,7 +26,7 @@ import (
 	"fmt"
 	"github.com/hashicorp/logutils"
 	"github.com/hashicorp/serf/serf"
-	"github.com/ugorji/go/codec"
+	"github.com/hashicorp/go-msgpack/codec"
 	"io"
 	"log"
 	"net"
diff --git a/command/agent/rpc_client.go b/command/agent/rpc_client.go
index 9c3522962..a64ec4d53 100644
--- a/command/agent/rpc_client.go
+++ b/command/agent/rpc_client.go
@@ -4,7 +4,7 @@ import (
 	"bufio"
 	"fmt"
 	"github.com/hashicorp/logutils"
-	"github.com/ugorji/go/codec"
+	"github.com/hashicorp/go-msgpack/codec"
 	"log"
 	"net"
 	"sync"
diff --git a/command/agent/util.go b/command/agent/util.go
index c91a6dbc4..f1a88df4e 100644
--- a/command/agent/util.go
+++ b/command/agent/util.go
@@ -11,7 +11,7 @@ import (
 	"runtime"
 	"time"
 
-	"github.com/ugorji/go/codec"
+	"github.com/hashicorp/go-msgpack/codec"
 )
 
 const (
diff --git a/consul/fsm.go b/consul/fsm.go
index ec5c72b7b..58cfe5951 100644
--- a/consul/fsm.go
+++ b/consul/fsm.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/hashicorp/consul/consul/structs"
 	"github.com/hashicorp/raft"
-	"github.com/ugorji/go/codec"
+	"github.com/hashicorp/go-msgpack/codec"
 )
 
 // consulFSM implements a finite state machine that is used
diff --git a/consul/mdb_table_test.go b/consul/mdb_table_test.go
index f67d0cc41..e70c9131f 100644
--- a/consul/mdb_table_test.go
+++ b/consul/mdb_table_test.go
@@ -3,7 +3,7 @@ package consul
 import (
 	"bytes"
 	"github.com/armon/gomdb"
-	"github.com/ugorji/go/codec"
+	"github.com/hashicorp/go-msgpack/codec"
 	"io/ioutil"
 	"os"
 	"reflect"
diff --git a/consul/pool.go b/consul/pool.go
index 84214d2a4..70afb0ff0 100644
--- a/consul/pool.go
+++ b/consul/pool.go
@@ -13,7 +13,7 @@ import (
 
 	"github.com/hashicorp/yamux"
 	"github.com/inconshreveable/muxado"
-	"github.com/ugorji/go/codec"
+	"github.com/hashicorp/go-msgpack/codec"
 )
 
 // msgpackHandle is a shared handle for encoding/decoding of RPC messages
diff --git a/consul/rpc.go b/consul/rpc.go
index d2d6459e0..1607bd22c 100644
--- a/consul/rpc.go
+++ b/consul/rpc.go
@@ -7,7 +7,7 @@ import (
 	"github.com/hashicorp/consul/consul/structs"
 	"github.com/hashicorp/yamux"
 	"github.com/inconshreveable/muxado"
-	"github.com/ugorji/go/codec"
+	"github.com/hashicorp/go-msgpack/codec"
 	"io"
 	"math/rand"
 	"net"
diff --git a/consul/status_endpoint_test.go b/consul/status_endpoint_test.go
index 15cb2dcfc..419c174bc 100644
--- a/consul/status_endpoint_test.go
+++ b/consul/status_endpoint_test.go
@@ -2,7 +2,7 @@ package consul
 
 import (
 	"github.com/hashicorp/consul/testutil"
-	"github.com/ugorji/go/codec"
+	"github.com/hashicorp/go-msgpack/codec"
 	"net"
 	"net/rpc"
 	"os"
diff --git a/consul/structs/structs.go b/consul/structs/structs.go
index 5b3597bba..c2585b132 100644
--- a/consul/structs/structs.go
+++ b/consul/structs/structs.go
@@ -6,7 +6,7 @@ import (
 	"time"
 
 	"github.com/hashicorp/consul/acl"
-	"github.com/ugorji/go/codec"
+	"github.com/hashicorp/go-msgpack/codec"
 )
 
 var (