diff --git a/address.go b/address.go
index 3aaedc5..61b0deb 100644
--- a/address.go
+++ b/address.go
@@ -6,9 +6,10 @@ package btcutil
 
 import (
 	"bytes"
-	"code.google.com/p/go.crypto/ripemd160"
 	"encoding/hex"
 	"errors"
+
+	"code.google.com/p/go.crypto/ripemd160"
 	"github.com/conformal/btcec"
 	"github.com/conformal/btcnet"
 	"github.com/conformal/btcwire"
diff --git a/amount_test.go b/amount_test.go
index 4792265..25944f3 100644
--- a/amount_test.go
+++ b/amount_test.go
@@ -5,9 +5,10 @@
 package btcutil_test
 
 import (
-	. "github.com/conformal/btcutil"
 	"math"
 	"testing"
+
+	. "github.com/conformal/btcutil"
 )
 
 func TestAmountCreation(t *testing.T) {
diff --git a/appdata_test.go b/appdata_test.go
index 7a61f49..9845f93 100644
--- a/appdata_test.go
+++ b/appdata_test.go
@@ -5,13 +5,14 @@
 package btcutil_test
 
 import (
-	"github.com/conformal/btcutil"
 	"os"
 	"os/user"
 	"path/filepath"
 	"runtime"
 	"testing"
 	"unicode"
+
+	"github.com/conformal/btcutil"
 )
 
 // TestAppDataDir tests the API for AppDataDir to ensure it gives expected
diff --git a/base58_test.go b/base58_test.go
index 763e38e..e80791a 100644
--- a/base58_test.go
+++ b/base58_test.go
@@ -7,8 +7,9 @@ package btcutil_test
 import (
 	"bytes"
 	"encoding/hex"
-	"github.com/conformal/btcutil"
 	"testing"
+
+	"github.com/conformal/btcutil"
 )
 
 var stringTests = []struct {
diff --git a/block.go b/block.go
index d23a326..97aa1df 100644
--- a/block.go
+++ b/block.go
@@ -7,8 +7,9 @@ package btcutil
 import (
 	"bytes"
 	"fmt"
-	"github.com/conformal/btcwire"
 	"io"
+
+	"github.com/conformal/btcwire"
 )
 
 // OutOfRangeError describes an error due to accessing an element that is out
diff --git a/block_test.go b/block_test.go
index c8140cf..dff6c31 100644
--- a/block_test.go
+++ b/block_test.go
@@ -6,13 +6,14 @@ package btcutil_test
 
 import (
 	"bytes"
-	"github.com/conformal/btcutil"
-	"github.com/conformal/btcwire"
-	"github.com/davecgh/go-spew/spew"
 	"io"
 	"reflect"
 	"testing"
 	"time"
+
+	"github.com/conformal/btcutil"
+	"github.com/conformal/btcwire"
+	"github.com/davecgh/go-spew/spew"
 )
 
 // TestBlock tests the API for Block.
diff --git a/coinset/coins.go b/coinset/coins.go
index b3e4be1..20dc55e 100644
--- a/coinset/coins.go
+++ b/coinset/coins.go
@@ -3,9 +3,10 @@ package coinset
 import (
 	"container/list"
 	"errors"
+	"sort"
+
 	"github.com/conformal/btcutil"
 	"github.com/conformal/btcwire"
-	"sort"
 )
 
 // Coin represents a spendable transaction outpoint
diff --git a/coinset/coins_test.go b/coinset/coins_test.go
index 91929a6..9be4e50 100644
--- a/coinset/coins_test.go
+++ b/coinset/coins_test.go
@@ -4,11 +4,12 @@ import (
 	"bytes"
 	"encoding/hex"
 	"fmt"
+	"testing"
+
 	"github.com/conformal/btcutil"
 	"github.com/conformal/btcutil/coinset"
 	"github.com/conformal/btcwire"
 	"github.com/conformal/fastsha256"
-	"testing"
 )
 
 type TestCoin struct {
diff --git a/hash160.go b/hash160.go
index 545c369..d048384 100644
--- a/hash160.go
+++ b/hash160.go
@@ -5,9 +5,10 @@
 package btcutil
 
 import (
+	"hash"
+
 	"code.google.com/p/go.crypto/ripemd160"
 	"github.com/conformal/fastsha256"
-	"hash"
 )
 
 // Calculate the hash of hasher over buf.
diff --git a/tx.go b/tx.go
index 30afb35..1da893b 100644
--- a/tx.go
+++ b/tx.go
@@ -6,8 +6,9 @@ package btcutil
 
 import (
 	"bytes"
-	"github.com/conformal/btcwire"
 	"io"
+
+	"github.com/conformal/btcwire"
 )
 
 // TxIndexUnknown is the value returned for a transaction index that is unknown.
diff --git a/tx_test.go b/tx_test.go
index 19625e1..3681ae0 100644
--- a/tx_test.go
+++ b/tx_test.go
@@ -6,12 +6,13 @@ package btcutil_test
 
 import (
 	"bytes"
-	"github.com/conformal/btcutil"
-	"github.com/conformal/btcwire"
-	"github.com/davecgh/go-spew/spew"
 	"io"
 	"reflect"
 	"testing"
+
+	"github.com/conformal/btcutil"
+	"github.com/conformal/btcwire"
+	"github.com/davecgh/go-spew/spew"
 )
 
 // TestTx tests the API for Tx.