diff --git a/Makefile b/Makefile
index e035e63ad..866184e1d 100644
--- a/Makefile
+++ b/Makefile
@@ -9,9 +9,9 @@ race:
 
 # go get github.com/kisielk/errcheck
 errcheck:
-	@errcheck -ignorepkg=bytes -ignore=os:Remove github.com/boltdb/bolt
+	@errcheck -ignorepkg=bytes -ignore=os:Remove github.com/coreos/bbolt
 
-test: 
+test:
 	@go test -v -cover .
 	@go test -v ./cmd/bolt
 
diff --git a/cmd/bolt/main.go b/cmd/bolt/main.go
index 057eca50a..387ce06ef 100644
--- a/cmd/bolt/main.go
+++ b/cmd/bolt/main.go
@@ -19,7 +19,7 @@ import (
 	"unicode/utf8"
 	"unsafe"
 
-	"github.com/boltdb/bolt"
+	bolt "github.com/coreos/bbolt"
 )
 
 var (
diff --git a/db_test.go b/db_test.go
index f667eaef6..46db4d214 100644
--- a/db_test.go
+++ b/db_test.go
@@ -1587,7 +1587,7 @@ func mustContainKeys(b *bolt.Bucket, m map[string]string) {
 
 	// Check for keys found in bucket that shouldn't be there.
 	var keys []string
-	for k, _ := range found {
+	for k := range found {
 		if _, ok := m[string(k)]; !ok {
 			keys = append(keys, k)
 		}
@@ -1598,7 +1598,7 @@ func mustContainKeys(b *bolt.Bucket, m map[string]string) {
 	}
 
 	// Check for keys not found in bucket that should be there.
-	for k, _ := range m {
+	for k := range m {
 		if _, ok := found[string(k)]; !ok {
 			keys = append(keys, k)
 		}
diff --git a/freelist.go b/freelist.go
index 8ac0d61de..679fcbb8e 100644
--- a/freelist.go
+++ b/freelist.go
@@ -6,7 +6,6 @@ import (
 	"unsafe"
 )
 
-
 // txPending holds a list of pgids and corresponding allocation txns
 // that are pending to be freed.
 type txPending struct {