diff --git a/command/agent/rpc.go b/command/agent/rpc.go
index 784c6c46f7..caf97cef1f 100644
--- a/command/agent/rpc.go
+++ b/command/agent/rpc.go
@@ -24,9 +24,9 @@ package agent
 import (
 	"bufio"
 	"fmt"
+	"github.com/hashicorp/go-msgpack/codec"
 	"github.com/hashicorp/logutils"
 	"github.com/hashicorp/serf/serf"
-	"github.com/hashicorp/go-msgpack/codec"
 	"io"
 	"log"
 	"net"
diff --git a/command/agent/rpc_client.go b/command/agent/rpc_client.go
index a64ec4d53a..6cd0fc19f1 100644
--- a/command/agent/rpc_client.go
+++ b/command/agent/rpc_client.go
@@ -3,8 +3,8 @@ package agent
 import (
 	"bufio"
 	"fmt"
-	"github.com/hashicorp/logutils"
 	"github.com/hashicorp/go-msgpack/codec"
+	"github.com/hashicorp/logutils"
 	"log"
 	"net"
 	"sync"
diff --git a/consul/fsm.go b/consul/fsm.go
index 58cfe59517..2ce6719a42 100644
--- a/consul/fsm.go
+++ b/consul/fsm.go
@@ -8,8 +8,8 @@ import (
 	"time"
 
 	"github.com/hashicorp/consul/consul/structs"
-	"github.com/hashicorp/raft"
 	"github.com/hashicorp/go-msgpack/codec"
+	"github.com/hashicorp/raft"
 )
 
 // consulFSM implements a finite state machine that is used
diff --git a/consul/pool.go b/consul/pool.go
index 70afb0ff0d..91fe035f2c 100644
--- a/consul/pool.go
+++ b/consul/pool.go
@@ -11,9 +11,9 @@ import (
 	"sync/atomic"
 	"time"
 
+	"github.com/hashicorp/go-msgpack/codec"
 	"github.com/hashicorp/yamux"
 	"github.com/inconshreveable/muxado"
-	"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 1607bd22c1..cd5c36ebd3 100644
--- a/consul/rpc.go
+++ b/consul/rpc.go
@@ -5,9 +5,9 @@ import (
 	"fmt"
 	"github.com/armon/go-metrics"
 	"github.com/hashicorp/consul/consul/structs"
+	"github.com/hashicorp/go-msgpack/codec"
 	"github.com/hashicorp/yamux"
 	"github.com/inconshreveable/muxado"
-	"github.com/hashicorp/go-msgpack/codec"
 	"io"
 	"math/rand"
 	"net"